From 47d62af6832bbf2c6306fcf181da7ccbe8538e83 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 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 --- .../prog/en/includes/budgets-admin-search.inc | 3 +- .../intranet-tmpl/prog/en/includes/cat-search.inc | 40 ++++++++++++-------- .../prog/en/includes/cataloging-search.inc | 11 +++++- .../prog/en/includes/checkin-search.inc | 3 +- .../intranet-tmpl/prog/en/includes/circ-search.inc | 16 ++++++-- .../prog/en/includes/cities-admin-search.inc | 3 +- .../prog/en/includes/contracts-admin-search.inc | 7 ++-- .../prog/en/includes/currencies-admin-search.inc | 3 +- .../intranet-tmpl/prog/en/includes/home-search.inc | 16 ++++++-- .../prog/en/includes/letters-search.inc | 3 +- .../prog/en/includes/patron-search.inc | 10 ++++- .../prog/en/includes/patrons-admin-search.inc | 5 ++- .../prog/en/includes/prefs-admin-search.inc | 3 +- .../prog/en/includes/printers-admin-search.inc | 3 +- .../prog/en/includes/serials-search.inc | 3 +- .../prog/en/includes/suggestions-add-search.inc | 3 +- .../prog/en/includes/z3950-admin-search.inc | 3 +- koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 1 + 18 files changed, 98 insertions(+), 38 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..62f5671 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,11 @@ [% 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..2e74a66 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 %] - - + 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 @@ + [% 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 4f1e2b9..f8b45b6 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,10 @@ [% 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 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 @@ -[% END %] + + +[% END %] [% IF ( CAN_user_catalogue ) %] [% END %] + +[% END %] 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..c559df7 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,11 @@ [% 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..5afd469 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/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc index cbd6e5c..dbd1673 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,11 @@ [% 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 @@ -[% END %] + + +[% END %] + [% IF ( CAN_user_borrowers ) %] 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..ca9629c 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,11 @@ [% 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 @@ + [% 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 c248810..173a8ff 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,11 @@ [% END %] -