Bugzilla – Attachment 161499 Details for
Bug 35349
Reindent label item search template
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35349: Reindent label item search template
Bug-35349-Reindent-label-item-search-template.patch (text/plain), 11.71 KB, created by
Martin Renvoize (ashimema)
on 2024-01-26 10:22:14 UTC
(
hide
)
Description:
Bug 35349: Reindent label item search template
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2024-01-26 10:22:14 UTC
Size:
11.71 KB
patch
obsolete
>From 638f2ea1e7c0b9cf759039fbe3836c1b6118622b Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 16 Nov 2023 12:13:06 +0000 >Subject: [PATCH] Bug 35349: Reindent label item search template > >This patch reindents the label item search template so that it has >consistent indentation. These changes should have no visible effect on >the page. > >To test, apply the patch and go to Cataloging -> Label creator. > >- Click New -> Label batch. >- Click the "Add items" button under the form. >- A "Search for items" window should pop up. >- The form should look correct, and work as it did before the patch. > >Viewing the diff while ignoring whitespace changes should show only >places where a line break was added. > >Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/modules/labels/search.tt | 234 ++++++++++-------- > 1 file changed, 137 insertions(+), 97 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >index 940903d509f..8f19d157345 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt >@@ -12,103 +12,143 @@ > <body id="labels_search" class="tools labels"> > <div class="main container-fluid"> > >-<h1>Search for items >-[% IF ( batch_id ) %] >-to add to Batch [% batch_id | html %] >-[% END %] >-</h1> >- >-<form name="f" method="post" action="/cgi-bin/koha/labels/label-item-search.pl"> >- <input type="hidden" name="op" value="do_search" /> >- <input type="hidden" name="batch_id" value="[% batch_id | html %]" /> >- <input type="hidden" name="type" value="[% type | html %]" /> >- >- <fieldset class="rows"> >-<ol><li> >-<select name="idx" > <!-- FIXME: script does keyword search regardless --> >- >-[% IF idx == 'kw' %]<option value="kw" selected="selected">Keyword</option> >-[% ELSE %]<option value="kw">Keyword</option>[% END %] >- >-[% IF idx == 'au' %]<option value="au" selected="selected">Author</option> >-[% ELSE %]<option value="au">Author</option>[% END %] >- >-[% IF idx == 'yr' %]<option value="yr" selected="selected">Publication date</option> >-[% ELSE %]<option value="yr">Publication date</option>[% END %] >- >-[% IF idx == 'sn' %]<option value="ident" selected="selected">Standard number</option> >-[% ELSE %]<option value="sn">Standard number</option>[% END %] >- >-[% IF idx == 'nb' %]<option value="nb" selected="selected">ISBN</option> >-[% ELSE %]<option value="nb">ISBN</option>[% END %] >- >-[% IF idx == 'ns' %]<option value="ns" selected="selected">ISSN</option> >-[% ELSE %]<option value="ns">ISSN</option>[% END %] >- >-[% IF idx == 'lcn,phr' %]<option value="lcn,phr" selected="selected">Call number</option> >-[% ELSE %]<option value="lcn,phr">Call number</option>[% END %] >- >-[% IF idx == 'su' %]<option value="su" selected="selected">Subject</option> >-[% ELSE %]<option value="su">Subject</option>[% END %] >- >-[% IF idx == 'ti' %] >- <option value="ti" selected="selected">Title</option> >-[% ELSE %] >- <option value="ti">Title</option>[% END %] >- >-[% IF idx == 'ti,phr' %]<option value="ti,phr" selected="selected">Title phrase</option> >-[% ELSE %]<option value="ti,phr">Title phrase</option>[% END %] >- >-[% IF idx == 'se' %]<option value="se" selected="selected">Series title</option> >-[% ELSE %]<option value="se">Series title</option>[% END %] >- >-[% IF idx == 'bc' or not idx %]<option value="bc" selected="selected">Barcode</option> >-[% ELSE %]<option value="bc">Barcode</option>[% END %] >- >-[% IF idx == 'acqdate' %]<option value="acqdate" selected="selected">Acquisition date</option> >-[% ELSE %]<option value="acqdate">Acquisition date</option>[% END %] >-</select> >- >- <input type="text" size="30" id="ccl_textbox" name="ccl_textbox" class="focus" title="Enter search terms" value=""/> >- >-</li> >-</ol> >-</fieldset> >- >-[% IF ( sort_by_loop ) %] >-<fieldset><legend>Sort by: </legend> >- <p><select id="sort_by" name="sort_by"> >- <option value="">Field-weighted, relevance ranked</option> >- [% FOREACH sort_by_loo IN sort_by_loop %] >- >-[% IF ( sort_by_loo.selected ) %]<option value="[% sort_by_loo.value | html %]" selected="selected">[% sort_by_loo.label | html %]</option>[% ELSE %]<option value="[% sort_by_loo.value | html %]">[% sort_by_loo.label | html %]</option>[% END %] >- >- [% END %] >- </select> >- </p> >-</fieldset>[% END %] >- >- >- >- >-<fieldset class="rows"> >-<ol> >- <li> >- <label for="from">Added on or after date: </label> >- <input type="text" size="10" id="from" name="datefrom" class="flatpickr" data-date_to="to" value="" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >- <li> >- <label for="to">Added on or before date: </label> >- <input type="text" size="10" id="to" name="dateto" class="flatpickr" value="" /> >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >-</ol> >-</fieldset> >- >-<fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset> >-</form> >-</div> >+ <h1>Search for items >+ [% IF ( batch_id ) %] >+ to add to Batch [% batch_id | html %] >+ [% END %] >+ </h1> >+ >+ <form name="f" method="post" action="/cgi-bin/koha/labels/label-item-search.pl"> >+ <input type="hidden" name="op" value="do_search" /> >+ <input type="hidden" name="batch_id" value="[% batch_id | html %]" /> >+ <input type="hidden" name="type" value="[% type | html %]" /> >+ >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <select name="idx" > <!-- FIXME: script does keyword search regardless --> >+ [% IF idx == 'kw' %] >+ <option value="kw" selected="selected">Keyword</option> >+ [% ELSE %] >+ <option value="kw">Keyword</option> >+ [% END %] >+ >+ [% IF idx == 'au' %] >+ <option value="au" selected="selected">Author</option> >+ [% ELSE %] >+ <option value="au">Author</option> >+ [% END %] >+ >+ [% IF idx == 'yr' %] >+ <option value="yr" selected="selected">Publication date</option> >+ [% ELSE %] >+ <option value="yr">Publication date</option> >+ [% END %] >+ >+ [% IF idx == 'sn' %] >+ <option value="ident" selected="selected">Standard number</option> >+ [% ELSE %] >+ <option value="sn">Standard number</option> >+ [% END %] >+ >+ [% IF idx == 'nb' %] >+ <option value="nb" selected="selected">ISBN</option> >+ [% ELSE %] >+ <option value="nb">ISBN</option> >+ [% END %] >+ >+ [% IF idx == 'ns' %] >+ <option value="ns" selected="selected">ISSN</option> >+ [% ELSE %] >+ <option value="ns">ISSN</option> >+ [% END %] >+ >+ [% IF idx == 'lcn,phr' %] >+ <option value="lcn,phr" selected="selected">Call number</option> >+ [% ELSE %] >+ <option value="lcn,phr">Call number</option> >+ [% END %] >+ >+ [% IF idx == 'su' %] >+ <option value="su" selected="selected">Subject</option> >+ [% ELSE %] >+ <option value="su">Subject</option> >+ [% END %] >+ >+ [% IF idx == 'ti' %] >+ <option value="ti" selected="selected">Title</option> >+ [% ELSE %] >+ <option value="ti">Title</option> >+ [% END %] >+ >+ [% IF idx == 'ti,phr' %] >+ <option value="ti,phr" selected="selected">Title phrase</option> >+ [% ELSE %] >+ <option value="ti,phr">Title phrase</option> >+ [% END %] >+ >+ [% IF idx == 'se' %] >+ <option value="se" selected="selected">Series title</option> >+ [% ELSE %] >+ <option value="se">Series title</option> >+ [% END %] >+ >+ [% IF idx == 'bc' or not idx %] >+ <option value="bc" selected="selected">Barcode</option> >+ [% ELSE %] >+ <option value="bc">Barcode</option> >+ [% END %] >+ >+ [% IF idx == 'acqdate' %] >+ <option value="acqdate" selected="selected">Acquisition date</option> >+ [% ELSE %] >+ <option value="acqdate">Acquisition date</option> >+ [% END %] >+ </select> >+ <input type="text" size="30" id="ccl_textbox" name="ccl_textbox" class="focus" title="Enter search terms" value=""/> >+ </li> >+ </ol> >+ </fieldset> >+ >+ [% IF ( sort_by_loop ) %] >+ <fieldset> >+ <legend>Sort by: </legend> >+ <p> >+ <select id="sort_by" name="sort_by"> >+ <option value="">Field-weighted, relevance ranked</option> >+ [% FOREACH sort_by_loo IN sort_by_loop %] >+ [% IF ( sort_by_loo.selected ) %] >+ <option value="[% sort_by_loo.value | html %]" selected="selected">[% sort_by_loo.label | html %]</option> >+ [% ELSE %] >+ <option value="[% sort_by_loo.value | html %]">[% sort_by_loo.label | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </p> >+ </fieldset> >+ [% END %] >+ >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <label for="from">Added on or after date: </label> >+ <input type="text" size="10" id="from" name="datefrom" class="flatpickr" data-date_to="to" value="" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> >+ <li> >+ <label for="to">Added on or before date: </label> >+ <input type="text" size="10" id="to" name="dateto" class="flatpickr" value="" /> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> >+ </ol> >+ </fieldset> >+ >+ <fieldset class="action"> >+ <input type="submit" class="btn btn-primary" value="Search" /> >+ <a class="cancel close" href="#">Cancel</a> >+ </fieldset> >+ </form> >+ </div> > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'calendar.inc' %] >-- >2.43.0
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 35349
:
159041
|
159458
| 161499