From 94b3b6259391b0d2f206c792974b6ff53a70aa63 Mon Sep 17 00:00:00 2001
From: Andreas Unterkircher <unki@netshadow.at>
Date: Mon, 12 May 2008 08:03:25 +0200
Subject: issue118, fix using variable name for search.tpl and photo_index.tpl
 twice

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
---
 themes/default/templates/search.tpl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'themes')

diff --git a/themes/default/templates/search.tpl b/themes/default/templates/search.tpl
index 401d9af..767cbcf 100644
--- a/themes/default/templates/search.tpl
+++ b/themes/default/templates/search.tpl
@@ -51,13 +51,11 @@
  </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" alt="from" /></a></td>
+  <td>{$search_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" alt="to" /></a>
-  </td>
+  <td>{$search_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);" />
   </td>
-- 
cgit v1.2.3-18-g5258


From 1445a54ab47df6b11199cdd1c35b2abd8001d61e Mon Sep 17 00:00:00 2001
From: Andreas Unterkircher <unki@netshadow.at>
Date: Mon, 12 May 2008 08:26:46 +0200
Subject: refix some introduced template-errors in the HTML code

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
---
 themes/default/templates/photo_index.tpl  | 4 +++-
 themes/default/templates/single_photo.tpl | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'themes')

diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index 2dedf86..333d80e 100644
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -49,10 +49,12 @@
      with some small pictures in a bar. -->
 
 { if $tag_result }
+<!-- seperator -->
 <div class="tagresult"></div>
+<!-- /seperator -->
 <div class="subheader">
  <div class="tagresulttags">
- Tags:
+  Tags:
  </div>
  { $selected_tags }
 </div>
diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl
index fb79985..3f85e96 100644
--- a/themes/default/templates/single_photo.tpl
+++ b/themes/default/templates/single_photo.tpl
@@ -14,17 +14,15 @@
    {/if}
   {/if}
  </div>
- <div class="textright"">
+ <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>
-  <a href="javascript:startAutoBrowse();" title="auto browsing"><img id="autobrowse_ico" src="resources/16_play.png" /></a>
+  <a href="javascript:startAutoBrowse();" title="auto browsing"><img id="autobrowse_ico" src="resources/16_play.png" />&nbsp;Auto-Browse</a>
   {if $extern_link }
    <a href="{$extern_link}" title="Use this link to return to the current view"><img src="{$web_path}/resources/link.png" />&nbsp;External Link</a>
   {/if}
-  <a href="{$image_url_full}" title="orig_image" target="_blank" onclick="click(this);">
-   <img src="resources/original.png" alt="original resolution" />
-  </a>
+  <a href="{$image_url_full}" title="orig_image" target="_blank" onclick="click(this);"><img src="resources/original.png" alt="original resolution" />&nbsp;Fullsize</a>
  </div>
 </div>
 
-- 
cgit v1.2.3-18-g5258


From a3a90c2dc722e2b2a81dd1ee5eedea96e5f9fd4d Mon Sep 17 00:00:00 2001
From: Andreas Unterkircher <unki@netshadow.at>
Date: Tue, 13 May 2008 06:11:00 +0200
Subject: display photos in photo-index also if no JavaScript is enabled

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
---
 themes/default/templates/photo_index.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes')

diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index 333d80e..b14afe4 100644
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -70,7 +70,7 @@
 
    <div class="thumb" onmouseover="setBackGrdColor(this, 'mouseover');" onmouseout="setBackGrdColor(this, 'mouseout');" style="width: { $thumb_container_width }px; height: { $thumb_container_height }px;">
     <a href="javascript:showImage({$images[thumb]}, 'scrollup');" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onclick="click(this);" title="{$img_title[thumb]}">
-     <img class="thumb" id="thumbimg{$images[thumb]}" width="{$img_width[thumb]}" height="{$img_height[thumb]}" />
+     <img class="thumb" id="thumbimg{$images[thumb]}" width="{$img_width[thumb]}" height="{$img_height[thumb]}" src="{$web_path}/phpfspot_img.php?idx={$images[thumb]}&width={$width}" />
      <br />
     {$img_name[thumb]}
     </a>
-- 
cgit v1.2.3-18-g5258


From 8e14a6b9e1c7d2dfc25e786c425d76acc115f393 Mon Sep 17 00:00:00 2001
From: Andreas Unterkircher <unki@netshadow.at>
Date: Tue, 13 May 2008 19:31:16 +0200
Subject: issue118, user-friendly-url's to jump from photo-index to
 single-photo-view

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
---
 themes/default/templates/photo_index.tpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'themes')

diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index b14afe4..9f0531e 100644
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -69,7 +69,11 @@
   {if $images[thumb] }
 
    <div class="thumb" onmouseover="setBackGrdColor(this, 'mouseover');" onmouseout="setBackGrdColor(this, 'mouseout');" style="width: { $thumb_container_width }px; height: { $thumb_container_height }px;">
-    <a href="javascript:showImage({$images[thumb]}, 'scrollup');" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onclick="click(this);" title="{$img_title[thumb]}">
+    { if $user_friendly_url }
+    <a href="{$web_path}/photoview/{$images[thumb]}" onclick="showImage({$images[thumb]}, 'scrollup'); return false;" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onfocus="click(this);" title="{$img_title[thumb]}">
+    { else }
+    <a href="{$web_path}/index.php?mode=showp&amp;id={$images[thumb]}" onclick="showImage({$images[thumb]}, 'scrollup'); return false;" id="thumblink{$images[thumb]}" name="image{$img_id[thumb]}" class="thumblink" onfocus="click(this);" title="{$img_title[thumb]}">
+    { /if }
      <img class="thumb" id="thumbimg{$images[thumb]}" width="{$img_width[thumb]}" height="{$img_height[thumb]}" src="{$web_path}/phpfspot_img.php?idx={$images[thumb]}&width={$width}" />
      <br />
     {$img_name[thumb]}
-- 
cgit v1.2.3-18-g5258