From 8d7d054ce992d847712b6580c969b50520fa184d Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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 Signed-off-by: Jonathan Druart Signed-off-by: Tomás Cohen Arazi Signed-off-by: Tomas Cohen Arazi (cherry picked from commit abda545a785005f1b1be65caea7bf23a8dfbae04) Signed-off-by: Matt Blenkinsop --- .../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 @@ -
- [% IF prefilters.length > 0 %] - - [% ELSE %] -
- [% END %] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Request IDAuthorTitleArticle titleIssueVolumeYearPagesRequest typeOrder IDPatronBibliographic record IDLibraryStatus Placed on Updated onReplied Completed onAccess URLCostPrice paidCommentsOPAC notesStaff notesBackend
-
+[% IF prefilters.length > 0 %] + +[% ELSE %] +
+[% END %] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Request IDAuthorTitleArticle titleIssueVolumeYearPagesRequest typeOrder IDPatronBibliographic record IDLibraryStatus Placed on Updated onReplied Completed onAccess URLCostPrice paidCommentsOPAC notesStaff notesBackend
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' %]

View ILL requests

-
-

Details for all requests

+
+

Details for all requests

[% INCLUDE 'ill-list-table.inc' %] -
[% ELSIF query_type == '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 @@
[% INCLUDE 'members-toolbar.inc' %]

ILL requests history

- [% INCLUDE 'ill-list-table.inc' %] +
+ [% INCLUDE 'ill-list-table.inc' %] +
-- 2.39.5