From f4a441d687055f48538c9df6caae0a7df4a77da4 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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
since options are bordered by the tab box now - Correcting the conditional which controls the table markup to prevent extra/missing - 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 @@ [% FOREACH advsearchloo IN advancedsearchesloop %]
-
- Limit to any of the following: +

Limit to any of the following:

[% FOREACH itemtypeloo IN advsearchloo.code_loop %] - - [% UNLESS ( loop.count % 5 ) %][% END %] + [% IF ( loop.last ) %][% ELSE %][% UNLESS ( loop.count % 5 ) %][% END %][% END %] [% END %] -
-
[% END %] @@ -283,6 +280,7 @@
+ 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 @@ [% FOREACH itemtypeloo IN advsearchloo.code_loop %] - - [% UNLESS ( loop.count % 5 ) %][% END %] + [% IF ( loop.last ) %][% ELSE %][% UNLESS ( loop.count % 5 ) %][% END %][% END %] [% END %] -
@@ -172,7 +171,7 @@
Language

- [% FOREACH search_languages_loo IN search_languages_loop %] [% IF ( search_languages_loo.selected ) %] -- 1.7.3