X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=themes%2Fdefault%2Ftemplates%2Fphoto_index.tpl;h=ddc3229df5a6b00ed6da0dafa0a99a5fd7890e68;hp=b14afe4a65583ff2e08e5f0ba828c6df3ee99ffe;hb=ea36e81b91c8689ae44d413eca4697d1993ac30b;hpb=a3a90c2dc722e2b2a81dd1ee5eedea96e5f9fd4d

diff --git a/themes/default/templates/photo_index.tpl b/themes/default/templates/photo_index.tpl
index b14afe4..ddc3229 100644
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -3,15 +3,15 @@
 <!-- Header - displays count of matched photos and some link's -->
 
 <div class="header">
- <div class="subheader">
+ <div class="header_title">
   <b>Photo Index</b>
-  {if $searchfor }
+  {if isset($searchfor) }
    {if $count == 1}
     {$count} image is the result for your search about "{$searchfor}".
    {else}
     {$count} images are the result for your search about "{$searchfor}".
    {/if}
-  {elseif $tag_result}
+  {elseif isset($tag_result)}
    {if $count == 1}
     {$count} image has been found for the selected tags.
    {else}
@@ -24,22 +24,22 @@
     {$count} images have been found.
    {/if}
   {/if}
-  {if $from_date && $to_date }
+  {if isset($from_date) && isset($to_date) }
    <br />
    Results are limited to a date within {$from_date} to {$to_date}.
   {/if}
  </div>
-<div class="textright">
-  {if $slideshow_link }
+ <div class="header_menu">
+  {if isset($slideshow_link) }
    <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="{$web_path}/resources/slideshow.png" />&nbsp;Slideshow</a>
   {/if}
-  {if $extern_link }
+  {if isset($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} 
-  {if $export_link }
+  {if isset($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="{$web_path}/resources/export.png" />&nbsp;Export</a>
   {/if}
-  {if $rss_link }
+  {if isset($rss_link) }
    <a href="{$rss_link}" target="_blank" title="RSS feed"><img src="{$web_path}/resources/rss.png" />&nbsp;RSS-Feed</a>
   {/if}
  </div>
@@ -48,16 +48,16 @@
 <!-- if result of a tag-search is displayed, show the selected tags
      with some small pictures in a bar. -->
 
-{ if $tag_result }
+{ if isset($tag_result) }
 <!-- seperator -->
-<div class="tagresult"></div>
-<!-- /seperator -->
-<div class="subheader">
- <div class="tagresulttags">
+ <div class="tagresult"></div>
+ <!-- /seperator -->
+ <div class="tagresulttags" style="float: left;">
   Tags:
  </div>
- { $selected_tags }
-</div>
+ <div class="tagresulttags">
+  { $selected_tags }
+ </div>
 { /if }
 
 <!-- the photo matrix itself -->
@@ -66,17 +66,29 @@
 
  {section name="thumb" loop=$thumbs step=1}
 
-  {if $images[thumb] }
+  {if isset($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 isset($user_friendly_url) }
+    <a href="{$web_path}/photoview/{$images[thumb]}" onclick="showPhoto({$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="showPhoto({$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]}
     </a>
-    { if $use_lightbox }
+    <!-- show lightbox eyes, if enabled -->
+    { if isset($use_lightbox) }
     <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 }
+    <!-- show F-Spot photo rating value, if available -->
+    { if isset($img_rating[thumb]) }
+     <br />
+     {section name="rating" loop=$img_rating[thumb] step=1}
+      <img src="{$web_path}/resources/star.png" />
+     {/section}
+    { /if }
    </div>
 
   {/if}
@@ -84,12 +96,12 @@
  {/section} 
 
 </div>
-<br class="clearboth" />
+<br class="cb" />
 <div class="indexnavigation">
 
  <!-- the right nav arrow -->
  <div class="indexnavigationright">
- { if $next_url == "" }
+ { if !isset($next_url) || $next_url == "" }
   { if $count != 0 }
    <img src="{$web_path}/resources/arrow_right_gray.png" alt="last page reached" />
   { /if }
@@ -102,7 +114,7 @@
 
  <!-- the left nav arrow -->
  <div class="indexnavigationleft">
- { if $previous_url == "" }
+ { if !isset($previous_url) || $previous_url == "" }
   { if $count != 0 }
    <img src="{$web_path}/resources/arrow_left_gray.png" alt="first page reached" />
   { /if }
@@ -115,15 +127,21 @@
 
  <!-- the middle page selector -->
  <div class="indexnavigationcenter">
- { if $page_selector != "" }
+ { if isset($page_selector) && $page_selector != "" }
   {$page_selector}
  { /if}
  </div>
 </div>
-<br class="clearboth" />
+<br class="cb" />
 <script type="text/javascript" language="JavaScript">
 <!--
-   /*** image preloading ***/
+   // image preloading
+   //
+   // these few javascript lines will try to speed up loading all the photo
+   // thumbnails. An array of all photos to display will be built written
+   // by the smarty-template. The js-code will then loop through this array
+   // and invoke loading of each photo. Sadly this does not work good on all
+   // browsers.
    { counter start=-1 }
 
    var current;
@@ -131,7 +149,7 @@
    var last_thumb;
 
    {section name="thumb" loop=$thumbs step=1}
-      {if $images[thumb] }
+      {if isset($images[thumb]) }
          image_urls[{counter}] = '{$web_path}/phpfspot_img.php?idx={$images[thumb]}&width={$width}';
          last_thumb = {$images[thumb]};
       {/if}