Bugzilla – Attachment 6932 Details for
Bug 7031
More options for AdvancedSearchTypes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Follow-up patch with markup corrections
0001-Bug-7031-Follow-up-More-options-for-AdvancedSearchTy.patch (text/plain), 4.72 KB, created by
Owen Leonard
on 2011-12-27 16:30:27 UTC
(
hide
)
Description:
Follow-up patch with markup corrections
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2011-12-27 16:30:27 UTC
Size:
4.72 KB
patch
obsolete
>From f4a441d687055f48538c9df6caae0a7df4a77da4 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 27 Dec 2011 11:18:34 -0500 >Subject: [PATCH] Bug 7031 Follow-up, More options for AdvancedSearchTypes >Content-Type: text/plain; charset="utf-8" > >This follow-up patch corrects some markup errors and removes some >markup which I think is superfluous: > >- Using template FILTER command to remove invalid punctuation from > ID attributes (to quiet the HTML validator) >- Removing <fieldset> since options are bordered by the tab box now >- Correcting the conditional which controls the table markup > to prevent extra/missing </tr> >- Adding missing ID attribute in the OPAC template >--- > .../prog/en/modules/catalogue/advsearch.tt | 10 ++++------ > .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 7 +++---- > 2 files changed, 7 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index acf133d..28f445c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -112,18 +112,15 @@ > </ul> > [% FOREACH advsearchloo IN advancedsearchesloop %] > <div id="advsearch-[% advsearchloo.advanced_search_type %]" class="advsearch"> >- <fieldset> >- <legend>Limit to any of the following:</legend> >+ <h4>Limit to any of the following:</h4> > <table> > <tr> > [% FOREACH itemtypeloo IN advsearchloo.code_loop %] >- <td><input type="checkbox" id="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %] [% END %] >+ <td><input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %] [% END %] > [% itemtypeloo.description %]</label></td> >- [% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %] >+ [% IF ( loop.last ) %]</tr>[% ELSE %][% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %][% END %] > [% END %] >- </tr> > </table> >- </fieldset> > </div> > [% END %] > <!-- /MC-TYPE LIMIT --> >@@ -283,6 +280,7 @@ > </fieldset> > <!-- /SEARCH BUTTONS --> > </div> >+</div> > </form> > </div> > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt >index 4847ae3..d4e92b4 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt >@@ -158,11 +158,10 @@ > <table> > <tr> > [% FOREACH itemtypeloo IN advsearchloo.code_loop %] >- <td><input type="checkbox" id="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %] [% END %] >+ <td><input type="checkbox" id="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl FILTER remove(',') %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %] [% END %] > [% itemtypeloo.description %]</label></td> >- [% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %] >+ [% IF ( loop.last ) %]</tr>[% ELSE %][% UNLESS ( loop.count % 5 ) %]</tr><tr>[% END %][% END %] > [% END %] >- </tr> > </table> > </fieldset> > </div> >@@ -172,7 +171,7 @@ > <fieldset><legend>Language</legend> > <!-- LANGUAGE LIMIT --> > <p><label for="language-limit">Language: </label> >- <select name="limit"> >+ <select id="language-limit" name="limit"> > <option value="">No Limit</option> > [% FOREACH search_languages_loo IN search_languages_loop %] > [% IF ( search_languages_loo.selected ) %] >-- >1.7.3 >
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 7031
:
5896
|
5897
|
5898
|
5899
|
6910
|
6932
|
6938
|
7855
|
7857
|
7859
|
7860
|
7861
|
7864
|
8127