issue118, user-friendly-url to directly address a photo or a photo-view

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

2 files changed, 17 insertions, 13 deletions

diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl
index 04a3502..8526053 100644
--- a/themes/default/templates/single_photo.tpl
+++ b/themes/default/templates/single_photo.tpl
@@ -15,14 +15,14 @@
   {/if}
  </div>
  <div style="text-align: right;">
-  <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:zoom(-10);" title="zoom_out" onfocus="click(this);"><img src="resources/zoom-out.png" /></a>
+  <a href="javascript:zoom(0);" title="zoom_100" onfocus="click(this);"><img src="resources/zoom-100.png" /></a>
+  <a href="javascript:zoom(10);" title="zoom_in" onfocus="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" />&nbsp;Auto-Browse</a>
   {if $extern_link }
    <a href="{$extern_link}" title="Use this link to return to the current view"><img src="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" />&nbsp;Fullsize</a>
+  <a href="{$image_url_full}" title="orig_image" target="_blank" onfocus="click(this);"><img src="resources/original.png" alt="original resolution" />&nbsp;Fullsize</a>
  </div>
 </div>
 
@@ -45,19 +45,19 @@
     <br />
     <u><img src="resources/small_available_tags.png" alt="available tags" />&nbsp;Tagged with:</u><br />
     { foreach from=$tags key=id item=name }
-    <a class="smalltag" href="javascript:Tags('add', '{$id}');" onclick="click(this);" onclick="click(this);">{$name}</a><br />
+    <a class="smalltag" href="javascript:Tags('add', '{$id}');" onfocus="click(this);">{$name}</a><br />
     { /foreach }
    { /if }
    <hr>
    { if $prev_img }
     <u><img src="resources/photo.png" alt="photo icon" />&nbsp;Previous:</u><br />
-    <a href="{$previous_url}" onclick="click(this);" id="prev_link">
+    <a href="{$previous_url}" onfocus="click(this);" id="prev_link">
      <img src="phpfspot_img.php?idx={$prev_img}&amp;width={$mini_width}" /><br />
     </a>
    { /if}
    { if $next_img }
     <u><img src="resources/photo.png" alt="photo icon" />&nbsp;Next:</u><br />
-    <a href="{$next_url}" onclick="click(this);" id="next_link">
+    <a href="{$next_url}" onfocus="click(this);" id="next_link">
      <img src="phpfspot_img.php?idx={$next_img}&amp;width={$mini_width}" /><br />
     </a>
    { /if}
@@ -67,9 +67,9 @@
 
  <div style="text-align: left; margin-top: 20px; margin-left: 20px;">
  { if $next_url == "" }
-  <a href="javascript:showPhotoIndex();" onclick="click(this);" name="photo">
+  <a href="{$image_url}" onclick="showPhotoIndex(); return false;" onfocus="click(this);" name="photo">
  { else }
-  <a href="{$next_url}" onclick="click(this);" title="click for the next photo" name="photo">
+  <a href="{$image_url}" onclick="{$next_url}; return false;" onfocus="click(this);" title="click for the next photo" name="photo">
  { /if }
    <img src="{$image_url}" width="{$width}" height="{$height}" alt="{$image_filename}" name="photo" id="photo" />
   </a>
@@ -81,17 +81,17 @@
   { if $previous_url == "" }
    <img src="resources/arrow_left_gray.png" alt="first photo reached" />
   { else }
-   <a href="{$previous_url}" onclick="click(this);" title="click for the previous photo (left cursor)">
+   <a href="{$previous_url}" onfocus="click(this);" title="click for the previous photo (left cursor)">
     <img src="resources/arrow_left.png" alt="previous photo" />
    </a>
   { /if }
-   <a href="javascript:showPhotoIndex({$current_page}, {$current_img});" onclick="click(this);" title="click to go back to the index">
+   <a href="javascript:showPhotoIndex({$current_page}, {$current_img});" onfocus="click(this);" title="click to go back to the index">
     <img src="resources/arrow_up.png" alt="photo index" />
    </a>
   { if $next_url == "" }
    <img src="resources/arrow_right_gray.png" alt="last photo reached" />
   { else }
-   <a href="{$next_url}" onclick="click(this);" title="click for the next photo (right cursor)"> 
+   <a href="{$next_url}" onfocus="click(this);" title="click for the next photo (right cursor)">
     <img src="resources/arrow_right.png" alt="next photo" />
    </a>
   { /if}
diff --git a/themes/default/templates/tags.tpl b/themes/default/templates/tags.tpl
index 326c095..42a20ff 100644
--- a/themes/default/templates/tags.tpl
+++ b/themes/default/templates/tags.tpl
@@ -8,4 +8,8 @@
  &nbsp;
  <input type="radio" name="condition" value="or" onclick="Tags('condition', this);" {if $current_condition == "or" } checked="checked" { /if } title="OR condition" />||
  <input type="radio" name="condition" value="and" onclick="Tags('condition', this);" {if $current_condition == "and" } checked="checked" { /if } title="AND condition" />&amp;&amp;
-<div id="selected_tags">no tags selected</div>
+{ if $preset_selected_tags }
+ <div id="selected_tags">{ $preset_selected_tags }</div>
+{ else }
+ <div id="selected_tags">no tags selected</div>
+{ /if }