From 8d7d054ce992d847712b6580c969b50520fa184d Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 6 Jan 2023 15:17:06 +0000
Subject: [PATCH] Bug 32576: Move page-section outside of table include
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch drops the superflous div from the ill-list-table include and
instead opts to wrap calls to it with a more appropriately positioned
div instead.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit abda545a785005f1b1be65caea7bf23a8dfbae04)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../prog/en/includes/ill-list-table.inc       | 84 +++++++++----------
 .../prog/en/modules/ill/ill-requests.tt       |  5 +-
 .../prog/en/modules/members/ill-requests.tt   |  4 +-
 3 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc
index 7e59a2fa11..755e6e550b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc
@@ -1,43 +1,41 @@
-<div class="page-section">
-    [% IF prefilters.length > 0 %]
-    <table id="ill-requests" data-prefilters="[% prefilters | html %]">
-    [% ELSE %]
-    <table id="ill-requests">
-    [% END %]
-        <thead>
-            <tr id="illview-header">
-                <th scope="col">Request ID</th>
-                <th scope="col">Author</th>
-                <th scope="col">Title</th>
-                <th scope="col">Article title</th>
-                <th scope="col">Issue</th>
-                <th scope="col">Volume</th>
-                <th scope="col">Year</th>
-                <th scope="col">Pages</th>
-                <th scope="col">Request type</th>
-                <th scope="col">Order ID</th>
-                <th scope="col">Patron</th>
-                <th scope="col">Bibliographic record ID</th>
-                <th scope="col">Library</th>
-                <th scope="col">Status</th>
-                <th scope="col" class="placed">&nbsp;</th>
-                <th scope="col" class="placed_formatted">Placed on</th>
-                <th scope="col" class="updated">&nbsp;</th>
-                <th scope="col" class="updated_formatted">Updated on</th>
-                <th scope="col">Replied</th>
-                <th scope="col" class="completed">&nbsp;</th>
-                <th scope="col" class="completed_formatted">Completed on</th>
-                <th scope="col">Access URL</th>
-                <th scope="col">Cost</th>
-                <th scope="col">Price paid</th>
-                <th scope="col">Comments</th>
-                <th scope="col">OPAC notes</th>
-                <th scope="col">Staff notes</th>
-                <th scope="col">Backend</th>
-                <th scope="col" class="actions"></th>
-            </tr>
-        </thead>
-        <tbody id="illview-body">
-        </tbody>
-    </table>
-</div>
+[% IF prefilters.length > 0 %]
+<table id="ill-requests" data-prefilters="[% prefilters | html %]">
+[% ELSE %]
+<table id="ill-requests">
+[% END %]
+    <thead>
+        <tr id="illview-header">
+            <th scope="col">Request ID</th>
+            <th scope="col">Author</th>
+            <th scope="col">Title</th>
+            <th scope="col">Article title</th>
+            <th scope="col">Issue</th>
+            <th scope="col">Volume</th>
+            <th scope="col">Year</th>
+            <th scope="col">Pages</th>
+            <th scope="col">Request type</th>
+            <th scope="col">Order ID</th>
+            <th scope="col">Patron</th>
+            <th scope="col">Bibliographic record ID</th>
+            <th scope="col">Library</th>
+            <th scope="col">Status</th>
+            <th scope="col" class="placed">&nbsp;</th>
+            <th scope="col" class="placed_formatted">Placed on</th>
+            <th scope="col" class="updated">&nbsp;</th>
+            <th scope="col" class="updated_formatted">Updated on</th>
+            <th scope="col">Replied</th>
+            <th scope="col" class="completed">&nbsp;</th>
+            <th scope="col" class="completed_formatted">Completed on</th>
+            <th scope="col">Access URL</th>
+            <th scope="col">Cost</th>
+            <th scope="col">Price paid</th>
+            <th scope="col">Comments</th>
+            <th scope="col">OPAC notes</th>
+            <th scope="col">Staff notes</th>
+            <th scope="col">Backend</th>
+            <th scope="col" class="actions"></th>
+        </tr>
+    </thead>
+    <tbody id="illview-body">
+    </tbody>
+</table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
index 81927773b9..c8236585c8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -786,10 +786,9 @@
                 [% ELSIF query_type == 'illlist' %]
                     <!-- illlist -->
                     <h1>View ILL requests</h1>
-                    <div id="results">
-                        <h3>Details for all requests</h3>
+                    <div id="results" class="page-section">
+                        <h2>Details for all requests</h2>
                         [% INCLUDE 'ill-list-table.inc' %]
-
                     </div> <!-- /#results -->
                 [% ELSIF query_type == 'availability' %]
                     <!-- availability -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
index 87853b7bdb..1bed9c26dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
@@ -42,7 +42,9 @@
             <main>
                 [% INCLUDE 'members-toolbar.inc' %]
                 <h1>ILL requests history</h1>
-                [% INCLUDE 'ill-list-table.inc' %]
+                <div class="page-section">
+                    [% INCLUDE 'ill-list-table.inc' %]
+                </div>
             </main>
         </div> <!-- .col-sm-10.col-sm-push-2 -->
 
-- 
2.39.5