Bug 12051: Adds a Renew tab to the staff client

UPDATE: Added to checkin-search.inc to show up on returns.pl

To test:

1) Apply patch
2) Confirm that there is now a Renew tab on the pages where there is also a Check-in tab only
3) Attempt to renew a book using this, confirm it works as expected
4) Check if I have missed any pages

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 6eae193..61fefa7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -12,22 +12,32 @@
         <input value="Submit" class="submit" type="submit" />
     </form>
 </div>
-       [% END %]
-       [% IF ( CAN_user_catalogue ) %]
-       <div id="catalog_search" class="residentsearch">
-       <p class="tip">Enter search keywords:</p>
-               <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
-                               <input type="submit" class="submit" value="Submit" />
-               </form>
-       </div>
-       [% END %]
-       
-                       <ul>
-            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
+<div id="renew_search" class="residentsearch">
+    <p class="tip">Scan a barcode to renew:</p>
+    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
+        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+        <input value="Submit" class="submit" type="submit" />
+    </form>
+</div>
+[% END %]
+
+[% IF ( CAN_user_catalogue ) %]
+<div id="catalog_search" class="residentsearch">
+    <p class="tip">Enter search keywords:</p>
+    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+        <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
+        <input type="submit" class="submit" value="Submit" />
+    </form>
+</div>
+[% END %]
+
+<ul>
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
     [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li onclick="keep_text(2)" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
-                       </ul>   
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li onclick="keep_text(3)" class="ui-tabs-active"><a href="#catalog_search">Search the catalog</a></li>[% END %]
+</ul>
+
 </div><!-- /header_search -->
 </div><!-- /gradient -->
 <!-- End Catalogue Resident Search Box -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index 4b6a9de..1cb311e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -20,8 +20,16 @@
                 <input value="Submit" class="submit" type="submit" />
             </form>
         </div>
+        <div id="renew_search" class="residentsearch">
+        <p class="tip">Scan a barcode to renew:</p>
+            <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
+                <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+                <input value="Submit" class="submit" type="submit" />
+            </form>
+        </div>
         [% END %]
 
+
         <div id="catalog_search" class="residentsearch">
             <p class="tip">Enter search keywords:</p>
             <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
@@ -34,7 +42,8 @@
             <li><a onclick="keep_text(0)" href="#addbooks_search">Cataloging search</a></li>
             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
-            <li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
+            <li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>
         </ul>
     </div><!-- /header_search -->
 </div><!-- /gradient -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index 4f1e2b9..07cb17b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -11,9 +11,20 @@
     </form>
 </div>
 [% END %]
+[% IF ( CAN_user_circulate ) %]
+<div id="renew_search" class="residentsearch">
+    <p class="tip">Scan a barcode to renew:</p>
+    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
+        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+        <input value="Submit" class="submit" type="submit" />
+    </form>
+</div>
+[% END %]
+
 <ul>
     [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(1)" href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#renew_search">Renew</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index ab730ba..141561c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -10,7 +10,15 @@
         <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
         <input value="Submit" class="submit" type="submit" />
     </form>
-</div>[% END %]
+</div>
+<div id="renew_search" class="residentsearch">
+    <p class="tip">Scan a barcode to renew:</p>
+    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
+        <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+        <input value="Submit" class="submit" type="submit" />
+    </form>
+</div>
+[% END %]
 [% IF ( CAN_user_catalogue ) %]
 <div id="catalog_search" class="residentsearch">
     <p class="tip">Enter search keywords:</p>
@@ -18,12 +26,14 @@
         <input class="head-searchbox" type="text" name="q" id="search-form" size="40" accesskey="q" />
         <input type="submit" class="submit" value="Submit"/>
     </form>
-</div>[% END %]
+</div>
+[% END %]
 
 <ul>
     [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
     [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>   
 
 </div><!-- /header_search -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
index 1d38559..692dfd1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
@@ -20,11 +20,12 @@
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>[% END %]
-                       <ul>
+
+       <ul>
             <li><a onclick="keep_text(0)" href="#contract_description_search">Search contracts</a></li>
             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
-                       </ul>   
+       </ul>
 </div>
 </div><!-- /gradient -->
 <!-- End Patrons Admin Resident Search Box -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
index fbf3618..d1b2f9a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
@@ -10,7 +10,16 @@
         <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
         <input value="Submit" class="submit" type="submit" />
     </form>
-</div>[% END %]
+</div>
+<div id="renew_search" class="residentsearch">
+    <p class="tip">Scan a barcode to renew:</p>
+        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
+            <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+            <input value="Submit" class="submit" type="submit" />
+        </form>
+    </div>
+[% END %]
+
 [% IF ( CAN_user_borrowers ) %]
 <div id="patron_search" class="residentsearch">
     <p class="tip">Enter patron card number or partial name:</p>
@@ -32,8 +41,9 @@
 <ul>
     [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
     [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(2)" href="#patron_search">Search patrons</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
+    [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
 </ul>
 
 </div><!-- /header_search -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 9b4f19e..5170432 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -122,6 +122,13 @@
     <input value="Submit" class="submit" type="submit" />
     </form>
     </div>
+        <div id="renew_search" class="residentsearch">
+        <p class="tip">Scan a barcode to renew:</p>
+            <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
+                <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+                <input value="Submit" class="submit" type="submit" />
+            </form>
+        </div>
     [% END %]
 
     [% IF ( CAN_user_catalogue ) %]
@@ -137,7 +144,8 @@
         <li><a onclick="keep_text(0)" href="#patron_search">Search patrons</a></li>
         [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
         [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(2)" href="#checkin_search">Check in</a></li>[% END %]
-        [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(3)" href="#catalog_search">Search the catalog</a></li>[% END %]
+        [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(3)" href="#renew_search">Renew</a></li>[% END %]
+        [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(4)" href="#catalog_search">Search the catalog</a></li>[% END %]
     </ul>
 </div><!-- /header_search -->
 </div><!-- /gradient -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index c248810..9c15306 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -17,7 +17,8 @@
                                <input type="submit" value="Submit"  class="submit" />
                </form>
        </div>[% END %]
-                       <ul>
+
+       <ul>
             <li><a onclick="keep_text(0)" href="#patron_category_search">Search patron categories</a></li>
             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
             [% IF ( CAN_user_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index 92ba935..bc4318e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -32,6 +32,7 @@ $.fn.selectTabByID = function (tabID) {
     if($("#header_search #checkin_search").length > 0){ shortcut.add('Alt+r',function (){ $("#header_search").selectTabByID("#checkin_search"); $("#ret_barcode").focus(); }); } else { shortcut.add('Alt+r',function (){ location.href="/cgi-bin/koha/circ/returns.pl"; }); }
     if($("#header_search #circ_search").length > 0){ shortcut.add('Alt+u',function (){ $("#header_search").selectTabByID("#circ_search"); $("#findborrower").focus(); }); } else { shortcut.add('Alt+u',function(){ location.href="/cgi-bin/koha/circ/circulation.pl"; }); }
     if($("#header_search #catalog_search").length > 0){ shortcut.add('Alt+q',function (){ $("#header_search").selectTabByID("#catalog_search"); $("#search-form").focus(); }); } else { shortcut.add('Alt+q',function(){ location.href="/cgi-bin/koha/catalogue/search.pl"; }); }
+    if($("#header_search #renew_search").length > 0){ shortcut.add('Alt+y',function (){ $("#header_search").selectTabByID("#renew_search"); $("#ren_barcode").focus(); }); } else { shortcut.add('Alt+y',function(){ location.href="/cgi-bin/koha/circ/renew.pl"; }); }
 
     $(".focus").focus();
     $(".validated").each(function() {