Initial review in upgrading templates to 2.2

diff --git a/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl
index 99ddf7a..1357f9f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl
@@ -19,20 +19,20 @@
                <label for="keyword">Quick Search:</label><input id="keyword" type="text"  size="25" name="keyword" />
                <input type="submit" value="Search" class="submit" />
                </form>
-               <ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li> 
+               <ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li> <!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL -->
 <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li> </ul>
                </dd>
-
+<!-- Hide from NPL -->
 <dt><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports
                        </a></dt>
                        <dd>Till reconciliation, overdues, and inventory</dd>
-
+<!-- /Hide from NPL -->
 <dt><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a></dt>
                        <dd><ul>
-
-<li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced Cataloging</a> </li>  <li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li> </ul></dd>
- <dt><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dt>
-<dd><ul><li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration Home</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul></dd> 
+<!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Enter Brief Record (Temp Cards)</a> </li> /Display for NPL -->
+<li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced Cataloging</a> </li> <!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li><li><a href="/cgi-bin/koha/bull-home.pl">Serials</a> Manage serial subscriptions and issues</li> <li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a> Virtual shelves can be used by librarian or patrons to build virtual libraries inside the "real" one. The virtual shelf can be used by a teacher to help his/her students searching information on a specific topic. It can be used by a library to define "most valuable books for [some category of patron]"</li><!-- /Hide from NPL --></ul></dd>
+<!-- Hide from NPL --><dt><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dt>
+<dd><ul><li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration Home</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li><li><a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes generator</a></li><li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></li><li><a href="/cgi-bin/koha/import/breeding.pl">Import to reservoir</a></li></ul></dd> <!-- /Hide from NPL -->
 </dl></div>
             
 </div>

diff --git a/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl b/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl
index d67ffea..ba3efb2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl
@@ -31,7 +31,7 @@ No
 </td>
 </tr>
 <tr>
-<th><label for="withdrawn">Cancelled</label></th>
+<th><label for="withdrawn">Damaged</label></th>
 <td><input type="radio" id="withdrawn" name="withdrawn" value="1"<!-- TMPL_IF Name="itemwithdrawn" --> checked="checked"<!-- /TMPL_IF -->>
 Yes
 <input type="radio" name="withdrawn" value="0"<!-- TMPL_UNLESS Name="itemwithdrawn" --> checked="checked"<!-- /TMPL_UNLESS -->>

diff --git a/koha-tmpl/intranet-tmpl/npl/en/request.tmpl b/koha-tmpl/intranet-tmpl/npl/en/request.tmpl
index 5bb9a00..7372554 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/request.tmpl
@@ -23,46 +23,46 @@
                        </select>
                        </td></tr>
 
-<!--           <tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr> -->
+               <!-- Hide from NPL --><tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr><!-- /Hide from NPL -->
                <tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
                <tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
-               <!-- <tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr> -->
+               <tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr>
                <tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
        </table>
 </div>
 
        <div class="table"><table>
 <tr>
-       <!-- <th>Reserve</th> -->
+       <!-- Hide from NPL --><th>Reserve</th><!-- /Hide from NPL -->
        <th>Item Type</th>
        <th>Call Number</th>
-       <!-- <th>Volume</th> -->
-       <!-- <th>Pubdate</th> -->
+       <!-- Hide from NPL --><th>Volume</th><!-- /Hide from NPL -->
+       <!-- Hide from NPL --><th>Pubdate</th><!-- /Hide from NPL -->
        <th>Copies</th>
 </tr>
-<!--$bibitemrows-->
+
 <!-- TMPL_LOOP Name="bibitemloop" -->
        <tr>
-               <!-- <td>
+               <!-- Hide from NPL --><td>
                        <!-- TMPL_IF Name="itemlost" -->
                                Cannot be selected
                        <!-- TMPL_ELSE -->
                                <input type="checkbox" name="reqbib" value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
                                <input type="hidden" name="biblioitem" value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
                        <!-- /TMPL_IF -->
-               </td> -->
+               </td><!-- /Hide from NPL -->
                <td>
                        <!-- TMPL_VAR Name="description" -->
                </td>
                <td>
                        <!-- TMPL_IF NAME="class" --><!-- TMPL_VAR Name="class" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
                </td>
-<!--           <td>
+               <!-- Hide from NPL --><td>
                        <!-- TMPL_IF NAME="volumedesc" --><!-- TMPL_VAR Name="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-               </td> -->
-<!--           <td>
+               </td><!-- /Hide from NPL -->
+               <!-- Hide from NPL --><td>
                        <!-- TMPL_IF NAME="publicationyear" --><!-- TMPL_VAR Name="publicationyear" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-               </td> -->
