diff options
author | Andreas Unterkircher <unki@netshadow.at> | 2007-07-15 15:48:26 +0000 |
---|---|---|
committer | Andreas Unterkircher <unki@netshadow.at> | 2007-07-15 15:48:26 +0000 |
commit | 5bf0159aa38d4d1b8952e0933cea14761c9de34e (patch) | |
tree | abda5609a30432750f9ce6e7bb6c2a3e7c831d33 | |
parent | 350ffa92282e6b5adf3dc2b854fbb2255c845b8e (diff) |
issue49, fixed display header text in photo index
git-svn-id: file:///var/lib/svn/phpfspot/trunk@212 fa6a889d-dae6-447d-9e79-4ba9a3039384
-rw-r--r-- | phpfspot.class.php | 9 | ||||
-rw-r--r-- | templates/photo_index.tpl | 20 |
2 files changed, 25 insertions, 4 deletions
diff --git a/phpfspot.class.php b/phpfspot.class.php index 2e491c5..1c1e864 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -751,6 +751,15 @@ class PHPFSPOT { if(isset($_SESSION['searchfor']) && $_SESSION['searchfor'] != '') $this->tmpl->assign('searchfor', $_SESSION['searchfor']); + if(isset($_SESSION['from_date']) && isset($_SESSION['to_date'])) { + $this->tmpl->assign('from_date', $_SESSION['from_date']); + $this->tmpl->assign('to_date', $_SESSION['to_date']); + } + + if(isset($_SESSION['selected_tags']) && !empty($_SESSION['selected_tags'])) { + $this->tmpl->assign('tag_result', 1); + } + /* do we have to display the page selector ? */ if($this->cfg->rows_per_page != 0) { diff --git a/templates/photo_index.tpl b/templates/photo_index.tpl index 61fd8a8..e4ed521 100644 --- a/templates/photo_index.tpl +++ b/templates/photo_index.tpl @@ -5,8 +5,20 @@ <table style="width: 100%;"> <tr> <td class="index_header"> - <b>Photo Index,</b> - {if ! $searchfor } + <b>Photo Index</b> + {if $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 $from_date } + {if $count == 1} + {$count} image is the result for your search between {$from_date} to {$to_date} + {else} + {$count} images are the result for your search between {$from_date} to {$to_date} + {/if} + {elseif $tag_result} {if $count == 1} {$count} image has been found for the selected tags {else} @@ -14,9 +26,9 @@ {/if} {else} {if $count == 1} - {$count} image is the result for your search about "{$searchfor}" + {$count} image has been found {else} - {$count} images are the result for your search about "{$searchfor}" + {$count} images have been found {/if} {/if} </td> |