fix conflicts in single_photo.tpl

[phpfspot.git] / themes / default / templates / single_photo.tpl

diff --git a/themes/default/templates/single_photo.tpl b/themes/default/templates/single_photo.tpl
index a16776e186373db45c040add5ba2c46100cc7785..bf3051cf247e713ee6b60f4df8a0edc9c488b847 100644 (file)
--- a/themes/default/templates/single_photo.tpl
+++ b/themes/default/templates/single_photo.tpl
@@ -16,13 +16,13 @@
  </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_in" onclick="click(this);"><img src="resources/zoom-100.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/32_play.png" /></a>
   {if $extern_link }
-   <a href="{$extern_link}" title="Use this link to return to the current view"><img src="resources/link.png" /></a>
+   <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}" target="_blank" onclick="click(this);">
+  <a href="{$image_url_full}" title="orig_image" target="_blank" onclick="click(this);">
    <img src="resources/original.png" alt="original resolution" />
   </a>
  </div>
@@ -31,36 +31,36 @@
 <div>
  <div id="photo_details" style="float: right; margin-top: 20px; margin-right: 20px;">
    { if $ExifMadeWith }
-   <u><img src="resources/camera.png" alt="camera icon" />&nbsp;Image taken with:</u><br />
+   <u><img src="{$web_path}/resources/camera.png" alt="camera icon" />&nbsp;Image taken with:</u><br />
    {$ExifMadeWith}<br />
    { /if }
    { if $ExifMadeOn }
-   <u><img src="resources/date.png" alt="calendar icon" />&nbsp;Image made on:</u><br />
+   <u><img src="{$web_path}/resources/date.png" alt="calendar icon" />&nbsp;Image made on:</u><br />
    {$ExifMadeOn}<br />
    { /if }
    { if $ExifOrigResolution }
-   <u><img src="resources/image.png" alt="resolution icon" />&nbsp;Original resolution:</u><br />
+   <u><img src="{$web_path}/resources/image.png" alt="resolution icon" />&nbsp;Original resolution:</u><br />
    {$ExifOrigResolution}<br />
    { /if }
    <u>Size:</u>&nbsp;{$ExifFileSize}<br />
    { if $tags }
     <br />
-    <u><img src="resources/small_available_tags.png" alt="available tags" />&nbsp;Tagged with:</u><br />
+    <u><img src="{$web_path}/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">
-     <img src="phpfspot_img.php?idx={$prev_img}&amp;width={$mini_width}" /><br />
+    <u><img src="{$web_path}/resources/photo.png" alt="photo icon" />&nbsp;Previous:</u><br />
+    <a href="{$previous_url}" onfocus="click(this);" id="prev_link">
+     <img src="{$web_path}/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">
-     <img src="phpfspot_img.php?idx={$next_img}&amp;width={$mini_width}" /><br />
+    <u><img src="{$web_path}/resources/photo.png" alt="photo icon" />&nbsp;Next:</u><br />
+    <a href="{$next_url}" onfocus="click(this);" id="next_link">
+     <img src="{$web_path}/phpfspot_img.php?idx={$next_img}&amp;width={$mini_width}" /><br />
     </a>
    { /if}
  </div>
@@ -69,9 +69,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,20 +81,20 @@
 
  <div style="margin-left: 20px;">
   { if $previous_url == "" }
-   <img src="resources/arrow_left_gray.png" alt="first photo reached" />
+   <img src="{$web_path}/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)">
-    <img src="resources/arrow_left.png" alt="previous photo" />
+   <a href="{$previous_url}" onfocus="click(this);" title="click for the previous photo (left cursor)">
+    <img src="{$web_path}/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">
-    <img src="resources/arrow_up.png" alt="photo index" />
+   <a href="javascript:showPhotoIndex({$current_page}, {$current_img});" onfocus="click(this);" title="click to go back to the index">
+    <img src="{$web_path}/resources/arrow_up.png" alt="photo index" />
    </a>
   { if $next_url == "" }
-   <img src="resources/arrow_right_gray.png" alt="last photo reached" />
+   <img src="{$web_path}/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)"> 
-    <img src="resources/arrow_right.png" alt="next photo" />
+   <a href="{$next_url}" onfocus="click(this);" title="click for the next photo (right cursor)">
+    <img src="{$web_path}/resources/arrow_right.png" alt="next photo" />
    </a>
   { /if}
  </div>
@@ -106,9 +106,9 @@
 
    /* lets preload to previous and the next image to speedup */
    var image_next = new Image();
-   image_next.src = "phpfspot_img.php?idx={$next_img}&width={$photo_width}";
+   image_next.src = "{$web_path}/phpfspot_img.php?idx={$next_img}&width={$photo_width}";
    var image_prev = new Image();
-   image_prev.src = "phpfspot_img.php?idx={$prev_img}&width={$photo_width}";
+   image_prev.src = "{$web_path}/phpfspot_img.php?idx={$prev_img}&width={$photo_width}";
 
 -->
 </script>