From 8b0d0f1514bb8122b6397e238d0bd2e6d3b9112e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 13 Jan 2023 15:34:42 +0000
Subject: [PATCH] Bug 32632: Add 'page-section' to some tools pages

This patch adds a "page-section" container div around the main section
of some tools pages which lack it.

This patch contains indentation changes, so please ignore whitespace
when looking at the diff.

Apply the patch and view the following pages to confirm that the main
content is contained in a white box:

 - From the cataloging home page: Item modifications by age. If
   necessary, add at least one rule to see the table listing all rules.
 - Go to Tools -> Batch extend due dates, and submit values which will
   return one or more results, keeping the "Preview results" checkbox
   checked. Confirm that the page previewing the results looks
   correct.
 - Go to Tools -> Quote editor. If necessary, add at least one quote in
   order to see the table of quotes.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit c8d4fa56d33dc1a07cdbebe19dd9e20d4e623ddd)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../automatic_item_modification_by_age.tt     |  3 ++
 .../modules/tools/batch_extend_due_dates.tt   | 46 ++++++++++---------
 .../prog/en/modules/tools/quotes.tt           | 24 +++++-----
 3 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
index 0a5cc46d36..fd48c89394 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
@@ -216,6 +216,8 @@
         [% ELSIF rules %]
             <div>
                 <h4>List of rules</h4>
+
+                <div class="page-section">
                     <table id="rulest">
                         <thead>
                           <tr>
@@ -265,6 +267,7 @@
                             [% END %]
                         </tbody>
                     </table>
+                </div> <!-- /.page-section -->
             </div>
         [% ELSE %]
             <div class="dialog message">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
index 7ac9809307..e46fbd88c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
@@ -182,30 +182,32 @@
                             Due dates have been modified!
                         </div>
 
-                        <table id="checkouts_result">
-                            <thead>
-                                <tr>
-                                    <th>Due date</th>
-                                    <th>Title</th>
-                                    <th>Item type</th>
-                                    <th>Home library</th>
-                                    <th>Checked out on</th>
-                                    <th>Checked out from</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                [% FOR checkout IN checkouts %]
+                        <div class="page-section">
+                            <table id="checkouts_result">
+                                <thead>
                                     <tr>
-                                        <td>[% checkout.date_due | $KohaDates as_due_date => 1 %]</td>
-                                        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout.item.biblio.biblionumber | uri %]">[% checkout.item.biblio.title | html %]</a></td>
-                                        <td>[% ItemTypes.GetDescription( checkout.item.effective_itemtype ) | html %]</td>
-                                        <td>[% checkout.item.home_branch.branchname | html %]</td>
-                                        <td>[% checkout.issuedate | $KohaDates %]</td>
-                                        <td>[% Branches.GetName( checkout.branchcode ) | html %]</td>
+                                        <th>Due date</th>
+                                        <th>Title</th>
+                                        <th>Item type</th>
+                                        <th>Home library</th>
+                                        <th>Checked out on</th>
+                                        <th>Checked out from</th>
                                     </tr>
-                                [% END %]
-                            </tbody>
-                        </table> <!-- /#checkouts_result -->
+                                </thead>
+                                <tbody>
+                                    [% FOR checkout IN checkouts %]
+                                        <tr>
+                                            <td>[% checkout.date_due | $KohaDates as_due_date => 1 %]</td>
+                                            <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout.item.biblio.biblionumber | uri %]">[% checkout.item.biblio.title | html %]</a></td>
+                                            <td>[% ItemTypes.GetDescription( checkout.item.effective_itemtype ) | html %]</td>
+                                            <td>[% checkout.item.home_branch.branchname | html %]</td>
+                                            <td>[% checkout.issuedate | $KohaDates %]</td>
+                                            <td>[% Branches.GetName( checkout.branchcode ) | html %]</td>
+                                        </tr>
+                                    [% END %]
+                                </tbody>
+                            </table> <!-- /#checkouts_result -->
+                        </div> <!-- /.page-section -->
                     [% END %]
                 </main>
             </div> <!-- /.col-sm-10.col-sm-push-2 -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
index e88d6978e0..d0d9783ab2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/quotes.tt
@@ -106,17 +106,19 @@
 [% IF op == 'list' %]
     <h1>Quotes</h1>
     [% IF quotes_count > 0 %]
-        <table id="quotes">
-            <thead>
-                <tr>
-                    <th>ID</th>
-                    <th>Source</th>
-                    <th>Text</th>
-                    <th>Last display</th>
-                    <th data-class-name="actions" class="noExport">Actions</th>
-                </tr>
-            </thead>
-        </table>
+        <div class="page-section">
+            <table id="quotes">
+                <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>Source</th>
+                        <th>Text</th>
+                        <th>Last display</th>
+                        <th data-class-name="actions" class="noExport">Actions</th>
+                    </tr>
+                </thead>
+            </table>
+        </div> <!-- /.page-section -->
     [% ELSE %]
         <div class="dialog message">There are no quotes defined. <a href="/cgi-bin/koha/tools/quotes.pl?op=add_form">Start defining quotes</a>.</div>
     [% END %]
-- 
2.39.5