summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Unterkircher <unki@netshadow.at>2007-06-11 19:51:21 +0000
committerAndreas Unterkircher <unki@netshadow.at>2007-06-11 19:51:21 +0000
commit46969d30b2966f33b0529435a5840d5289996799 (patch)
treefd57c64ef50bd6bb3a686247473b445ad1e9233f
parent452d430a01e512eeb1b6d4c0f2caa89522ce748c (diff)
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
-rw-r--r--phpfspot.class.php3
-rw-r--r--templates/photo_index.tpl14
2 files changed, 13 insertions, 4 deletions
diff --git a/phpfspot.class.php b/phpfspot.class.php
index c4dddb4..c954a3a 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -309,7 +309,8 @@ class PHPFSPOT {
// +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);
diff --git a/templates/photo_index.tpl b/templates/photo_index.tpl
index 1647f5a..f474223 100644
--- a/templates/photo_index.tpl
+++ b/templates/photo_index.tpl
@@ -3,10 +3,18 @@
<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
+ {/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>