From 6aef35b07e0fba8a2bc33f91578b8ad672fb1e88 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 18 Oct 2022 12:07:38 +0000
Subject: [PATCH] Bug 31848: Correct margin and padding on action fieldset in
 aside

This patch makes a minor modification to the padding and margin of
<fieldset class="action"> nested in a .brief fieldset. This markup is
seen most often in sidebar filter form. The change allows the submit
button to line up better with other form fields.

The patch also corrects and inconsistency by modifying the holds queue
template so that the .action fieldset is inside the .brief fieldset.

To test, apply the patch and rebuild the staff interface CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client)

- If necessary, place one or more holds for pickup at your logged-in
  library and rebuild the holds queue
  (misc/cronjobs/holds/build_holds_queue.pl)
- Go to Circulation -> Holds queue.
- The form should look correct.
- Submit the form and check the form in the sidebar. It should look
  correct as well, with the submit button aligned left with the other
  form fields.
- Check pages with similar sidebar forms, e.g.:
  - Administration -> Budgets -> Funds -> Planning
  - Circulation -> Overdues
  - Circulation -> Holds to pull
  - Acquisitions -> Invoices -> Search results

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss    | 3 ++-
 .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 68a21d581f..2ada2f067f 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -944,7 +944,8 @@ fieldset {
         }
 
         .action {
-            margin-left: 1em;
+            margin: 0;
+            padding: .4em 0;
         }
     }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index 4e54485f08..877db11838 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -283,10 +283,10 @@
                     </select>
                 </li>
             </ol>
-        </fieldset>
-        <fieldset class="action">
-            <input type="submit" value="Submit" />
-            <input type="hidden" name="run_report" value="1" />
+            <fieldset class="action">
+                <input type="submit" value="Submit" />
+                <input type="hidden" name="run_report" value="1" />
+            </fieldset>
         </fieldset>
     </form>
 [% END %]
-- 
2.39.5