Updating search form to match added features of 2.2

diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl
index bc62fe4..8871ec4 100644 (file)
--- a/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl
@@ -10,51 +10,81 @@
 <form name="f" method="post" action="/cgi-bin/koha/opac-search.pl">
 <div class="form">
 <table>
-<tr><th><label>Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
+<tr><th><label for="keyword">Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
                        <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
                <input type="hidden" name="marclist" value="" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" />
-                       <input type="text" name="value" onchange="sql_update()" /></td></tr>
-<tr><th><label>Title</label></th><td><input type="hidden" name="marclist" value="biblio.title" />
+                       <input type="text" id="keyword" name="value" /></td></tr>
+<tr><th><label for="title">Title</label></th><td><input type="hidden" name="marclist" value="biblio.title" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" />
-                       <input type="text" name="value" onchange="sql_update()" /></td></tr>
-<tr><th><label class="label20">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
+                       <input type="text" id="title" name="value" /></td></tr>
+<tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" />
-                       <input type="text" name="value" onchange="sql_update()" /></td></tr>
-<!-- <tr><th><label class="label20">Barcode</label></th><td>
-                               <input type="hidden" name="marclist" value="items.barcode" />
-                               <input type="hidden" name="and_or" value="and" />
-                               <input type="hidden" name="excluding" value="" />
-                               <input type="hidden" name="operator" value="contains" />
-                               <input type="text" name="value" onchange="sql_update()" /></td></tr>
-<tr><th><label class="label20">Illustrator</label></th><td><input type="hidden" name="marclist" value="biblioitems.illus" />
+                       <input type="text" id="author" name="value" /></td></tr>
+<tr><th><label for="subject">Subject</label></th><td>                  
+                       <input type="hidden" name="marclist" value="bibliosubject.subject" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
-                       <input type="hidden" name="operator" value="contains" />
-                       <input type="text" name="value" onchange="sql_update()" /></td></tr>
-<tr><th><label class="label20">Dewey</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
+                       <input type="hidden" name="operator" value="contains" />  
+                       <input type="text" id="subject" name="value" size="35" /></td></tr>
+<tr><th><label for="seriestitle">Series title</label></th><td>                 
+                       <input type="hidden" name="marclist" value="biblio.seriestitle" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" />
-                       <input type="text" name="value" onchange="sql_update()" /></td></tr> -->
-<tr><th><label class="label20">Format</label></th><td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
+                       <input type="text" id="seriestitle" name="value" size="35"/></td></tr>
+
+<tr><th><label for="itemtype">Format</label></th><td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="=" />
                        <!-- TMPL_VAR name="CGIitemtype" --></td></tr>
-<tr><th><label class="label20">Location</label></th><td><input type="hidden" name="marclist" value="items.holdingbranch" />
+<tr><th><label for="branch">Location</label></th><td><input type="hidden" name="marclist" value="items.holdingbranch" />
                                <input type="hidden" name="and_or" value="and" />
                                <input type="hidden" name="excluding" value="" />
                                <input type="hidden" name="operator" value="=" />  
                                <!-- TMPL_VAR name="CGIbranch" --></td></tr>
 </table>                       
-
+<table>
+<caption>Other options:</caption>
+<tr><th><label for="barcode">Barcode</label></th><td>
+                               <input type="hidden" name="marclist" value="items.barcode" />
+                               <input type="hidden" name="and_or" value="and" />
+                               <input type="hidden" name="excluding" value="" />
+                               <input type="hidden" name="operator" value="=" />
+                               <input type="text" id="barcode" name="value" size="14" maxlength="14" /></td></tr>
+<tr><th><label for="dewey">Call Number</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+                       <input type="hidden" name="operator" value="start" />
+                       <input type="text" id="dewey" name="value" /></td></tr>
+<tr><th><label for="isbn">ISBN</label></th><td><input type="hidden" name="marclist" value="biblioitems.isbn" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+                       <input type="hidden" name="operator" value="start" />
+                       <input type="text" id="isbn" name="value" /></td></tr>
+<tr><th><label for="publisher">Publisher</label></th><td><input type="hidden" name="marclist" value="biblioitems.publishercode" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+                       <input type="hidden" name="operator" value="contains" />
+                       <input type="text" id="publisher" name="value" /></td></tr>
+<tr><th><label for="pubbetween">Published between</label></th><td><input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+                       <input type="hidden" name="operator" value=">=" />
+                       <input type="text" id="pubbetween" name="value" size="6" maxlength="4" /></td></tr>
+<tr><th><label for="puband">...and</label></th><td><input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+                       <input type="hidden" name="operator" value="<=" />
+                       <input type="text" id="puband" name="value" size="6" maxlength="4" /></td></tr>
+</table>
                <p>Results per page :
                        <select name="resultsperpage" size="1">
                                <option value="20">20</option>
@@ -76,15 +106,6 @@
        </div>
 </form>
 
-<h3>Search by Subject</h3>
-<form action="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl" method="post">
-<div class="form">
-<table>
- <tr><th><label for="subject">Subject</label></th><td><input type="text"  id="subject" size="25"   name="subject" /></td></tr>
-</table><input type="submit" value="Search" class="submit" />
-</div>
-</form>
-
 <script type="text/javascript">
 function sql_update() {
 document.f.sql.value="";