From 336e85c6ac237f8aed1fc22d59f2bedf5084b334 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 18 Dec 2023 18:39:36 +0000
Subject: [PATCH] Bug 35540: Separate StaffListsHome block from the table block

This patch makes some minor changes to template markup and CSS so that
"page-section" divs have consistent margins.

To test, apply the patch and rebuild the staff interface CSS.

- Go to Tools -> HTML customizations and create a new entry in
  StaffListsHome, StaffPatronsHome, and StaffPOSHome regions.
- Confirm that those customizations are displayed well on each of those
  corresponding pages: The lists home page, the patrons home page, and
  the Point of Sale home page.
- Confirm that other pages affected by the CSS change still display
  correctly. These pages have an added bottom margin on the main
  "container" of content. For example:
  - Patrons -> Patron search results
  - Catalog -> Catalog search results (especially results with multiple
    pages)
  - Circulation -> Circulation history
  - Reports -> Saved SQL reports

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../intranet-tmpl/prog/css/src/staff-global.scss     |  7 ++++++-
 koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt   | 12 ++++++------
 2 files changed, 12 insertions(+), 7 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 95e718104f..0a055cfe50 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -33,6 +33,10 @@ button {
     }
 }
 
+.row + .page-section {
+    margin-top: 1rem;
+}
+
 a {
     &:hover,
     &:active,
@@ -1934,6 +1938,7 @@ li {
 
 #searchresults {
     background-color: #FFFFFF;
+    margin-bottom: 1rem;
     margin-top: 20px;
     min-width: 100%;
     padding: 20px;
@@ -2747,7 +2752,7 @@ td.bundle {
 }
 
 .toptabs {
-    margin-top: 5px;
+    margin: 1rem 0;
 }
 
 fieldset > .toptabs {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index 3e927e012f..4b0a4cf709 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -62,10 +62,10 @@
         </div>
         [% END %]
 
+        <div class="row">
         <form name="payForm" id="payForm" method="post" action="/cgi-bin/koha/pos/pay.pl">
             [% INCLUDE 'csrf-token.inc' %]
             <input type="hidden" name="op" value="cud-pay">
-            <div class="row">
 
                 <div class="col-md-6">
                     <fieldset class="rows">
@@ -165,15 +165,15 @@
                         <a class="cancel" href="/cgi-bin/koha/pos/pay.pl">Cancel</a>
                     </fieldset>
                 </div>
-            </div>
-        </form>
+            </form>
+        </div>
         [% END %]
 
         [%- SET StaffPOSHome = AdditionalContents.get( location => "StaffPOSHome", lang => lang, library => logged_in_user.branchcode ) -%]
         [%- FOREACH block IN StaffPOSHome.content -%]
-        <div class="page-section">
-            [%- block.content | $raw -%]
-        </div>
+            <div class="page-section">
+                [%- block.content | $raw -%]
+            </div>
         [%- END -%]
 
     </div>
-- 
2.39.5