Bugzilla – Attachment 147430 Details for
Bug 32576
ILL needs the page-section treatment
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32576: Move page-section outside of table include
Bug-32576-Move-page-section-outside-of-table-inclu.patch (text/plain), 6.02 KB, created by
Martin Renvoize
on 2023-02-27 11:45:10 UTC
(
hide
)
Description:
Bug 32576: Move page-section outside of table include
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2023-02-27 11:45:10 UTC
Size:
6.02 KB
patch
obsolete
>From a0caa7dedc3b5565fbae0b77a398017abce257ab 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 > >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> >--- > .../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"> </th> >- <th scope="col" class="placed_formatted">Placed on</th> >- <th scope="col" class="updated"> </th> >- <th scope="col" class="updated_formatted">Updated on</th> >- <th scope="col">Replied</th> >- <th scope="col" class="completed"> </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"> </th> >+ <th scope="col" class="placed_formatted">Placed on</th> >+ <th scope="col" class="updated"> </th> >+ <th scope="col" class="updated_formatted">Updated on</th> >+ <th scope="col">Replied</th> >+ <th scope="col" class="completed"> </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 baf9d47ae4..ae995d0655 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.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32576
:
145085
|
145086
|
145342
|
145343
|
147430
|
147431
|
147489
|
147490