From: Andreas Unterkircher <unki@netshadow.at>
Date: Sun, 11 May 2008 07:42:36 +0000 (+0200)
Subject: fix conflicts during merge of Arun's tree
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=commitdiff_plain;h=d97a057346bebb98be293d903a86987273cbee3e;hp=b5ff85f75a27397c1ab4164fdefa9d734dc0e39d

fix conflicts during merge of Arun's tree

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
---

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 49d0c7d..1e07ccc 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -1641,7 +1641,7 @@ class PHPFSPOT {
     */
    public function get_meta_informations($file)
    {
-      return exif_read_data($file);
+      return @exif_read_data($file);
 
    } // get_meta_informations()
 
diff --git a/themes/default/stylesheet.css b/themes/default/stylesheet.css
index d67f3ac..93e56b7 100644
--- a/themes/default/stylesheet.css
+++ b/themes/default/stylesheet.css
@@ -55,6 +55,10 @@ div.searchfor {
    border-bottom:          solid 1px #000000;
 }
 
+div.searchfor td.nowrap { 
+   white-space:            nowrap;
+}
+
 .menu {
    position:               absolute;
    left:                   0px;
@@ -81,6 +85,7 @@ div.header {
    padding:                10px;
    vertical-align:         middle;
    white-space:            nowrap;
+   text-align:             left;
 }
 
 div.subheader {
@@ -88,6 +93,68 @@ div.subheader {
    padding:                5px 10px 5px 10px;
    vertical-align:         middle;
    white-space:            nowrap;
+   text-align:             left; 
+   float:                  left;
+}
+
+div.tagresult{ 
+   height:                 1px; 
+   background-color:       #ffffff;
+}
+
+div.tagresulttags{
+   display:                table-cell; 
+   vertical-align:         middle;
+}
+
+div.photo{ 
+   text-align:             left; 
+   margin-top:             20px;
+   margin-left:            20px;
+}
+
+div.photonavigation{ 
+   margin-left:            20px;
+}
+
+div.indexnavigation{ 
+   width:                  100%; 
+   margin-top:             20px;
+}
+
+div.indexnavigationright{ 
+   float:                  right; 
+   width:                  40px; 
+   margin-right:           0px; 
+   padding-right:          10px;
+}
+
+div.indexnavigationleft{ 
+   float:                  left; 
+   margin:                 0px; 
+   padding-left:           10px; 
+   width:                  40px;
+}
+
+div.indexnavigationcenter{ 
+   text-align:             center;
+}
+
+div.textright { 
+   text-align:             right;
+}
+
+div.welcome { 
+   padding:                10px; 
+   margin-left:            10px;  
+   margin-right:           10px;
+}
+
+div.welcome  span { 
+   float:                  left; 
+   padding-right:          10px;
+   width:                  150px; 
+   text-align:             center;
 }
 
 img {
@@ -192,6 +259,16 @@ div.thumb a.thumblink:hover {
    line-height:            21px;
 }
 
+span.tags {
+   vertical-align:         middle; 
+   text-decoration:        underline;
+}
+
+div.credits{
+   margin-top:             10px; 
+   margin-left:            10px;
+}
+
 table.calendar tr td {
    border:                 solid 1px #ffffff;
    padding:                1px;
@@ -225,13 +302,14 @@ table.calendar tr td {
    vertical-align:         middle;
 }
 
-#whiteline {
-   height:                 1px;
-   background-color:       #ffffff;
+#slide_close { 
+   margin:                 0 auto; 
+   padding:                10px;
 }
 
-#index {
-   margin-top:             5px;
+#slide_close img { 
+   padding:                15px; 
+   background-color:       #000000;
 }
 
 input.submit,input.checkbox {
@@ -245,3 +323,7 @@ input, select, textarea {
    border:                 1px solid #888888;
    border-collapse:        collapse;
 }
+
+#slider-1{ 
+   margin:                 0 auto;
+}
diff --git a/themes/default/templates/credits.tpl b/themes/default/templates/credits.tpl
index ba772a1..2bc7b28 100644
--- a/themes/default/templates/credits.tpl
+++ b/themes/default/templates/credits.tpl
@@ -1,7 +1,7 @@
 <div class="header">
  <b>{$product} {$version}</b><br />
 </div>
-<div style="margin-top: 10px; margin-left: 10px;">
+<div class="credits">
  by Andreas Unterkircher<br />
  Licensed under GPLv3, <a href="http://oss.netshadow.at/oss/phpfspot/Project" target="_blank">phpfspot</a>
  <hr />
diff --git a/themes/default/templates/header.tpl b/themes/default/templates/header.tpl
index 1cd9cb4..c1d7a0c 100644
--- a/themes/default/templates/header.tpl
+++ b/themes/default/templates/header.tpl
@@ -15,7 +15,7 @@
   <link rel="stylesheet" href="{$web_path}/lightbox2/css/lightbox.css" type="text/css" media="screen" />
   { /if }
   { if $use_autocomplete }
-  <script src="{$web_path}/autosuggest/js/bsn.AutoSuggest_2.1.3_comp.js"></script>
+  <script type="text/javascript" src="{$web_path}/autosuggest/js/bsn.AutoSuggest_2.1.3_comp.js"></script>
   <link rel="stylesheet" href="{$web_path}/autosuggest/css/autosuggest_inquisitor.css" type="text/css" media="screen" charset="utf-8" />
   { /if }
  </head>                                                                                                      
diff --git a/themes/default/templates/index.tpl b/themes/default/templates/index.tpl
index 46effe2..694f86a 100644
--- a/themes/default/templates/index.tpl
+++ b/themes/default/templates/index.tpl
@@ -4,7 +4,7 @@
   <!-- loading -->
 
   <div id="HTML_AJAX_LOADING">
-   <img src="{$web_path}/resources/loading.gif" style="vertical-align: middle;" />&nbsp;&nbsp;Loading...
+   <img src="{$web_path}/resources/loading.gif" style="vertical-align: middle;" alt="Loading..." />&nbsp;&nbsp;Loading...
   </div>
 
   <!-- top menu -->
@@ -25,7 +25,7 @@
   </div>
   <!-- /top menu -->
 
-  <span style="clear: both;">
+  <div style="clear: both;">
   <!-- option column -->
   <div class="options" style="float: left;">
    <div>
@@ -41,6 +41,6 @@
   <div id="content" class="content">
    { $initial_content }
   </div>
-  </span>
+  </div>
 
 {include file="footer.tpl"}
diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index 2c1b6ac..2dedf86 100644
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -3,7 +3,7 @@
 <!-- Header - displays count of matched photos and some link's -->
 
 <div class="header">
- <div style="float: left;">
+ <div class="subheader">
   <b>Photo Index</b>
   {if $searchfor }
    {if $count == 1}
@@ -29,7 +29,7 @@
    Results are limited to a date within {$from_date} to {$to_date}.
   {/if}
  </div>
- <div style="text-align: right">
+<div class="textright">
   {if $slideshow_link }
    <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="{$web_path}/resources/slideshow.png" />&nbsp;Slideshow</a>
   {/if}
@@ -49,9 +49,9 @@
      with some small pictures in a bar. -->
 
 { if $tag_result }
-<div id="whiteline" /></div>
+<div class="tagresult"></div>
 <div class="subheader">
- <div style="display: table-cell; vertical-align: middle;">
+ <div class="tagresulttags">
  Tags:
  </div>
  { $selected_tags }
@@ -83,10 +83,10 @@
 
 </div>
 <br class="clearboth" />
-<div style="width: 100%; margin-top: 20px;">
+<div class="indexnavigation">
 
  <!-- the right nav arrow -->
- <div style="float: right; width: 40px; margin-right: 0px; padding-right: 10px;">
+ <div class="indexnavigationright">
  { if $next_url == "" }
   { if $count != 0 }
    <img src="{$web_path}/resources/arrow_right_gray.png" alt="last page reached" />
@@ -99,7 +99,7 @@
  </div>
 
  <!-- the left nav arrow -->
- <div style="float: left; margin: 0px; padding-left: 10px; width: 40px;">
+ <div class="indexnavigationleft">
  { if $previous_url == "" }
   { if $count != 0 }
    <img src="{$web_path}/resources/arrow_left_gray.png" alt="first page reached" />
@@ -112,7 +112,7 @@
  </div>
 
  <!-- the middle page selector -->
- <div style="text-align: center;">
+ <div class="indexnavigationcenter">
  { if $page_selector != "" }
   {$page_selector}
  { /if}
diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl
index ca7042e..401d9af 100644
--- a/themes/default/templates/search.tpl
+++ b/themes/default/templates/search.tpl
@@ -1,4 +1,4 @@
-<span style="vertical-align: middle; text-decoration: underline;">
+<span class="tags">
  <img src="{$web_path}/resources/loupe.png" alt="loupe" />Search:
 </span>
 <form action="" onsubmit="startSearch(); return false;">
@@ -12,7 +12,7 @@
    { literal }
    <script type="text/javascript">
       var options = {
-         script: "rpc.php?action=getxmltaglist&",
+         script: "rpc.php?action=getxmltaglist&amp;",
          varname: "search",
          json: false,
          maxresults: 15
@@ -39,11 +39,11 @@
  </tr>
  <tr>
   <td>Date:</td>
-  <td style="white-space: nowrap;">
+  <td class="nowarp">
    { if ! $date_search_enabled }
-    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();">
+    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();" />
    { else }
-    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();" checked="checked">
+    <input type="checkbox" class="checkbox" name="consider_date" value="Y" onclick="datesearch();" checked="checked" />
    { /if }
    consider date-range
   </td>
@@ -51,12 +51,12 @@
  </tr>
  <tr>
   <td>&nbsp;</td>
-  <td>{$from_date} <a href="javascript:showCalendar('from');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="frompic"/></a></td>
+  <td>{$from_date} <a href="javascript:showCalendar('from');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="frompic" alt="from" /></a></td>
  </tr>
  <tr>
   <td>&nbsp;</td>
   <td>
-   {$to_date} <a href="javascript:showCalendar('to');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="topic" /></a>
+   {$to_date} <a href="javascript:showCalendar('to');" onclick="click(this);"><img src="{$web_path}/resources/date.png" id="topic" alt="to" /></a>
   </td>
   <td>
    <input type="image" class="submit" src="{$web_path}/resources/doit.png" alt="start search" title="start search" onclick="click(this);" />
diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl
index bf3051c..571b524 100644
--- a/themes/default/templates/single_photo.tpl
+++ b/themes/default/templates/single_photo.tpl
@@ -1,6 +1,6 @@
 <!-- Single photo -->
 <div class="header">
- <div style="text-align: left; float: left;">
+ <div class="subheader">
   <b>Photo {$image_name}</b><br />
   {if $photo_count > 0}
    {$photo_number} of {$photo_count}
@@ -14,7 +14,7 @@
    {/if}
   {/if}
  </div>
- <div style="text-align: right;">
+ <div class="textright"">
   <a href="javascript:zoom(-10);" title="zoom_out" onclick="click(this);"><img src="resources/zoom-out.png" /></a>
   <a href="javascript:zoom(0);" title="zoom_100" onclick="click(this);"><img src="resources/zoom-100.png" /></a>
   <a href="javascript:zoom(10);" title="zoom_in" onclick="click(this);"><img src="resources/zoom-in.png" /></a>
@@ -29,7 +29,7 @@
 </div>
 
 <div>
- <div id="photo_details" style="float: right; margin-top: 20px; margin-right: 20px;">
+ <div id="photo_details">
    { if $ExifMadeWith }
    <u><img src="{$web_path}/resources/camera.png" alt="camera icon" />&nbsp;Image taken with:</u><br />
    {$ExifMadeWith}<br />
@@ -67,7 +67,7 @@
 
  <!-- the photo itself -->
 
- <div style="text-align: left; margin-top: 20px; margin-left: 20px;">
+ <div class="photo">
  { if $next_url == "" }
   <a href="{$image_url}" onclick="showPhotoIndex(); return false;" onfocus="click(this);" name="photo">
  { else }
@@ -79,7 +79,7 @@
 
  <!-- navigation arrows -->
 
- <div style="margin-left: 20px;">
+ <div class="photonavigation">
   { if $previous_url == "" }
    <img src="{$web_path}/resources/arrow_left_gray.png" alt="first photo reached" />
   { else }
diff --git a/themes/default/templates/slideshow.tpl b/themes/default/templates/slideshow.tpl
index 84b6a6b..9a8f1fe 100644
--- a/themes/default/templates/slideshow.tpl
+++ b/themes/default/templates/slideshow.tpl
@@ -10,13 +10,13 @@
    <a href="javascript:startSlideShow();" onclick="click(this);" title="stop and revert slideshow"><img id="stop_ico" src="{$web_path}/resources/32_stop.png" /></a>
    <a href="javascript:nextSlide();" onclick="click(this);" title="slide to next photo"><img id="fwd_ico" src="{$web_path}/resources/32_fwd.png" /></a>
   </div>
-  <div style="margin: 0 auto; padding: 10px;">
+  <div id="slide_close">
    <a href="javascript:window.close();" title="click to close slideshow">
-    <img id="slide_img" alt="slideshow_img" style="padding: 15px; background-color: #000000;" />
+    <img id="slide_img" alt="slideshow_img" />
    </a>
   </div>
   <form>
-   <div id="slider-1" tabIndex="1" style="margin: 0 auto;" onclick="if(this.blur)this.blur();">
+   <div id="slider-1" tabIndex="1" onclick="if(this.blur)this.blur();">
    <input id="slider-input-1" name="slider-input-1" onclick="if(this.blur)this.blur();" />
    </div>
   </form>
diff --git a/themes/default/templates/tags.tpl b/themes/default/templates/tags.tpl
index f0e3a47..817cfbc 100644
--- a/themes/default/templates/tags.tpl
+++ b/themes/default/templates/tags.tpl
@@ -1,8 +1,8 @@
-<span style="vertical-align: middle; text-decoration: underline;">
+<span class="tags">
  <img src="{$web_path}/resources/available_tags.png" alt="available tags" />Available Tags:
 </span>
 <div id="available_tags">{ $preset_available_tags }</div>
-<span style="vertical-align: middle; text-decoration: underline;">
+<span class="tags">
  <img src="{$web_path}/resources/selected_tags.png" alt="selected tags" />Selected Tags:
 </span>
  &nbsp;
diff --git a/themes/default/templates/welcome.tpl b/themes/default/templates/welcome.tpl
index 6e6613c..073af00 100644
--- a/themes/default/templates/welcome.tpl
+++ b/themes/default/templates/welcome.tpl
@@ -1,35 +1,35 @@
 <!-- welcome -->
-<div class="header" style="text-align: left;">
+<div class="header">
  phpfspot welcomes you to a dynamic photo gallery for <a href="http://f-spot.org" target="_blank">F-Spot</a><br />
 </div>
-<div style="padding: 10px; margin-left: 10px; margin-right: 10px;">
+<div class="welcome">
 
- <div style="float: left; padding-right: 10px; width: 150px; text-align: center;">
-  <img src="{$web_path}/phpfspot_img.php?idx=rand&width=150&i=1">
- </div>
- <div>
+ <p>
+ <span>
+   <img src="{$web_path}/phpfspot_img.php?idx=rand&amp;width=150&amp;i=1" alt="random image" />
+ </span>
   This application targets to provide an easy way, to presentate your F-Spot<br />
   pictures in the web, in a way where you do not need any of the current<br />
   web2.0 providers or setup complex apps like gallery
- </div>
+ </p>
 
- <br class="clearboth">
+ <br class="clearboth" />
 
- <div style="float: left; padding-right: 10px; width: 150px; text-align: center;">
-  <img src="{$web_path}/phpfspot_img.php?idx=rand&width=150&i=2">
- </div>
- <div>
+ <p>
+ <span>
+   <img src="{$web_path}/phpfspot_img.php?idx=rand&amp;width=150&amp;i=2" alt="random image" />
+ </span>
   You can adapt this welcome page in the file "welcome.tpl" in the template<br />
   directory of your current theme.
- </div>
+ </p>
 
- <br class="clearboth">
+ <br class="clearboth" />
 
- <div style="float: left; padding-right: 10px; width: 150px; text-align: center;">
-  <img src="{$web_path}/phpfspot_img.php?idx=rand&width=150&i=3">
- </div>
- <div>
+ <p>
+ <span>
+   <img src="{$web_path}/phpfspot_img.php?idx=rand&amp;width=150&amp;i=3" alt="random image" />
+ </span>
  <a href="javascript:showPhotoIndex();">[ Click here to take a look at your photo index or select a tag from the list on the left ]</a>
- </div>
+ </p>
 </div>
 <!-- /welcome -->