+               </td><!-- /Hide from NPL -->
                <td><ul>
                        <!-- TMPL_LOOP Name="barcodeloop" -->
                                <li><!-- TMPL_VAR Name="barcode" --> <!-- TMPL_VAR Name="message" --></li>
@@ -73,7 +73,7 @@
 <!-- /TMPL_LOOP -->
 </table></div>
 
-<input type="submit" name="submit"  value="Place New Request" class="submit" />
+<input type="submit" name="submit"  value="Place New Request"  class="submit" onclick="this.value='Please wait...'; this.disabled=true; this.form.submit();" />
 </form>
 <!-- TMPL_IF NAME="reserveloop" -->
 <form name="T<!-- TMPL_VAR Name="time" -->" action="modrequest.pl" method="post">
@@ -85,9 +85,9 @@
                <th>Notes</th>
                <th>Date</th>
                <th>Pickup Location</th>
-               <!-- <th>Request</th> -->
+               <!-- Hide from NPL --><th>Request</th><!-- /Hide from NPL -->
        </tr>
-       <!--$existingreserves-->
+
        <!-- TMPL_LOOP Name="reserveloop" -->
                <tr>
                        <td>
@@ -95,7 +95,7 @@
                        <input type="hidden" name="biblio" value="<!-- TMPL_VAR Name="biblionumber" -->" />
                        <select name="rank-request">
                                <!-- TMPL_IF Name="wait" -->
-                                       <option value="W" selected="selected">Waiting</option>
+                                       <option value="W" selected="selected">Consigned</option>
                                <!-- /TMPL_IF -->
                                <!-- TMPL_LOOP Name="optionloop" -->
                                        <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->>
@@ -110,7 +110,13 @@
                        <td><!-- TMPL_IF NAME="notes" --><!-- TMPL_VAR Name="notes" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
                        <td><!-- TMPL_VAR Name="date" --></td>
                        <td><!-- TMPL_IF Name="wait" -->
-                               Item waiting at <b> <!-- TMPL_VAR Name="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR Name="wbrcd" -->" />
+                               <input type="hidden" name="pickup" value="<!-- TMPL_VAR Name="wbrcode" -->" />
+                               <!-- TMPL_IF NAME="atdestination" -->
+                               <strong>Waiting</strong> at <!-- TMPL_VAR Name="wbrcode" -->
+                               <!-- TMPL_ELSE -->
+                               In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="wbrcode" -->
+                               <!-- /TMPL_IF -->
+                               
                                <!-- TMPL_ELSE -->
                                        <select name="pickup">
                                                <!-- TMPL_LOOP Name="branchloop" -->
@@ -121,7 +127,7 @@
                                        </select>
                                <!-- /TMPL_IF -->
                        </td>
-<!--                   <td>
+<!-- Hide from NPL --><td>
                                <!-- TMPL_IF Name="wait" -->
                                        <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)">
                                                <!-- TMPL_VAR Name="barcode" -->
@@ -136,7 +142,7 @@
                                        <!-- /TMPL_IF -->
                                <!-- /TMPL_IF -->
 
-                       </td> -->
+                       </td><!-- /Hide from NPL -->
                </tr>
        <!-- /TMPL_LOOP -->
 </table>

diff --git a/koha-tmpl/intranet-tmpl/npl/en/thesaurus_popup.tmpl b/koha-tmpl/intranet-tmpl/npl/en/thesaurus_popup.tmpl
index d5fe844..26db1a1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/thesaurus_popup.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/thesaurus_popup.tmpl
@@ -7,15 +7,16 @@
        <textarea name="result" rows=10 cols=60><!-- TMPL_VAR name="result" --></textarea></br>
        <p><input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
        <input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+       <input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
        <input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
        <input type="hidden" name="op" value="search">
        <input type="submit" value="Search">
-       <input type="button" value="END" onClick="javascript:report()">
+       <input type="button" value="OK" onClick="javascript:report()">
        </form>
 <!-- TMPL_IF name="search_string" -->
        <form name="f2_pop" action="thesaurus_popup.pl" method="post">
        <!-- TMPL_VAR name="select_list" -->
-       <input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+       <input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->"> <input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
        <input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
        <input type="hidden" name="op" value="select">
        <input type="hidden" name="result" value="<!-- TMPL_VAR name="result" -->">
@@ -25,6 +26,7 @@
        <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
        <input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
        <input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+       <input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
        <input type="hidden" name="op" value="add">
        insert a new authority : <input type="text" name="insert">
        <input type="submit" name="NEW" value="NEW">