fix conflicts during merge of Arun's tree

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

diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index 413ec2668f6713d70f1b54c4e5c0aa2af2b58116..2dedf86d89e3fbb1c4c1f1bba9e4d822ccce64f7 100644 (file)
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -1,4 +1,7 @@
 <!-- Photo Index -->
+
+<!-- Header - displays count of matched photos and some link's -->
+
 <div class="header">
  <div class="subheader">
   <b>Photo Index</b>
@@ -28,19 +31,23 @@
  </div>
 <div class="textright">
   {if $slideshow_link }
-   <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="resources/slideshow.png" /></a>
+   <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="{$web_path}/resources/slideshow.png" />&nbsp;Slideshow</a>
   {/if}
   {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} 
   {if $export_link }
-   <a href="{$export_link}" target="_blank" title="this will open a new browser window where you can export this page in several formats"><img src="resources/export.png" /></a>
+   <a href="{$export_link}" target="_blank" title="this will open a new browser window where you can export this page in several formats"><img src="{$web_path}/resources/export.png" />&nbsp;Export</a>
   {/if}
   {if $rss_link }
-   <a href="{$rss_link}" target="_blank" title="RSS feed"><img src="resources/rss.png" /></a>
+   <a href="{$rss_link}" target="_blank" title="RSS feed"><img src="{$web_path}/resources/rss.png" />&nbsp;RSS-Feed</a>
   {/if}
  </div>
 </div>
+
+<!-- if result of a tag-search is displayed, show the selected tags
+     with some small pictures in a bar. -->
+
 { if $tag_result }
 <div class="tagresult"></div>
 <div class="subheader">
@@ -51,6 +58,8 @@
 </div>
 { /if }
 
+<!-- the photo matrix itself -->
+
 <div id="index">
 
  {section name="thumb" loop=$thumbs step=1}
@@ -64,7 +73,7 @@
     {$img_name[thumb]}
     </a>
     { if $use_lightbox }
-    <a href="phpfspot_img.php?idx={$images[thumb]}&amp;width={$preview_width}" alt="thumb_{$images[thumb]}" rel="lightbox[photoidx]" title="Preview of {$img_fullname[thumb]}"><img src="resources/eyes.png" /></a>
+    <a href="{$web_path}/phpfspot_img.php?idx={$images[thumb]}&amp;width={$preview_width}" alt="thumb_{$images[thumb]}" rel="lightbox[photoidx]" title="Preview of {$img_fullname[thumb]}"><img src="{$web_path}/resources/eyes.png" /></a>
     { /if }
    </div>
 
@@ -80,11 +89,11 @@
  <div class="indexnavigationright">
  { if $next_url == "" }
   { if $count != 0 }
-   <img src="resources/arrow_right_gray.png" alt="last page reached" />
+   <img src="{$web_path}/resources/arrow_right_gray.png" alt="last page reached" />
   { /if }
  { else }
   <a href="{$next_url}" id="next_link" title="click for the next page (right cursor)">
-   <img src="resources/arrow_right.png" alt="next photo" />
+   <img src="{$web_path}/resources/arrow_right.png" alt="next photo" />
   </a>
  { /if}
  </div>
@@ -93,11 +102,11 @@
  <div class="indexnavigationleft">
  { if $previous_url == "" }
   { if $count != 0 }
-   <img src="resources/arrow_left_gray.png" alt="first page reached" />
+   <img src="{$web_path}/resources/arrow_left_gray.png" alt="first page reached" />
   { /if }
  { else }
   <a href="{$previous_url}" id="prev_link" title="click for the previous page (left cursor)">
-  <img src="resources/arrow_left.png" alt="previous photo" />
+  <img src="{$web_path}/resources/arrow_left.png" alt="previous photo" />
   </a>
  { /if }
  </div>
@@ -121,7 +130,7 @@
 
    {section name="thumb" loop=$thumbs step=1}
       {if $images[thumb] }
-         image_urls[{counter}] = 'phpfspot_img.php?idx={$images[thumb]}&width={$width}';
+         image_urls[{counter}] = '{$web_path}/phpfspot_img.php?idx={$images[thumb]}&width={$width}';
          last_thumb = {$images[thumb]};
       {/if}
    {/section}