Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 12051: Adds a Renew tab to the staff client

Browse source 
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
This commit is contained in:
Aleisha 2016-01-19 03:44:31 +00:00 committed by Brendan Gallagher
parent 27231db75d
commit e93ffac3f1
9 changed files with 88 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
View file

@ -12,22 +12,32 @@
<input value="Submit" class="submit" type="submit" /> <input value="Submit" class="submit" type="submit" />
</form> </form>
</div> </div>
[% END %] <div id="renew_search" class="residentsearch">
[% IF ( CAN_user_catalogue ) %] <p class="tip">Scan a barcode to renew:</p>
<div id="catalog_search" class="residentsearch"> <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
<p class="tip">Enter search keywords:</p> <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> <input value="Submit" class="submit" type="submit" />
<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" /> </form>
<input type="submit" class="submit" value="Submit" /> </div>
</form> [% END %]
</div>
[% END %] [% IF ( CAN_user_catalogue ) %]
<div id="catalog_search" class="residentsearch">
<ul> <p class="tip">Enter search keywords:</p>
[% IF ( CAN_user_circulate ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %] <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_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(2)" href="#renew_search">Renew</a></li>[% END %]
</ul> [% 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><!-- /header_search -->
</div><!-- /gradient --> </div><!-- /gradient -->
<!-- End Catalogue Resident Search Box --> <!-- End Catalogue Resident Search Box -->

11
koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
View file

@ -20,8 +20,16 @@
<input value="Submit" class="submit" type="submit" /> <input value="Submit" class="submit" type="submit" />
</form> </form>
</div> </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 %] [% END %]
<div id="catalog_search" class="residentsearch"> <div id="catalog_search" class="residentsearch">
<p class="tip">Enter search keywords:</p> <p class="tip">Enter search keywords:</p>
<form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> <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> <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(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_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> </ul>
</div><!-- /header_search --> </div><!-- /header_search -->
</div><!-- /gradient --> </div><!-- /gradient -->

13
koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
View file

@ -11,9 +11,20 @@
</form> </form>
</div> </div>
[% END %] [% 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> <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(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> </ul>
</div> </div>

16
koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
View file

@ -10,7 +10,15 @@
<input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" /> <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" />
<input value="Submit" class="submit" type="submit" /> <input value="Submit" class="submit" type="submit" />
</form> </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 ) %] [% IF ( CAN_user_catalogue ) %]
<div id="catalog_search" class="residentsearch"> <div id="catalog_search" class="residentsearch">
<p class="tip">Enter search keywords:</p> <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 class="head-searchbox" type="text" name="q" id="search-form" size="40" accesskey="q" />
<input type="submit" class="submit" value="Submit"/> <input type="submit" class="submit" value="Submit"/>
</form> </form>
</div>[% END %] </div>
[% END %]
<ul> <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(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_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> </ul>
</div><!-- /header_search --> </div><!-- /header_search -->

5
koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
View file

@ -20,11 +20,12 @@
<input type="submit" value="Submit" class="submit" /> <input type="submit" value="Submit" class="submit" />
</form> </form>
</div>[% END %] </div>[% END %]
<ul>
<ul>
<li><a onclick="keep_text(0)" href="#contract_description_search">Search contracts</a></li> <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_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_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]
</ul> </ul>
</div> </div>
</div><!-- /gradient --> </div><!-- /gradient -->
<!-- End Patrons Admin Resident Search Box --> <!-- End Patrons Admin Resident Search Box -->

16
koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
View file

@ -10,7 +10,16 @@
<input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" /> <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
<input value="Submit" class="submit" type="submit" /> <input value="Submit" class="submit" type="submit" />
</form> </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 ) %] [% IF ( CAN_user_borrowers ) %]
<div id="patron_search" class="residentsearch"> <div id="patron_search" class="residentsearch">
<p class="tip">Enter patron card number or partial name:</p> <p class="tip">Enter patron card number or partial name:</p>
@ -32,8 +41,9 @@
<ul> <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(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_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_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 %] [% 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> </ul>
</div><!-- /header_search --> </div><!-- /header_search -->

10
koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
View file

@ -122,6 +122,13 @@
<input value="Submit" class="submit" type="submit" /> <input value="Submit" class="submit" type="submit" />
</form> </form>
</div> </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 %] [% END %]
[% IF ( CAN_user_catalogue ) %] [% IF ( CAN_user_catalogue ) %]
@ -137,7 +144,8 @@
<li><a onclick="keep_text(0)" href="#patron_search">Search patrons</a></li> <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(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_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> </ul>
</div><!-- /header_search --> </div><!-- /header_search -->
</div><!-- /gradient --> </div><!-- /gradient -->

3
koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
View file

@ -17,7 +17,8 @@
<input type="submit" value="Submit" class="submit" /> <input type="submit" value="Submit" class="submit" />
</form> </form>
</div>[% END %] </div>[% END %]
<ul>
<ul>
<li><a onclick="keep_text(0)" href="#patron_category_search">Search patron categories</a></li> <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_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_catalogue ) %]<li><a onclick="keep_text(2)" href="#catalog_search">Search the catalog</a></li>[% END %]

1
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
View file

@ -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 #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 #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 #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(); $(".focus").focus();
$(".validated").each(function() { $(".validated").each(function() {