Initial review in upgrading templates to 2.2

diff --git a/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl b/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl
index a9888c0..71fcbe5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-<h3>MARC search results</h3>
+<h3>Search Results</h3>
 
 <!-- TMPL_IF name="total" --><div id="pages">
 <!-- TMPL_IF NAME="displayprev" -->
@@ -23,16 +23,17 @@
 
 <div id="results">Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --> records.</div>
 
-<div class="table"><table>
+<div class="table searchresults"><table>
        <tr>
        <th>Title</th>
+       <th>Call No.</th>
        <th>Item Count</th>
+       <th>Location</th>
        </tr>
 <tbody>
        <!-- TMPL_LOOP name="result" -->
                <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>
+                       <td><p><a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></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 -->
@@ -40,6 +41,7 @@
                                                <!-- 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="classification" --></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 -->

diff --git a/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
index 6e7b6fe..88ddc93 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
@@ -14,39 +14,39 @@
 <table>
 <caption>Quick Search</caption>
                                        <tr>
-                       <th><label>Any word</label></th>
+                       <th><label for="keyword">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>
+                       <input type="text" id="keyword" name="value" onchange="sql_update()" size="35" /></td>
                </tr>
                <tr>
-                       <th><label>Title</label></th>
+                       <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()" size="35" /></td>
+                       <input type="text" id="title" name="value" onchange="sql_update()" size="35" /></td>
                </tr>
                <tr>
-                       <th><label>Author</label></th>
+                       <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()" size="35" /></td>
+                       <input type="text" id="author" name="value" onchange="sql_update()" size="35" /></td>
                </tr>
                <tr>
-                       <th><label>Subject</label></th>
+                       <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()" size="35" /></td>
+                       <input type="text" id="subject" name="value" onchange="sql_update()" size="35" /></td>
                </tr>
                <tr>
-                       <th><label>Item Type</label></th>
+                       <th><label for="itemtype">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="" />
@@ -54,7 +54,7 @@
                        <!-- TMPL_VAR name="CGIitemtype" --></td>
                </tr>
                <tr>
-                               <th><label>Branch</label></th>
+                               <th><label for="branch">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="" />
@@ -62,36 +62,36 @@
                                <!-- TMPL_VAR name="CGIbranch" --></td>
                </tr>
                <tr>
-                               <th><label>Item barcode</label></th>
+                               <th><label for="barcode">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> 
+                               <input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" /></td> 
                </tr>
                <tr>
-                       <th><label>Call Number</label></th>
+                       <th><label for="callno">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>
+                       <input type="text" id="callno" name="value" onchange="sql_update()" /></td>
                </tr>
                <tr>
-                       <th><label>ISBN</label></th>
+                       <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="=" />
-                       <input type="text" name="value" onchange="sql_update()" /></td>
+                       <input type="text" id="isbn" name="value" onchange="sql_update()" /></td>
                </tr>
                <tr>
-                       <th><label>Publisher</label></th>
+                       <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" name="value" onchange="sql_update()" /></td>
+                       <input type="text" id="publisher" name="value" onchange="sql_update()" /></td>
                </tr>
                </table>
 
@@ -149,7 +149,7 @@
                </tr></table>
                <p>
                        <input type="submit" value="Start search" class="submit">
-                       <input type="button" value="Suggestions" class="submit" onclick="PopupSuggestion(); return false;">
+                       <input type="button" value="Suggest Search Term" class="submit" onclick="PopupSuggestion(); return false;">
                </p>
                </div>
        </form>