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

3 files changed, 16 insertions, 18 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 }
diff --git a/templates/search.tpl b/templates/search.tpl
index f0f8c0d..c87d29e 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -7,7 +7,7 @@
  <tr>
   <td class="searchfor">
    <table>
-    <form action="" onsubmit="startTagSearch(document.getElementsByName('searchfor')[0].value); return false;">
+    <form action="" onsubmit="startSearch(); return false;">
     <tr>
      <td>Tag:</td>
      <td>
@@ -17,12 +17,13 @@
       <input type="image" src="resources/doit.png" alt="Tag-Search" />
      </td>
     </tr>
-    </form>
-    <form action="" onsubmit="startDateSearch(); return false;">
     <tr>
      <td>Date:</td>
-     <td>{$from_date} <a href="javascript:showCalendar('from');"><img src="resources/date.png" id="frompic"/></a></td>
+     <td><input type="checkbox" name="consider_date" value="Y" onclick="datesearch();">consider date-search
+    </tr>
+    <tr>
      <td>&nbsp;</td>
+     <td>{$from_date} <a href="javascript:showCalendar('from');"><img src="resources/date.png" id="frompic"/></a></td>
     </tr>
     <tr>
      <td>&nbsp;</td>
diff --git a/templates/single_photo.tpl b/templates/single_photo.tpl
index 5275843..8dfd433 100644
--- a/templates/single_photo.tpl
+++ b/templates/single_photo.tpl
@@ -1,7 +1,7 @@
 <!-- Single photo -->
 <table>
  <tr>
-  <td class="photo_name" style="text-align: left;">
+  <td class="content_title" style="text-align: left;">
    <b>Photo {$image_name}</b><br />
    &nbsp;{$description}<br />
   </td>