From e93ffac3f1dd92a1fa5e10dd52cffcaa5a1c2192 Mon Sep 17 00:00:00 2001 From: Aleisha 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=utf8 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 Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../prog/en/includes/cat-search.inc | 40 ++++++++++++------- .../prog/en/includes/cataloging-search.inc | 11 ++++- .../prog/en/includes/checkin-search.inc | 13 +++++- .../prog/en/includes/circ-search.inc | 16 ++++++-- .../en/includes/contracts-admin-search.inc | 5 ++- .../prog/en/includes/home-search.inc | 16 ++++++-- .../prog/en/includes/patron-search.inc | 10 ++++- .../prog/en/includes/patrons-admin-search.inc | 3 +- .../intranet-tmpl/prog/en/js/staff-global.js | 1 + 9 files changed, 88 insertions(+), 27 deletions(-) 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 6eae19329f..61fefa7aca 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 @@ - [% END %] - [% IF ( CAN_user_catalogue ) %] - - [% END %] - -
    - [% IF ( CAN_user_circulate ) %]
  • Check out
    • [% END %] + +[% END %] + +[% IF ( CAN_user_catalogue ) %] + +[% END %] + + + [% IF ( CAN_user_circulate ) %]
  • Renew
    • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • Search the catalog
    • [% END %] +
+ 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 4b6a9de45a..1cb311e8c6 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 @@ + [% END %] + 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 4f1e2b9c6b..07cb17b91c 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 @@ [% END %] +[% IF ( CAN_user_circulate ) %] + +[% END %] + 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 ab730ba203..141561c725 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 @@ -[% END %] + + +[% END %] [% IF ( CAN_user_catalogue ) %] [% END %] + +[% 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 1d38559884..692dfd18ac 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 @@ [% 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 fbf3618ba2..d1b2f9aeca 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 @@ -[% END %] + + +[% END %] + [% IF ( CAN_user_borrowers ) %] 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 9b4f19e543..517043254b 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 @@ + [% END %] [% IF ( CAN_user_catalogue ) %] @@ -137,7 +144,8 @@
  • Search patrons
    • [% IF ( CAN_user_circulate ) %]
  • Check out
    • [% END %] [% IF ( CAN_user_circulate ) %]
  • Check in
    • [% END %] - [% IF ( CAN_user_catalogue ) %]
  • Search the catalog
    • [% END %] + [% IF ( CAN_user_circulate ) %]
  • Renew
    • [% END %] + [% IF ( CAN_user_catalogue ) %]
  • Search the catalog
    • [% END %] 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 c248810b19..9c15306353 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 @@ [% END %] -
      + +
      • Search patron categories
        • [% IF ( CAN_user_circulate ) %]
      • Check out
        • [% END %] [% IF ( CAN_user_catalogue ) %]
      • Search the catalog
        • [% 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 92ba935c87..bc4318ef06 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() { -- 2.39.5