issue50, further code changes to be able to combine tag- and date-search

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

1 files changed, 10 insertions, 13 deletions

diff --git a/templates/photo_index.tpl b/templates/photo_index.tpl
index 2b4c827..f9c651d 100644
--- a/templates/photo_index.tpl
+++ b/templates/photo_index.tpl
@@ -4,33 +4,30 @@
   <td colspan="3">
    <table style="width: 100%;">
     <tr>
-     <td class="index_header">
+     <td class="content_title">
       <b>Photo Index</b>
       {if $searchfor }
        {if $count == 1}
-        {$count} image is the result for your search about "{$searchfor}"
+        {$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}
+        {$count} images are the result for your search about "{$searchfor}".
        {/if}
       {elseif $tag_result}
        {if $count == 1}
-        {$count} image has been found for the selected tags
+        {$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 has been found
+        {$count} image has been found.
        {else}
-        {$count} images have been found
+        {$count} images have been found.
        {/if}
       {/if}
+      {if $from_date && $to_date }
+       Results are limited to a date between {$from_date} to {$to_date}.
+      {/if}
      </td>
      <td class="index_header" style="text-align: right">
       {if $extern_link }