Fixes for Bug 3089, Date entry fields should indicate required date format

[koha_gimpoz] / koha-tmpl / intranet-tmpl / prog / en / modules / labels / search.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
index 0626f75..adcafbc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
@@ -18,14 +18,10 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
        <input type="hidden" name="op" value="do_search" />
        <input type="hidden" name="batch_id" value="<!-- TMPL_VAR NAME="batch_id" -->" />
        <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" />
+
        <fieldset class="rows">
 <ol><li>
-    <select name="idx" disabled="disabled"><!-- FIXME: script does keyword search regardless -->
-        <option value="kw" selected="selected">Keyword</option>
-    </select>
-    <input type="text" size="30" id="marclist" name="marclist" class="focus" title="Enter search terms" value=""/>  
-</li><!-- FIXME: script does keyword search regardless<li>
-<select name="idx" disabled="disabled">
+<select name="idx" >   <!-- FIXME: script does keyword search regardless -->
 
 <!-- TMPL_IF NAME="selected" --><option value="kw" selected="selected">Keyword</option>
 <!-- TMPL_ELSE --><option value="kw">Keyword</option><!-- /TMPL_IF -->
@@ -68,8 +64,10 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
 <!-- TMPL_IF NAME="selected" --><option value="acqdate" selected="selected">Acquisition Date</option>
 <!-- TMPL_ELSE --><option value="acqdate">Acquisition Date</option><!-- /TMPL_IF -->
 </select>
-   <input type="text" size="30" name="q" title="Enter search terms" value="" disabled="disabled" />  FIXME: script doesn't "catch" q param
-</li> -->
+
+   <input type="text" size="30" id="ccl_textbox" name="ccl_textbox" class="focus" title="Enter search terms" value=""/>
+
+</li>
 </ol>
 </fieldset>
 
@@ -77,31 +75,24 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
 <fieldset><legend>Sort by: </legend>
     <p><select id="sort_by" name="sort_by">
         <option value="">Field-weighted, Relevance Ranked</option>
-<!-- TMPL_ELSE --><!-- /TMPL_IF -->
         <!-- TMPL_LOOP NAME="sort_by_loop" -->
-        
+
 <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="label" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="label" --></option><!-- /TMPL_IF -->
 
-<!-- TMPL_ELSE --><!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
     </select>
         </p>
 </fieldset><!-- /TMPL_IF -->
 
 
-       
-<!--<fieldset class="rows"><table>
-       <tr><th scope="row">
-               <label for="datefrom">Added on or after date</label>
-           </th>
-           <td>
-               <input type="hidden" name="marclist" value="items.dateaccessioned" />
-               <input type="hidden" name="and_or" value="and" />
-               <input type="hidden" name="excluding" value="" />
-               <input type="hidden" name="operator" value=">=" />
-  <input type="text" size="10" id="datefrom" name="value" value="" />                                                      
-  <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top" />
 
+
+<fieldset class="rows">
+<ol>
+       <li>
+               <label for="datefrom">Added on or after date</label>
+            <input type="text" size="10" id="datefrom" name="datefrom" value="" />
+  <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarFrom" alt="Show Calendar" />
 <script type="text/javascript">
     Calendar.setup({
         inputField     :    "datefrom",
@@ -111,20 +102,12 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
         singleClick    :    false
     });
 </script>
-
-
-</td>
-    </tr>
-       <tr><th scope="row">
+<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
+</li>
+<li>
                <label for="dateto">Added on or before date</label>
-           </th>
-           <td>
-               <input type="hidden" name="marclist" value="items.dateaccessioned" />
-               <input type="hidden" name="and_or" value="and" />
-               <input type="hidden" name="excluding" value="" />
-               <input type="hidden" name="operator" value="<=" />
-  <input type="text" size="10" id="dateto" name="value" value="" />                                                      
-  <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" valign="top" />
+  <input type="text" size="10" id="dateto" name="dateto" value="" />
+  <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" id="openCalendarTo" alt="Show Calendar" />
 
 <script type="text/javascript">
     Calendar.setup({
@@ -134,23 +117,9 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
         align          :    "Tl",
     });
 </script>
---><!-- FIXME: script returns ALL type regardless
-    <tr><th scope="row">Document Type</th>
-                <td colspan="2">
-                    <select name="Filter" disabled="disabled">
-                        <option value="">All Item Types</option>
-<!-- TMPL_ELSE --><!-- /TMPL_IF -->
-                        <!-- TMPL_LOOP name="itemtypeloop" -->
-                            <!-- TMPL_IF name="selected" -->
-                                <option value="<!-- TMPL_VAR name="value" -->"  selected="selected" >
-                            <!-- TMPL_ELSE -->
-                                <option value="<!-- TMPL_VAR name="value" -->">
-                            <!-- /TMPL_IF --><!-- TMPL_VAR name="description" --></option>
-<!-- TMPL_ELSE --><!-- /TMPL_IF -->
-                        <!-- /TMPL_LOOP -->
-                    </select>
-                </td>
-            </tr></table></fieldset>-->
+<div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
+</li></ol>
+</fieldset>
 
 <fieldset class="action"><input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
 </form>