From 2ea05bf79fafebda6319983a7abd5fff6ed9f2cb Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 2 May 2016 13:35:25 -0400 Subject: [PATCH] Bug 16421 - Move hold edit actions into dropdown menu Content-Type: text/plain; charset="utf-8" This patch modifies the view of existing holds in the staff client so that holds-related actions are moved into an 'actions' menu. This includes priority-reordering controls, suspend, and cancel. This patch also modifies the display of details for each hold so that its suspension or priority status is clear. To test, apply the patch and view holds for a title with multiple holds. - Test the priority-reordering controls and confirm that they work correctly. - Test the "suspend" link and confirm that the suspension form is displayed correctly in a modal window. - Confirm that suspensions are saved correctly with and without a date, and that suspension information is displayed correctly after saving. - Test the "Cancel hold" link. --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 7 + .../prog/en/modules/reserve/request.tt | 202 ++++++++++++++------- 2 files changed, 144 insertions(+), 65 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index 35fa6f8..c9c0c81 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -2322,6 +2322,13 @@ a.disabled { color : #999999; } +fieldset.rows li.divider { + clear: none; + float: none; + padding-bottom: 0; + width: auto; +} + .navbar { color: #333; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index f6e5276..9ef7143 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -13,7 +13,6 @@ [% INCLUDE 'calendar.inc' %] + [% INCLUDE 'header.inc' %] @@ -559,7 +581,7 @@ function checkMultiHold() { [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %] [% IF ( itemloo.canreservefromotherbranches ) %]for [% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %][% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %] since - [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. Cancel hold + [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. Cancel hold [% END %] [% ELSE %] @@ -681,7 +703,6 @@ function checkMultiHold() { [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] Priority -   [% ELSE %] Delete? [% END %] @@ -691,11 +712,7 @@ function checkMultiHold() { Expiration Pickup library Details - [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] - Toggle set to lowest priority - [% END %] -   - [% IF SuspendHoldsIntranet %] [% END %] +   [% FOREACH reserveloo IN biblioloo.reserveloop %] @@ -703,6 +720,7 @@ function checkMultiHold() { + - - [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] - - - Go up - - - - Go top - - - - Go bottom - - - - Go down - - - [% END %] - [% IF ( reserveloo.hidename ) %] @@ -790,18 +787,22 @@ function checkMultiHold() { [% END %] - + + + [% UNLESS ( reserveloo.item_level_hold ) %][% END %] - [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] - - [% IF ( reserveloo.lowestPriority ) %] - Unset lowest priority - [% ELSE %] - Set to lowest priority - [% END %] - - - [% END %] - - - - Cancel +
+ + Actions - + +
+ [% # hold suspend modal form %] + + - [% IF AutoResumeSuspendedHolds %] - - - Clear date - [% END %] - [% ELSE %] - - [% END %] - - [% END # IF SuspendHoldsIntranet %] -- 2.1.4