Merge commit 'origin/master'

[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 bf235d3a0152487913e3272651300fc87a3dff06..c01c6afc4a4190619a5a5572c0ff38eef655fc9f 100644 (file)
--- a/themes/default/templates/photo_index.tpl
+++ b/themes/default/templates/photo_index.tpl
@@ -26,7 +26,7 @@
    Results are limited to a date within {$from_date} to {$to_date}.
   {/if}
  </div>
- <div style="text-align: right">
+<div style="text-align: right">
   {if $slideshow_link }
    <a href="{$slideshow_link}" title="Slideshow" target="_blank"><img src="resources/slideshow.png" /></a>
   {/if}
@@ -41,6 +41,15 @@
   {/if}
  </div>
 </div>
+{ if $tag_result }
+<div style="height: 1px; background-color: #ffffff;"></div>
+<div class="subheader">
+ <div style="display: table-cell; vertical-align: middle;">
+ Tags:
+ </div>
+ { $selected_tags }
+</div>
+{ /if }
 
 <div id="index">
 
@@ -103,18 +112,48 @@
 <br class="clearboth" />
 <script type="text/javascript" language="JavaScript">
 <!--
+   /*** image preloading ***/
    { counter start=-1 }
 
    var current;
    var image_urls = new Array();
+   var last_thumb;
 
    {section name="thumb" loop=$thumbs step=1}
       {if $images[thumb] }
          image_urls[{counter}] = 'phpfspot_img.php?idx={$images[thumb]}&width={$width}';
+         last_thumb = {$images[thumb]};
       {/if}
    {/section}
 
    preloadPhotos(image_urls);
+
+   // auto-scroll
+   //
+   // if browser is to far down the page, that he can't see the photo at all
+   // scroll it up so that at least the last photo becomes visisble.
+   { literal }
+
+   var ywnd = 0;
+   var yimg = 0;
+   // check where we are with the browser
+   if (window.pageYOffset) {
+      ywnd = window.pageYOffset;
+   } else if (document.body && document.body.scrollTop) {
+      ywnd = document.body.scrollTop;
+   }
+   // check the y-pos of the last thumbnail
+   if(thumbimg = document.getElementById('thumbimg' + last_thumb)) {
+      yimg = findPos(thumbimg,'top');
+   }
+   // if the browser-window is scrolled further then the last_thumb, scroll back
+   if(ywnd > yimg) {
+      window.scrollTo(0, yimg-100);
+   }
+
+   { /literal }
+   // auto-scroll
+
 -->
 </script>
 <!-- /Photo Index -->