From c2d482507b7d9197e999b66a54f08b3e45414665 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Fri, 18 Jul 2025 16:09:52 +0000 Subject: [PATCH] Bug 40517: Patron page holds table buttons rearrangement This table now has 4 total buttons, 3 of which relate to a selection of holds. Rearranging the buttons is now necessary to present them nicely. Signed-off-by: Anneli Signed-off-by: Andrew Fuerste Henry --- .../prog/en/includes/patron-detail-tabs.inc | 34 +++++++-------- .../prog/en/modules/reserve/request.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 42 +++++++------------ 3 files changed, 31 insertions(+), 47 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc index 0805755b9c0..f272fd4e70a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc @@ -168,34 +168,30 @@ -
- -
- [% PROCESS 'cancel-hold-modal' form_action = '/cgi-bin/koha/reserve/modrequest.pl' from_param = patronpage %] [% PROCESS 'suspend-hold-modal' %] [% PROCESS 'group-hold-modal' %] - [% IF Koha.Preference('DisplayAddHoldGroups') %] -
- -
- [% END # IF DisplayAddHoldGroups %] - +
+ holds selected + + [% IF Koha.Preference('SuspendHoldsIntranet') %] + + [% END # IF SuspendHoldsIntranet %] + [% IF Koha.Preference('DisplayAddHoldGroups') %] + + [% END # IF DisplayAddHoldGroups %] +
[% IF Koha.Preference('SuspendHoldsIntranet') %]
- -
- -
- [% INCLUDE 'csrf-token.inc' %] -
+ + [% INCLUDE 'csrf-token.inc' %] - -
-
+ + + [% END # IF SuspendHoldsIntranet %] [% ELSE %]

Patron has nothing on hold.

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 b2ee7571f9f..14868aaff46 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -1301,7 +1301,7 @@
- +