Porting OPAC search template to librarian interface

diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
index 5e0c21e..4e5dd0a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
@@ -14,70 +14,89 @@
        <div id="bloc25">
                <h2 class="catalogue">Search on</h2>
                <p>
-                       <label class="label20">Keyword</label>
-                       <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()">
+                       <input type="hidden" name="op" value="do_search" />
+                       <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+                       <label class="label100">Any word</label>
+                       <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()" size="35" />
                </p>
                <p>
-                       <label class="label20">Title</label>
-                       <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()">
+                       <label class="label100">Title</label>
+                       <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()" size="35" />
                </p>
                <p>
-                       <label class="label20">author</label> <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()">
+                       <label class="label100">Author</label> <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()" size="35" />
+               </p>
+               <p>
+                       <label class="label100">Subject</label>
+                       <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()" size="35" />
+               </p>
+               <p>
+                       <label class="label100">Item Type</label>
+                       <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" -->
+               </p>
+               <p>
+                               <label class="label100">Branch</label>
+                               <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" -->
                </p>
-       <p>
-                               <label class="label20">barcode</label>
-                               <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()">
-       </p>
        </div>
        <div id="bloc25">
-               <h2 class="catalogue">Search on</h2>
+               <h2 class="catalogue">Other options</h2>
                <p>
-                       <label class="label20">Illustrator</label>
-                       <input type="hidden" name="marclist" value="biblioitems.illus">
-                       <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()">
+                               <label class="label100">Item barcode</label>
+                               <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()" /> 
                </p>
                <p>
-                       <label class="label20">Dewey</label><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="contains">
-                       <input type="text" name="value" onchange="sql_update()">
+                       <label class="label100">Call Number</label>
+                       <input type="hidden" name="marclist" value="items.itemcallnumber" />
+                       <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()" />
                </p>
                <p>
-                       <label class="label20">Item Type</label> <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" -->
+                       <label class="label100">ISBN</label>
+                       <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="=" />
+                       <input type="text" name="value" onchange="sql_update()" />
+               </p>
+               <p>
+                       <label class="label100">Publisher</label>
+                       <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" name="value" onchange="sql_update()" />
                </p>
-                                               <p>
-                               <label class="label20">branch</label>
-                               <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" -->
-       </p>
-
        </div>
        <div id="bloc100">
                <h2 class="catalogue">More fields</h2>