Bugzilla – Attachment 177404 Details for
Bug 38718
main container wrapper
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38718: (follow-up) Use main-container.inc on ILL requests page
Bug-38718-follow-up-Use-main-containerinc-on-ILL-r.patch (text/plain), 9.75 KB, created by
Owen Leonard
on 2025-01-31 19:08:32 UTC
(
hide
)
Description:
Bug 38718: (follow-up) Use main-container.inc on ILL requests page
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-01-31 19:08:32 UTC
Size:
9.75 KB
patch
obsolete
>From 76aa938c379a96a94ddfff55dc811ee72cb36a02 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 31 Jan 2025 17:32:19 +0000 >Subject: [PATCH] Bug 38718: (follow-up) Use main-container.inc on ILL requests > page > >--- > .../prog/en/includes/ill-filter.inc | 58 ++++++++++++++ > .../prog/en/includes/main-container.inc | 1 + > .../prog/en/modules/ill/ill-requests.tt | 78 ++----------------- > 3 files changed, 65 insertions(+), 72 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/ill-filter.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-filter.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-filter.inc >new file mode 100644 >index 00000000000..52f71ac9506 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-filter.inc >@@ -0,0 +1,58 @@ >+[% USE raw %] >+[% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] >+[% USE Branches %] >+ >+<form method="get" id="illfilter_form"> >+ <fieldset class="brief"> >+ <h3>Filters</h3> >+ <ol> >+ <li> >+ <label for="illfilter_keyword">Keyword:</label> >+ <input type="text" name="illfilter_keyword" id="illfilter_keyword" /> >+ </li> >+ <li> >+ <label for="illfilter_backend">Backend:</label> >+ <select name="illfilter_backend" id="illfilter_backend"> >+ <option value="">All backends</option> >+ </select> >+ </li> >+ <li> >+ <label for="illfilter_status">Status:</label> >+ <select name="illfilter_status" id="illfilter_status"> >+ </select> >+ </li> >+ <li> >+ <label for="illfilter_dateplaced_start">Date placed between:</label> >+ <input type="text" name="illfilter_dateplaced_start" id="illfilter_dateplaced_start" class="flatpickr" data-date_to="illfilter_dateplaced_end"/> >+ </li> >+ <li> >+ <label for="illfilter_dateplaced_end">and:</label> >+ <input type="text" name="illfilter_dateplaced_end" id="illfilter_dateplaced_end" class="flatpickr" /> >+ </li> >+ <li> >+ <label for="illfilter_datemodified_start">Updated between:</label> >+ <input type="text" name="illfilter_datemodified_start" id="illfilter_datemodified_start" class="flatpickr" data-date_to="illfilter_datemodified_end" /> >+ </li> >+ <li> >+ <label for="illfilter_datemodified_end">and:</label> >+ <input type="text" name="illfilter_datemodified_end" id="illfilter_datemodified_end" class="flatpickr" /> >+ </li> >+ <li> >+ <label for="illfilter_branchname">Library:</label> >+ <select name="illfilter_branchname" id="illfilter_branchname"> >+ <option value="">All libraries</option> >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => userbranch, only_from_group => 1 ) %] >+ </select> >+ </li> >+ <li> >+ <label for="illfilter_patron">Patron:</label> >+ <input type="text" name="illfilter_patron" id="illfilter_patron" /> >+ </li> >+ </ol> >+ </fieldset> >+ <fieldset class="action"> >+ <input type="submit" class="btn btn-primary" value="Search" /> >+ <input type="button" value="Clear" class="clear_search" /> >+ </fieldset> >+</form> <!-- /#illfilter_form --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc >index 76bbffa0ab6..71f5727db07 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc >@@ -23,6 +23,7 @@ > [% CASE 'circ-nav' %][% INCLUDE 'circ-nav.inc' %] > [% CASE 'facets' %][% INCLUDE 'facets.inc' %] > [% CASE 'guided-reports-view' %][% INCLUDE 'guided-reports-view.inc' %] >+ [% CASE 'ill-filter' %][% INCLUDE 'ill-filter.inc' %] > [% CASE 'vendor-menu' %][% INCLUDE 'vendor-menu.inc' %] > [% CASE 'pos-menu' %][% INCLUDE 'pos-menu.inc' %] > [% CASE 'prefs-menu' %][% INCLUDE 'prefs-menu.inc' %] >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 b9671a3f876..7444aff9c13 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 >@@ -52,80 +52,16 @@ > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] > >-<div class="main container-fluid"> >- <div class="row"> >+[% WRAPPER 'main-container.inc' wide_centered => ( op == 'illlist' ? 0 : 1 ) aside = ( op == 'illlist' ? 'ill-filter' : '' ) %] > > [% IF op == 'illlist' %] > <script> > var ill_table_actions = [% table_actions | $raw %]; > </script> >- <div class="col-sm-2"> >- <aside> >- <form method="get" id="illfilter_form"> >- <fieldset class="brief"> >- <h3>Filters</h3> >- <ol> >- <li> >- <label for="illfilter_keyword">Keyword:</label> >- <input type="text" name="illfilter_keyword" id="illfilter_keyword" /> >- </li> >- <li> >- <label for="illfilter_backend">Backend:</label> >- <select name="illfilter_backend" id="illfilter_backend"> >- <option value="">All backends</option> >- </select> >- </li> >- <li> >- <label for="illfilter_status">Status:</label> >- <select name="illfilter_status" id="illfilter_status"> >- </select> >- </li> >- <li> >- <label for="illfilter_dateplaced_start">Date placed between:</label> >- <input type="text" name="illfilter_dateplaced_start" id="illfilter_dateplaced_start" class="flatpickr" data-date_to="illfilter_dateplaced_end"/> >- </li> >- <li> >- <label for="illfilter_dateplaced_end">and:</label> >- <input type="text" name="illfilter_dateplaced_end" id="illfilter_dateplaced_end" class="flatpickr" /> >- </li> >- <li> >- <label for="illfilter_datemodified_start">Updated between:</label> >- <input type="text" name="illfilter_datemodified_start" id="illfilter_datemodified_start" class="flatpickr" data-date_to="illfilter_datemodified_end" /> >- </li> >- <li> >- <label for="illfilter_datemodified_end">and:</label> >- <input type="text" name="illfilter_datemodified_end" id="illfilter_datemodified_end" class="flatpickr" /> >- </li> >- <li> >- <label for="illfilter_branchname">Library:</label> >- <select name="illfilter_branchname" id="illfilter_branchname"> >- <option value="">All libraries</option> >- [% PROCESS options_for_libraries libraries => Branches.all( selected => userbranch, only_from_group => 1 ) %] >- </select> >- </li> >- <li> >- <label for="illfilter_patron">Patron:</label> >- <input type="text" name="illfilter_patron" id="illfilter_patron" /> >- </li> >- </ol> >- </fieldset> >- <fieldset class="action"> >- <input type="submit" class="btn btn-primary" value="Search" /> >- <input type="button" value="Clear" class="clear_search" /> >- </fieldset> >- </form> <!-- /#illfilter_form --> >- </aside> >- </div> <!-- /.col-sm-2 --> >- [% END %] >- [% IF op == 'illlist' %] >- [% SET div_class = 'col-sm-10' %] >- [% ELSE %] >- [% SET div_class = 'col-sm-10 offset-sm-2' %] > [% END %] >- <div class="[% div_class | html %]"> >- <main> >- [% INCLUDE 'messages.inc' %] >- <div id="interlibraryloans"> >+ >+ <div id="interlibraryloans"> >+ > [% IF !backends_available || !has_branch || ill_deprecated_backend_freeform_is_installed %] > <div class="alert alert-info">ILL module configuration problem. Take a look at the <a href="/cgi-bin/koha/about.pl?tab=sysinfo">about page</a></div> > [% ELSE %] >@@ -927,10 +863,8 @@ > [% END %] > [% END %] > </div> <!-- /#interlibraryloans --> >- </main> >- </div> <!-- /.col-sm-10 --> >- </div> <!-- /.row --> >-</div> <!-- /.main.container-fluid --> >+ >+[% END %] > > > [% MACRO jsinclude BLOCK %] >-- >2.39.5
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 38718
:
177403
| 177404 |
177405
|
177406
|
177407