Catching up with 2.2
authoroleonard <oleonard>
Fri, 22 Oct 2004 19:21:27 +0000 (19:21 +0000)
committeroleonard <oleonard>
Fri, 22 Oct 2004 19:21:27 +0000 (19:21 +0000)
koha-tmpl/intranet-tmpl/npl/en/parameters/systempreferences.tmpl
koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl
koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
koha-tmpl/intranet-tmpl/npl/en/search.marc/suggest.tmpl [new file with mode: 0644]

index 0ed5be3..a355686 100644 (file)
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <script language="JavaScript" type="text/javascript">
-       //
-       function isNotNull(f,noalert) {
-               if (f.value.length ==0) {
-   return false;
+               function _(s) { return s } // dummy function for gettext
+               //
+               function isNotNull(f,noalert) {
+                       if (f.value.length ==0) {
+       return false;
+                       }
+                       return true;
                }
-               return true;
-       }
-       //
-       function toUC(f) {
-               var x=f.value.toUpperCase();
-               f.value=x;
-               return true;
-       }
-       //
-       function isNum(v,maybenull) {
-       var n = new Number(v.value);
-       if (isNaN(n)) {
-               return false;
+               //
+               function toUC(f) {
+                       var x=f.value.toUpperCase();
+                       f.value=x;
+                       return true;
                }
-       if (maybenull==0 && v.value=='') {
-               return false;
-       }
-       return true;
-       }
-       //
-       function isDate(f) {
-               var t = Date.parse(f.value);
-               if (isNaN(t)) {
+               //
+               function isNum(v,maybenull) {
+               var n = new Number(v.value);
+               if (isNaN(n)) {
+                       return false;
+                       }
+               if (maybenull==0 && v.value=='') {
                        return false;
                }
-       }
-       //
-       function Check(f) {
-               var ok=1;
-               var _alertString="";
-               var alertString2;
-               if (f.variable.value.length==0) {
-                       _alertString += "- variable missing\n";
+               return true;
                }
-               if (f.value.value.length==0) {
-                       _alertString += "- value missing\n";
+               //
+               function isDate(f) {
+                       var t = Date.parse(f.value);
+                       if (isNaN(t)) {
+                               return false;
+                       }
                }
-               if (_alertString.length==0) {
-                       document.Aform.submit();
-               } else {
-                       alertString2 = "Form not submitted because of the following problem(s)\n";
-                       alertString2 += "------------------------------------------------------------------------------------\n\n";
-                       alertString2 += _alertString;
-                       alert(alertString2);
+               //
+               function Check(f) {
+                       var ok=1;
+                       var _alertString="";
+                       var alertString2;
+                       if (f.variable.value.length==0) {
+                               _alertString += "\n- " + _("variable missing");
+                       }
+                       if (f.value.value.length==0) {
+                               _alertString += "\n- " + _("value missing");
+                       }
+                       if (_alertString.length==0) {
+                               document.Aform.submit();
+                       } else {
+                               alertString2  = _("Form not submitted because of the following problem(s)");
+                               alertString2 += "\n------------------------------------------------------------------------------------\n";
+                               alertString2 += _alertString;
+                               alert(alertString2);
+                       }
                }
-       }
-       </script>
+               </script>
 
-<div id="main"><!-- TMPL_IF name="add_form" -->
+<div id="main">        <!-- TMPL_IF NAME="add_form" -->
+       
+               <!-- TMPL_IF NAME="modify" -->
+                       <h1>Modify a system preference</h1>
+               <!-- TMPL_ELSE -->
+                       <h1>Add a system preference</h1>
+               <!-- /TMPL_IF -->
+               <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+               <div class="details">
+               <table>
+                       <tr><td><label for="explanation">Explanation: </label></td><td><input type="text" name="explanation" id="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->"><input type="hidden" name="op" value="add_validate"></td></tr>
+                       <tr><!-- TMPL_IF NAME="searchfield" --><td><label>Variable</label></td><td><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->"></td>
+                       <!-- TMPL_ELSE --><td><label for="variable">Variable</label></td><td><input type="text" name="variable" id="variable" size="60"></td><!-- /TMPL_IF --></tr>
+                       <tr><td><label for="value">Value</label></td><td><!-- TMPL_IF NAME="type-free" -->
+                                       <input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->" size="<!-- TMPL_VAR NAME="fieldlength" -->">
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF NAME="type-textarea" -->
+                                       <textarea name="value" id="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF NAME="type-choice" -->
+                                       <select name="value" id="value">
+                                               <!-- TMPL_LOOP NAME="options" -->
+                                                       <option value="<!-- TMPL_VAR NAME="option" -->"<!-- TMPL_IF NAME="selected" -->selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="option" --></option>
+                                               <!-- /TMPL_LOOP -->
+                                       </select>
+                               <!-- /TMPL_IF -->
+                               <!-- TMPL_IF NAME="type-yesno" -->
+                                       <input type="radio" name="value" id="value" value="1"<!-- TMPL_IF NAME="value-yes" --> checked="checked"<!-- /TMPL_IF -->>Yes
+                                       <input type="radio" name="value" value="0"<!-- TMPL_IF NAME="value-no" --> checked="checked"<!-- /TMPL_IF -->>No
+                               <!-- /TMPL_IF --></td></tr>
+               </table></div>
+               <p><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->" class="submit"> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></p>
+               
+<h3>Koha internal</h3>         
+               <div class="details"><span class="note">Note: you should have no reasons to modify the following default values</span>
+               <table>
+               <tr><td><label for="preftype">Variable type:</label></td><td><input type="text" name="preftype" id="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40"><span class="formfield-notes"> (<em>Choice</em>, <em>YesNo</em>, <em>Integer</em>, <em>Textarea</em>, <em>Float</em>, <em>Themes</em>, or <em>Languages</em>)</span></td></tr>
+               <tr><td><label for="prefoptions">Variable options:</label></td><td><input type="text" name="prefoptions" id="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="60" maxlength="80"> <span class="formfield-notes">(a choice list for <em>Choice</em> (separated by <strong>|</strong>) or <strong>cols|rows</strong> for <em>Texarea</em>)</span></td></tr>
+               </table></div>
+               </form>
+       <!-- /TMPL_IF -->
        
-       <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
-       <input type="hidden" name="op" value="add_validate" />
-<!-- TMPL_IF NAME="modify" -->
-               <h1>Modify a system preference</h1>
-       <!-- TMPL_ELSE -->
-               <h1>Add a system preference</h1>
+       <!-- TMPL_IF NAME="add_validate" -->
+       
+
+               <h3>Data recorded</h3>
+               <div class="details">
+               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+               <input type="submit" class="submit" value="OK">
+               </form></div>
        <!-- /TMPL_IF -->
-<div class="details">
-<table>
-       <!-- TMPL_IF NAME="searchfield" -->
-<tr>           <td><label for="variable">Variable</label></td><td><!-- TMPL_VAR name="searchfield" --><input type="hidden" id="variable" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->" /></td></tr>
-       <!-- TMPL_ELSE -->
-<tr>           <td><label for="variable">Variable</label></td><td><input id="variable" type="text" name="variable" /></td></tr>
+       
+       <!-- TMPL_IF NAME="delete_confirm" -->
+       
+       <table border="0" cellspacing="0" cellpadding="2">
+               <tr valign="top" bgcolor="#99cc33">
+                       <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Variable</b></td>
+                       <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
+               </tr>
+               <tr><td>Value</td><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr>
+               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+               <tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
+               <tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="NO"></form></td></tr>
+       </table>
+       
        <!-- /TMPL_IF -->
-<tr>           <td><label for="value">Value</label></td><td><input id="value" type="text" name="value" value="<!-- TMPL_VAR name="value" escape="HTML" -->" /></td></tr>
-<tr>   <td><label for="explanation">Explanation</label></td><td><input type="text" id="explanation" name="explanation" size="50" value="<!-- TMPL_VAR name="explanation" escape="HTML" -->" /></td></tr>
-</table></div>
-       <p><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Update Parameter<!-- TMPL_ELSE -->Add Parameter<!-- /TMPL_IF -->" onclick="Check(this.form); return false;" class="submit" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></p>
+       
+       <!-- TMPL_IF NAME="delete_confirmed" -->
+       
+               Data deleted
+               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+               <input type="submit" value="OK" />
                </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="add_validate" -->
-
-<div id="main">
-<h3>Data Recorded</h3>
-<div class="details"><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-       <input type="submit" value="OK" class="submit" />
-       </form></div>
-       </div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirm" -->
-<!-- -->
-<h3>Confirm Deletion of Parameter <em><!-- TMPL_VAR name="searchfield" --></em></h3></caption>
-<div class="form">
-<table>
-<tr>           <td><label>Variable:</label> </td><td><!-- TMPL_VAR name="searchfield" --></td></tr>
-<tr>           <td><label>Value:</label> </td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
-       </dl>
-</table>
-</div>
-<div class="tabitem"><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit"  class="cancel" value="Delete this Parameter" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" class="submit" value="Do not Delete" /></form></div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirmed" -->
-<!-- -->
-               <div id="main"><h3>Parameter Deleted</h3>
-               <span class="form"><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-       <input type="submit" value="OK" class="submit" />
-       </form></span></div>
-<!-- /TMPL_IF -->
-
-<!-- -->
-<!-- TMPL_IF name="else" -->
-
-<!-- TMPL_VAR name="searchfield" -->
-<h1>System Preferences Administration</h1>
-<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
-       <input type="text" name="searchfield" value="" />
-       <input type="submit" class="submit" value="Search" />
-</form>
-<div class="table"><table>
-<tr>
-       <th>Variable</th>
-       <th>Value</th>
-       <th>Explanation</th>
-       <th colspan="2">&nbsp;</th>
-</tr>
-<!-- TMPL_LOOP name="loop" -->
-
-<tr>
-       <td><a href="<!-- TMPL_VAR name="edit" -->"><!-- TMPL_VAR name="variable" --></a></td>
-       <td><!-- TMPL_VAR name="value" --></td>
-       <td><!-- TMPL_VAR name="explanation" --></td>
-       <td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
-       <td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table></div>
-       <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-       <p><input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Parameter" class="submit" /></p></form>
-<!-- /TMPL_IF -->
+       <!-- /TMPL_IF -->
+       
+       <!-- TMPL_IF NAME="else" -->
+       <h1>System preferences admin</h1>
+       <form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
+               <input type="text" name="searchfield" value="" />
+               <input type="submit" value="Search" class="submit" />
+       </form>
+       <!-- TMPL_VAR NAME="searchfield" -->
+       <table>
+       <tr>
+               <th>Variable</th>
+               <th>Value</th>
+               <th colspan="3">Explanation</th>
+       </tr>
+       <!-- TMPL_LOOP NAME="loop" -->
+       <tr class="<!-- TMPL_VAR NAME="bgcolor" -->">
+               <td><!-- TMPL_VAR NAME="variable" --></td>
+               <td><!-- TMPL_VAR NAME="value" --></td>
+               <td><!-- TMPL_VAR NAME="explanation" --></td>
+               <td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+               <td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+       </tr>
+       <!-- /TMPL_LOOP -->
+       </table>
+       </form>
+       
+       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+               <input type="hidden" name="op" value="add_form" />
+               <input type="submit" class="submit" value="Add a System Preference" />
+       </form>
+       
+       <!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
index 4b064c5..a9888c0 100644 (file)
@@ -7,13 +7,13 @@
 
 <!-- TMPL_IF name="total" --><div id="pages">
 <!-- TMPL_IF NAME="displayprev" -->
-                       <a class="pages" href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search>&lt;&lt;</a> 
+                       <a class="pages" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;</a> 
                        <!-- /TMPL_IF -->
                        <!-- TMPL_LOOP NAME="numbers" -->
                                <!-- TMPL_IF NAME="highlight" -->
                                 <span class="current"><!-- TMPL_VAR NAME="number" --></span>
                                <!-- TMPL_ELSE -->
-                                 <a class="pages" href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><!-- TMPL_VAR NAME=number --></a>
+                                 <a class="pages" href="search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
                        <!-- TMPL_IF NAME="displaynext" -->
 
 <div class="table"><table>
        <tr>
-       <th>Biblio #</th>
        <th>Title</th>
-       <th>Author</th>
+       <th>Item Count</th>
        </tr>
 <tbody>
        <!-- TMPL_LOOP name="result" -->
-               <tr>
-                       <td><a href="../MARCdetail.pl?bibid=<!-- TMPL_VAR name="bibid" -->"><!-- TMPL_VAR name="bibid" --></a></td>
-                       <td><a href="../MARCdetail.pl?bibid=<!-- TMPL_VAR name="bibid" -->"><!-- TMPL_VAR name="title" --></a></td>
-<td><!-- TMPL_VAR name="author" --></td>
+               <tr<!-- TMPL_IF NAME="even" --> class="highlight"<!-- /TMPL_IF -->>
+                       <td><p>
+                                               <p>                                                     <b><a class="transparent" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b></p>
+                                               <p><!-- TMPL_VAR NAME="author" -->
+                                               <!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="place" --> ; <!-- TMPL_VAR NAME="place" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="pages" --> - <!-- TMPL_VAR NAME="pages" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="notes" --> : <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="size" --> ; <!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
+                                       </p></td>
+                       <td><!-- TMPL_VAR NAME="totitem" --></td>
+<td><!-- TMPL_LOOP NAME="CN" -->
+                                               <!-- TMPL_VAR NAME="holdingbranch" --> <!-- TMPL_IF NAME="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF -->
+                                       <!-- /TMPL_LOOP --></td>
                </tr>
        <!-- /TMPL_LOOP -->
 </table></div>
 
 <!-- TMPL_IF name="total" --><div id="pages">
 <!-- TMPL_IF NAME="displayprev" -->
-                       <a class="pages" href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search>&lt;&lt;</a> 
+                       <a class="pages" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;</a> 
                        <!-- /TMPL_IF -->
                        <!-- TMPL_LOOP NAME="numbers" -->
                                <!-- TMPL_IF NAME="highlight" -->
                                 <span class="current"><!-- TMPL_VAR NAME="number" --></span>
                                <!-- TMPL_ELSE -->
-                                 <a class="pages" href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><!-- TMPL_VAR NAME=number --></a>
+                                 <a class="pages" href="search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
                        <!-- TMPL_IF NAME="displaynext" -->
index 351de21..6e7b6fe 100644 (file)
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-<h1>Advanced MARC Search</h1>
+<h1>Catalog Search</h1>
 <form name="f" method="post" action="search.pl">
-
 <input type="hidden" name="op" value="do_search" />
 <input type="hidden" name="type" value="intranet" />
 <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
 <div class="table">
 <div class="form">
+
 <table>
 <caption>Quick Search</caption>
+                                       <tr>
+                       <th><label>Any word</label></th>
+                       <td><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" /></td>
+               </tr>
                <tr>
-                       <th>Keyword</th>
-                       <td>
-                               <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>
-                       <th>Illustrator</th>
-                       <td><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()"></td>
+                       <th><label>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()" size="35" /></td>
                </tr>
                <tr>
-                       <th>Title</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>
-                       <th>Dewey</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="contains">
-                               <input type="text" name="value" onchange="sql_update()"></td>
+                       <th><label>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()" size="35" /></td>
                </tr>
                <tr>
-                       <th>
-                               Author <input type="hidden" name="marclist" value="biblio.author">
-                               <input type="hidden" name="and_or" value="and">
-                               <input type="hidden" name="excluding" value="">
-                       </th>
-                       <td>
-                               <input type="hidden" name="operator" value="contains">
-                               <input type="text" name="value" onchange="sql_update()">
-                       </td>
-                       <th>
-                               Item Type <input type="hidden" name="marclist" value="items.itemtype">
-                               <input type="hidden" name="and_or" value="and">
-                               <input type="hidden" name="excluding" value="">
-                       </th>
-                       <td>
-                               <input type="hidden" name="operator" value="contains">
-                               <input type="text" name="value" onchange="sql_update()">
-                       </td>
+                       <th><label>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()" size="35" /></td>
                </tr>
                <tr>
-                       <th>
-                               Barcode
-                       </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">
-                       </td>
-                       <td>&nbsp;</td><td>&nbsp;</td>
+                       <th><label>Item Type</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>Branch</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>
+               <tr>
+                               <th><label>Item 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>Call Number</label></th>
+                       <td><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()" /></td>
+               </tr>
+               <tr>
+                       <th><label>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="=" />
+                       <input type="text" name="value" onchange="sql_update()" /></td>
                </tr>
-       </table>
-</div>
-</div>
-<div class="table">
-<table>
                <tr>
-                       <td colspan="2"><h5>Help:</h5>
-                                       <p>Build your request using MARC fields and subfields. Add criteria lets you add another criteria to your search.       Search commits the request and displays the results.</p>
-                               <div id="sql">
-                               <textarea name="sql" rows="5" cols="60" disabled="disabled" readonly="readonly"></textarea>
-                               </div>
-                       </td>
+                       <th><label>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" name="value" onchange="sql_update()" /></td>
                </tr>
+               </table>
 
+</div>
+</div>
+<div class="table">
+       <table>
+       <caption>Add MARC Fields to Your Search</caption>
                <!-- TMPL_LOOP NAME="statements" -->
-               <tr>
-                       <td>
-                               <!-- TMPL_IF NAME="first" -->
-                                       <input type="hidden" name="and_or" value="" />&nbsp;
-                               <!-- TMPL_ELSE -->
-                                       <select name="and_or" size="1" onchange="sql_update()">
-                                               <option value="and">and</option>
-                                               <option<!-- TMPL_IF NAME="or" --> selected="selected"<!-- /TMPL_IF --> value="or">or</option>
-                                       </select>
-                               <!-- /TMPL_IF -->
-                       </td>
-                       <td><!-- TMPL_VAR name="marclist" --> <select name="excluding" size="1" onchange="sql_update()">
+                       <tr>
+                               <td><select name="and_or" size="1" onchange="sql_update()">
+                                       <option value="and">and</option>
+                                       <option <!-- TMPL_IF NAME="or" -->selected <!-- /TMPL_IF -->value="or">or</option>
+                               </select>
+                               <!-- TMPL_VAR NAME="marclist" -->
+                               <select name="excluding" size="1" onchange="sql_update()">
                                        <option value="0"> </option>
-                                       <option<!-- TMPL_IF NAME="not" --> selected="selected"<!-- /TMPL_IF --> value="1">not</option>
-                               </select> <select name="operator" size="1" onchange="sql_update()">
-                                       <option<!-- TMPL_IF NAME="eq" --> selected="selected"<!-- /TMPL_IF --> value="=">Is equal to</option>
-                                       <option<!-- TMPL_IF NAME="start" --> selected="selected"<!-- /TMPL_IF --> value="start">Starts with</option>
-                                       <option<!-- TMPL_IF NAME="contains" --> selected="selected"<!-- /TMPL_IF --> value="contains">Contains</option>
-                                       <option<!-- TMPL_IF NAME="gt" --> selected="selected"<!-- /TMPL_IF --> value=">">Is greater than</option>
-                                       <option<!-- TMPL_IF NAME="ge" --> selected="selected"<!-- /TMPL_IF --> value=">=">Is greater or equal to</option>
-                                       <option<!-- TMPL_IF NAME="lt" --> selected="selected"<!-- /TMPL_IF --> value="<">Is lower than</option>
-                                       <option<!-- TMPL_IF NAME="le" --> selected="selected"<!-- /TMPL_IF --> value="<=">Is lower or equal to</option>
-                               </select> <input type="text" name="value" onChange="sql_update()" <!-- TMPL_IF NAME="value" -->value="<!-- TMPL_VAR NAME="value" -->"<!-- /TMPL_IF --> /></td>
-               </tr>
+                                       <option <!-- TMPL_IF NAME="not" -->selected <!-- /TMPL_IF -->value="1">not</option>
+                               </select>
+                               <select name="operator" size="1" onchange="sql_update()">
+                                       <option <!-- TMPL_IF NAME="contains" -->selected<!-- /TMPL_IF --> value="contains">Contains</option>
+                                       <option <!-- TMPL_IF NAME="eq" -->selected<!-- /TMPL_IF --> value="=">Is equal to</option>
+                                       <option <!-- TMPL_IF NAME="start" -->selected<!-- /TMPL_IF --> value="start">Starts with</option>
+                                       <option <!-- TMPL_IF NAME="gt" -->selected<!-- /TMPL_IF --> value=">">Is greater than</option>
+                                       <option <!-- TMPL_IF NAME="ge" -->selected<!-- /TMPL_IF --> value=">=">Is greater or equal to</option>
+                                       <option <!-- TMPL_IF NAME="lt" -->selected<!-- /TMPL_IF --> value="<">Is lower than</option>
+                                       <option <!-- TMPL_IF NAME="le" -->selected<!-- /TMPL_IF --> value="<=">Is lower or equal to</option>
+                               </select>
+                               <input type="text" name="value" onchange="sql_update();" <!-- TMPL_IF NAME="value" -->value="<!-- TMPL_VAR NAME="value" -->"<!-- /TMPL_IF -->></td>
+                       </tr>
                <!-- /TMPL_LOOP -->
-                       <tr>
-       <td colspan="2"><input type="button" value="Add criteria" onclick="AddStatement(); return false;" class="submit" /> Results per page :
-               <select name="resultsperpage" size="1">
-                       <option value="20">20</option>
-                       <option value="50">50</option>
-                       <option value="100">100</option>
-               </select>       Ordered by
-               <select name="orderby" size="1">
-                       <option value="biblio.title">Title</option>
-                       <option value="biblio.author">Author</option>
-                       <option value="biblioitems.dewey">Dewey</option>
-                       <option value="biblioitems.publicationyear">Publication Year</option>
-                       <option value="biblioitems.publishercode">Publisher</option>
-               </select>
-       <input type="submit" value="Start search" class="submit"></td></tr></table></div>
-</form>
+               <tr>
+               <td><input type="button" value="Add criteria" onclick="AddStatement(); return false;" class="submit">
+               Warning : the "contains" statement does NOT work if you enter 2 or less letters</td>
+       </tr>
+       <tr>
+                       <td><div name="sql">
+                               <textarea name="sql" rows="3" cols="55" disabled readonly></textarea>
+                       </div></td>
+               </tr>
+               <tr>
+                       <td>Results per page :<select align="right" name="resultsperpage" size="1">
+                               <option value="20">20</option>
+                               <option value="50">50</option>
+                               <option value="100">100</option>
+                       </select>
+               Ordered by
+                       <select name="orderby" size="1">
+                               <option value="biblio.title">Title</option>
+                               <option value="biblio.author">Author</option>
+                               <option value="biblioitems.dewey">Dewey</option>
+                               <option value="biblioitems.publicationyear">Publication Year</option>
+                               <option value="biblioitems.publishercode">Publisher</option>
+                       </select></td>
+               </tr></table>
+               <p>
+                       <input type="submit" value="Start search" class="submit">
+                       <input type="button" value="Suggestions" class="submit" onclick="PopupSuggestion(); return false;">
+               </p>
+               </div>
+       </form>
 </div>
 
-<script language="JavaScript" type="text/javascript">
-<!-- 
+<script language="javascript" type="text/javascript">
 function sql_update() {
 document.f.sql.value="";
        for (i=0 ; i<document.f.marclist.length ; i++) {
-               if (document.f.marclist[i].value != '') {
+               if (document.f.value[i].value.length>0) {
                        document.f.sql.value = document.f.sql.value+
                                                                                document.f.and_or[i].value + ' (' +
                                                                                document.f.excluding[i].value + ' ' +
@@ -147,10 +171,21 @@ document.f.sql.value="";
 }
 
 function AddStatement() {
+
        document.forms[0].op.value="AddStatement";
        document.f.submit();
 }
-// -->
+
+function PopupSuggestion() {
+    var strQuery="";
+       for (i=0 ; i<document.f.marclist.length ; i++) {
+               if (document.f.value[i].value.length>0) {
+                   strQuery += " "+document.f.value[i].value;
+               }
+       }
+       newin=window.open("suggest.pl?Q="+strQuery,"Suggestions",'width=500,height=400,toolbar=false,scrollbars=yes');
+}
+
 </script>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/search.marc/suggest.tmpl b/koha-tmpl/intranet-tmpl/npl/en/search.marc/suggest.tmpl
new file mode 100644 (file)
index 0000000..786ec29
--- /dev/null
@@ -0,0 +1,40 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Suggestions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+
+<div id="main">
+               <table>
+               <caption>Catalog Search</caption>
+                       <tr>
+                               <th>Initial word</th>
+                               <th>Suggested</th>
+                               <th>Used X times</th>
+                       </tr>
+               <!-- TMPL_LOOP NAME="loop" -->
+                       <tr>
+                               <td><!-- TMPL_VAR NAME="word" --></td>
+                               <td><a href="javascript:Import('<!-- TMPL_VAR NAME="word" -->','<!-- TMPL_VAR NAME="suggestion" -->')">
+                                               <!-- TMPL_VAR NAME="suggestion" -->
+                                       </a></td>
+                               <td><!-- TMPL_VAR NAME="count" --></td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+               </table>
+       </div>
+</div>
+<script language="javascript" type="text/javascript">
+       function Import(Replaced,ReplaceBy) {
+               for (i=0 ; i<opener.document.f.value.length ; i++) {
+                               opener.document.forms['f'].value[i].value = opener.document.forms['f'].value[i].value.replace(Replaced,ReplaceBy);
+//                     if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
+//                             strQuery += "&isbn="+document.forms[0].field_value[i].value;
+//                     }
+//                     opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
+//                     self.close();
+//                     return false;
+               }
+       }
+</script>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+