Attachment 47412 Details for Bug 12051 – Bug 12051: Adds a Renew tab to the staff client

[patch] Bug 12051: Adds a Renew tab to the staff client

Bug-12051-Adds-a-Renew-tab-to-the-staff-client.patch (text/plain), 21.53 KB, created by Marc Véron on 2016-01-28 21:23:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2016-01-28 21:23:00 UTC

Size: 21.53 KB

patch

obsolete

>From f62b3faed78c4d7937012b917f275dc95b74ef59 Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>Date: Tue, 19 Jan 2016 03:44:31 +0000
>Subject: [PATCH] Bug 12051: Adds a Renew tab to the staff client
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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>
>---
> .../prog/en/includes/budgets-admin-search.inc      |    1 +
> .../intranet-tmpl/prog/en/includes/cat-search.inc  |   40 ++++++++++++--------
> .../prog/en/includes/cataloging-search.inc         |   11 +++++-
> .../prog/en/includes/checkin-search.inc            |   13 ++++++-
> .../intranet-tmpl/prog/en/includes/circ-search.inc |   16 ++++++--
> .../prog/en/includes/cities-admin-search.inc       |    1 +
> .../prog/en/includes/contracts-admin-search.inc    |    5 ++-
> .../prog/en/includes/currencies-admin-search.inc   |    1 +
> .../intranet-tmpl/prog/en/includes/home-search.inc |   16 ++++++--
> .../prog/en/includes/letters-search.inc            |    1 +
> .../prog/en/includes/patron-search.inc             |   10 ++++-
> .../prog/en/includes/patrons-admin-search.inc      |    3 +-
> .../prog/en/includes/prefs-admin-search.inc        |    1 +
> .../prog/en/includes/printers-admin-search.inc     |    1 +
> .../prog/en/includes/serials-search.inc            |    1 +
> .../prog/en/includes/suggestions-add-search.inc    |    3 +-
> .../prog/en/includes/z3950-admin-search.inc        |    1 +
> koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |    1 +
> 18 files changed, 98 insertions(+), 28 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>index 86d9b92..e1360bc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>@@ -32,6 +32,7 @@
>                 <input type="submit" value="Submit"  class="submit" />
>         </form>
>     </div>[% END %]
>+
>             <ul>
>             <li><a onclick="keep_text(0)" href="#budgets_search">Search funds</a></li>
>             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>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
>--- 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>
> </div>
> 
>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
>--- 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>
> </div>
>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
>--- 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
>--- 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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>index 41bfdc4..b44fecd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>@@ -19,6 +19,7 @@
> 				<input type="submit" value="Submit"  class="submit" />
> 		</form>
> 	</div>[% END %]
>+
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#city_search">Search cities</a></li>
>             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>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
>--- 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>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
>index cbd6e5c..ea8e050 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
>@@ -17,6 +17,7 @@
> 				<input type="submit" value="Submit"  class="submit" />
> 		</form>
> 	</div>[% END %]
>+
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#currency_search">Search currencies</a></li>
>             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>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
>--- 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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>index 806ee5e..6cba2bc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>@@ -17,6 +17,7 @@
> 				<input type="submit" name="op" value="Submit"  class="submit" />
> 		</form>
> 	</div>[% END %]
>+
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#notices_search">Search notices</a></li>
>             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>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
>--- 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>
> </div>
>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
>--- 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/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
>index 34de2d4..6abf7a4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
>@@ -20,6 +20,7 @@
> 		</form>
> 	</div>
> 	[% END %]
>+
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#syspref_search">Search system preferences</a></li>
>             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
>index 46deb14..b7154ed 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
>@@ -18,6 +18,7 @@
> 		</form>
> 	</div>
> 	[% END %]
>+
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#printer_search">Search printers</a></li>
>             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</a></li>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>index 8ba2b15..90fdc33 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>@@ -27,6 +27,7 @@
>         </form>
>       </div>
>     [% END %]
>+
>     <ul>
>       <li><a href="#subscription_search">Search subscriptions</a></li>
>       [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
>index 58195c0..ac4d814 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
>@@ -23,10 +23,11 @@
> 		</form>
> 	</div>
> 	[% END %]
>+
> 			<ul>
>             <li><a href="#suggestions_search">Search suggestions</a></li>
>             [% 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_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
>             </ul>
> </div>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>index ffd5290..d067025 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
>@@ -20,6 +20,7 @@
> 		</form>
> 	</div>
> 	[% END %]
>+
> 			<ul>
>             <li><a onclick="keep_text(0)" href="#z3950_search">Search Z39.50/SRU servers</a></li>
>             [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#circ_search">Check out</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
>--- 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() {
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 12051: 46847 | 47276 | 47361 | 47362 | 47406 | 47412 | 47454 | 47476