Bugzilla – Attachment 177407 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 container wrapper on tags page
Bug-38718-follow-up-Use-container-wrapper-on-tags-.patch (text/plain), 8.08 KB, created by
Owen Leonard
on 2025-01-31 19:08:38 UTC
(
hide
)
Description:
Bug 38718: (follow-up) Use container wrapper on tags page
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-01-31 19:08:38 UTC
Size:
8.08 KB
patch
obsolete
>From 99779530d9c3dd43d75521ba34aefd3a133de6b5 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 31 Jan 2025 18:22:53 +0000 >Subject: [PATCH] Bug 38718: (follow-up) Use container wrapper on tags page > >--- > .../prog/en/includes/main-container.inc | 1 + > .../prog/en/includes/tags-filter.inc | 50 +++++++++++++++++ > .../prog/en/modules/tags/review.tt | 56 ++----------------- > 3 files changed, 55 insertions(+), 52 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tags-filter.inc > >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 71f5727db07..e23c227aa71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc >@@ -31,6 +31,7 @@ > [% CASE 'serials-advsearch_brief' %][% INCLUDE 'serials-advsearch.inc' brief=1 %] > [% CASE 'serials-menu' %][% INCLUDE 'serials-menu.inc' %] > [% CASE 'subscriptions-search' %][% INCLUDE 'subscriptions-search.inc' %] >+ [% CASE 'tags-filter' %][% INCLUDE 'tags-filter.inc' %] > [% CASE 'tools-menu' %][% INCLUDE 'tools-menu.inc' %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tags-filter.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tags-filter.inc >new file mode 100644 >index 00000000000..f7eb46c36a2 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tags-filter.inc >@@ -0,0 +1,50 @@ >+<form method="get" action="/cgi-bin/koha/tags/review.pl"> >+ <fieldset class="brief"> >+ <h4>Filters</h4> >+ <ol> >+ <li> >+ <label for="tag">Term:</label> <input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /> >+ </li> >+ <li> >+ <label for="approved">Status:</label> >+ <select name="approved" id="approved"> >+ [% IF ( filter_approved_all ) %] >+ <option selected="selected" value="all">All</option> >+ [% ELSE %] >+ <option value="all">all</option> >+ [% END %] >+ [% IF ( filter_approved_ok ) %] >+ <option selected="selected" value="1">Approved</option> >+ [% ELSE %] >+ <option value="1">approved</option> >+ [% END %] >+ [% IF ( filter_approved_pending ) %] >+ <option selected="selected" value="0">Pending</option> >+ [% ELSE %] >+ <option value="0">pending</option> >+ [% END %] >+ [% IF ( filter_approved_rej ) %] >+ <option selected="selected" value="-1">Rejected</option> >+ [% ELSE %] >+ <option value="-1">Rejected</option> >+ [% END %] >+ </select> >+ </li> >+ <li> >+ <label for="approver">Reviewer:</label> <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /> >+ </li> >+ <li> >+ <label for="from">Date: from </label> >+ <input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from | html %]" class="flatpickr" data-date_to="to" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ >+ <label for="to">...to </label> >+ <input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to | html %]" class="flatpickr" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> >+ </ol> >+ </fieldset> >+ <fieldset class="action"> >+ <button type="submit" class="btn btn-primary"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button> >+ </fieldset> >+</form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index 322a9b9cd13..b8bf303eed3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -76,11 +76,8 @@ > [% END #/ WRAPPER breadcrumbs %] > [% END #/ WRAPPER sub-header.inc %] > >- <div class="main container-fluid"> >- <div class="row"> >- <div class="col-md-10 order-sm-1 order-md-2"> >- <main> >- [% INCLUDE 'messages.inc' %] >+[% WRAPPER 'main-container.inc' asides=['tags-filter', 'tools-menu'] %] >+ > <h1>Tags</h1> > > <div class="row"> >@@ -267,53 +264,8 @@ > </fieldset> > </aside> > </div> <!-- /.col-sm-12.col-md-4 --> >- </div> <!-- /.row --> >- </main> >- </div> <!-- /.col-sm-10 order-sm-1 order-md-2 --> >- <div class="col-md-2 order-sm-2 order-md-1"> >- <aside> >- <form method="get" action="/cgi-bin/koha/tags/review.pl"> >- <fieldset class="brief"> >- <h4>Filters</h4> >- <ol> >- <li><label for="tag">Term:</label> <input type="text" name="tag" id="tag" value="[% filter_tag | html %]" /> >- </li> >- <li><label for="approved">Status:</label> >- <select name="approved" id="approved"> >- [% IF ( filter_approved_all ) %]<option selected="selected" value="all">all</option> >- [% ELSE %]<option value="all">all</option>[% END %] >- [% IF ( filter_approved_ok ) %]<option selected="selected" value="1">approved</option> >- [% ELSE %]<option value="1">approved</option>[% END %] >- [% IF ( filter_approved_pending ) %]<option selected="selected" value="0">pending</option> >- [% ELSE %]<option value="0">pending</option>[% END %] >- [% IF ( filter_approved_rej ) %]<option selected="selected" value="-1">rejected</option> >- [% ELSE %]<option value="-1">rejected</option>[% END %] >- </select> >- </li> >- <li><label for="approver">Reviewer:</label> <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" /> >- </li> >- <li> >- <label for="from">Date: from </label> >- <input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from | html %]" class="flatpickr" data-date_to="to" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- >- <label for="to">...to </label> >- <input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to | html %]" class="flatpickr" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >- </ol> >- </fieldset> >- <fieldset class="action"> >- <button type="submit" class="btn btn-primary"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button> >- </fieldset> >- </form> >- >- [% INCLUDE 'tools-menu.inc' %] >- >- </aside> >- </div> <!-- /.col-sm-2 order-sm-2 order-md-1 --> >- </div> <!-- /.row --> >- </div> <!-- /.main.container-fluid --> >+ </div> >+[% END %] > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >-- >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