From d4b6fcc0f3b72a4a07a601dc72f6d651f54654b7 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 26 Oct 2022 11:19:07 +0000
Subject: [PATCH] Bug 31905: Fix button spacing on holds page

This patch makes minor modifications to the holds template in order to
improve the display of the hold buttons related to existing holds.

The patch also adds "display:none" to the hold cancellation fieldset so
there isn't a flash of content before JavaScript hides it.

To test, apply the patch and locate a record in the catalog.

- Place one or more holds on the record.
- View the holds for that record.
- Under the "Existing holds" heading there should be a toolbar of
  buttons which sits above the page-section div. The buttons should be
  well spaced.
- If you have cancellation reasons defined in authorized values, the
  "Cancel selected" button should correctly trigger a modal with the
  option to specify a cancellation reason.
- The display should work well for any setting of the HoldsSplitQueue
  system preference.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../intranet-tmpl/prog/en/modules/reserve/request.tt  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 5124e56ea5..2abf57ab8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -1020,10 +1020,14 @@
                         [% END %]
 
                         <h2>Existing holds</h2>
-                        <div class="page-section">
                         <div id="toolbar" class="btn-toolbar">
-                            <input type="submit" name="submit" value="Update hold(s)" /> <button class="cancel_selected_holds" data-bulk="true"></button>
-                        <fieldset id="cancellation-reason-fieldset" class="action">
+                            <div class="btn-group">
+                                <input type="submit" class="btn btn-primary" name="submit" value="Update hold(s)" />
+                            </div>
+                            <div class="btn-group">
+                                <button class="cancel_selected_holds" data-bulk="true"></button>
+                            </div>
+                        <fieldset id="cancellation-reason-fieldset" class="action" style="display:none">
                             [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
                             [% IF hold_cancellation.count %]
                                 <label for="cancellation-reason">Cancellation reason: </label>
@@ -1036,6 +1040,7 @@
                             [% END %]
                         </fieldset>
                         </div>
+                        <div class="page-section">
 
                         [% FOREACH biblioloo IN biblioloop %]
                             [% IF ( biblioloo.reserveloop ) %]
-- 
2.39.5