From 1a4721e26d46a900a782b2720a9e93fc364136e2 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Tue, 12 Dec 2023 22:48:22 +0000 Subject: [PATCH] Bug 35360: Make HTML/buttons consistent on waitingreserves.tt To test: 1. Have some holds that are waiting, waiting over expiration date, and cancelled waiting holds. 2. Notice the differences between the 3 tables and their related buttons: -Holds waiting -Holds waiting past their expiration date -Holds with cancellation requests -Holds waiting includes a 'Canceled selected' button at the top of the table. It is with in a #toolbar. -Holds waiting past their expiration date includes a 'Cancel selected' and a 'Cancel all' button. None are within a #toolbar. The 'Cancel selected' here lacks a Bootstrap .btn class. The 'Cancel all' button does have a .btn class. -Holds with cancellation requests has neither a 'Cancel selected' or a 'Cancel all' button. 3. APPLY PATCH 4. Look again and the tables/buttons should be more consistent. 5. The 'Holds with cancellation requests: X' tab should now include a 'Cancel selected (X)' button. Make sure is works. 6. Turn on TransferWhenCancelAllWaitingHolds and make sure the hint displays well in the Holds over table. --- .../prog/en/modules/circ/waitingreserves.tt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 97e72730bf5..3d8f1929ed4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -110,7 +110,7 @@ [% WRAPPER tab_panel tabname="holdswaiting" bt_active= 1 %] [% IF ( reserveloop ) %]
- +
[% INCLUDE waiting_holds.inc table_name='holdst' reserveloop=reserveloop tab='holdwaiting' %] [% ELSE %] @@ -120,8 +120,8 @@ [% WRAPPER tab_panel tabname="holdsover" %] [% IF ( overloop ) %] - - +
+
@@ -132,10 +132,10 @@ [% END %]
- [% UNLESS TransferWhenCancelAllWaitingHolds %] - Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref) - [% END %] - +
+ [% UNLESS TransferWhenCancelAllWaitingHolds %] +
Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds syspref)
+ [% END %] [% INCLUDE waiting_holds.inc table_name='holdso' reserveloop=overloop tab='holdsover' %] [% ELSE %]
No holds found.
@@ -144,6 +144,9 @@ [% WRAPPER tab_panel tabname="holdscancelled" %] [% IF cancel_reqs_count %] +
+ +
[% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %] [% ELSE %]
No holds found.
-- 2.30.2