show different view for tag- & search-results in photo index view

git-svn-id: file:///var/lib/svn/phpfspot/trunk@84 fa6a889d-dae6-447d-9e79-4ba9a3039384

diff --git a/phpfspot.class.php b/phpfspot.class.php
index c4dddb4efb3e85eed087f0348eb08441aa5bbdb4..c954a3ac95f35625531dc8f3fdc3435610195bf3 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -309,7 +309,8 @@ class PHPFSPOT {
       // +1 for for smarty's selection iteration
       $rows++;
 
       // +1 for for smarty's selection iteration
       $rows++;
 

-         //$images.= "<img src=\"phpfspot_img.php?idx=". $photo ."&amp;width=". $this->cfg->thumb_width ."\" /><br />\n";
+      if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '')
+         $this->tmpl->assign('searchfor', $_SESSION['searchfor']);

 
       $this->tmpl->assign('count', $count);
       $this->tmpl->assign('width', $this->cfg->thumb_width);
 
       $this->tmpl->assign('count', $count);
       $this->tmpl->assign('width', $this->cfg->thumb_width);

diff --git a/templates/photo_index.tpl b/templates/photo_index.tpl
index 1647f5a9040d8170df823f83092a6aacd7284f98..f4742237dc38188cff4184858df8d3a2df84e994 100644 (file)
--- a/templates/photo_index.tpl
+++ b/templates/photo_index.tpl
@@ -3,10 +3,18 @@
  <tr>
   <td class="index_header">
    <b>Photo Index</b><br />
  <tr>
   <td class="index_header">
    <b>Photo Index</b><br />

-   {if $count == 1}
-      {$count} image has been found for the selected tags
-   {else}
+   {if ! $searchfor }
+    {if $count == 1}
+     {$count} image has been found for the selected tags
+    {else}

       {$count} images have been found for the selected tags
       {$count} images have been found for the selected tags

+    {/if}
+   {else}
+    {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}

    {/if}
   </td>
  </tr>
    {/if}
   </td>
  </tr>