Bugzilla – Attachment 46847 Details for
Bug 12051
add renew tab to top on staff client
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12051: Adds a Renew tab to the staff client
Bug-12051-Adds-a-Renew-tab-to-the-staff-client.patch (text/plain), 29.05 KB, created by
Aleisha Amohia
on 2016-01-19 03:48:24 UTC
(
hide
)
Description:
Bug 12051: Adds a Renew tab to the staff client
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2016-01-19 03:48:24 UTC
Size:
29.05 KB
patch
obsolete
>From 6f5435791081880ffa9df45501d54d7e3ab821ab 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 > >To test: > >1) Apply patch >2) Confirm that there is now a Renew tab on every page >3) Attempt to renew a book using this, confirm it works as expected >4) Check if I have missed any pages >--- > .../prog/en/includes/budgets-admin-search.inc | 13 ++++++++++++- > .../intranet-tmpl/prog/en/includes/cat-search.inc | 15 +++++++++++++-- > .../prog/en/includes/cataloging-search.inc | 11 ++++++++++- > .../intranet-tmpl/prog/en/includes/checkin-search.inc | 13 ++++++++++++- > .../intranet-tmpl/prog/en/includes/circ-search.inc | 12 +++++++++++- > .../prog/en/includes/cities-admin-search.inc | 13 ++++++++++++- > .../prog/en/includes/contracts-admin-search.inc | 13 ++++++++++++- > .../prog/en/includes/currencies-admin-search.inc | 13 ++++++++++++- > .../intranet-tmpl/prog/en/includes/home-search.inc | 16 +++++++++++++--- > .../intranet-tmpl/prog/en/includes/letters-search.inc | 13 ++++++++++++- > .../intranet-tmpl/prog/en/includes/patron-search.inc | 10 +++++++++- > .../prog/en/includes/patrons-admin-search.inc | 15 +++++++++++++-- > .../prog/en/includes/prefs-admin-search.inc | 13 ++++++++++++- > .../prog/en/includes/printers-admin-search.inc | 13 ++++++++++++- > .../intranet-tmpl/prog/en/includes/serials-search.inc | 13 ++++++++++++- > .../prog/en/includes/suggestions-add-search.inc | 13 ++++++++++++- > .../prog/en/includes/z3950-admin-search.inc | 13 ++++++++++++- > koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 1 + > 18 files changed, 202 insertions(+), 21 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..fd92050 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,10 +32,21 @@ > <input type="submit" value="Submit" class="submit" /> > </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> > <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 %] >- [% 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> > </div> >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..ca484d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >@@ -22,11 +22,22 @@ > </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_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 %] >+ [% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</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 onclick="keep_text(3)" class="ui-tabs-active"><a 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/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><!-- /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..067aaa4 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..660164a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >@@ -19,11 +19,21 @@ > <input type="submit" class="submit" value="Submit"/> > </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_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/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc >index 41bfdc4..b395a11 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,10 +19,21 @@ > <input type="submit" value="Submit" class="submit" /> > </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> > <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 %] >- [% 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> > </div> >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..d168b2a 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,10 +20,21 @@ > <input type="submit" value="Submit" class="submit" /> > </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> > <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 %] >+ [% 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> > </div><!-- /gradient --> >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..2a8e723 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,10 +17,21 @@ > <input type="submit" value="Submit" class="submit" /> > </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> > <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 %] >- [% 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> > </div><!-- /gradient --> >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><!-- /header_search --> >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..f1a1c96 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >@@ -17,10 +17,21 @@ > <input type="submit" name="op" value="Submit" class="submit" /> > </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> > <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 %] >- [% 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> > </div><!-- /gradient --> >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><!-- /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..fca55ec 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,10 +17,21 @@ > <input type="submit" value="Submit" class="submit" /> > </form> > </div>[% END %] >- <ul> >+ [% 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> > <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 %] >+ [% 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> > </div> >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..e34461f 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,10 +20,21 @@ > </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> > <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 %] >- [% 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> > </div> >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..71eaef1 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,10 +18,21 @@ > </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> > <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 %] >- [% 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> > </div><!-- /gradient --> >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..86f0213 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >@@ -27,10 +27,21 @@ > </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> > <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 %] >- [% 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><!-- /header_search --> > </div><!-- /gradient --> >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..44f4099 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,21 @@ > </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> > <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_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> > </div><!-- /gradient --> >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..5ac732c 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,10 +20,21 @@ > </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> > <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 %] >- [% 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> > </div> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 12051
:
46847
|
47276
|
47361
|
47362
|
47406
|
47412
|
47454
|
47476