From a34b50e7674e27cb083619e091f5d384ed572403 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 7 Oct 2013 15:12:03 -0400 Subject: [PATCH] [SIGNED-OFF] Bug 10309 [Follow-up] Add changes from Bug 8712, "and" labels in advanced search This patch adds the changes from Bug 8712 to the new theme. Some HTML markup errors have also been corrected. From Bug 8712: "The "and" label not only improves the accessibility but also gives the user an idea that the operation between multiple search fields is a boolean "AND" by default." Signed-off-by: Bernardo Gonzalez Kriegel "and" looks well on advanced search. No errors --- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 3 +- .../bootstrap/en/modules/opac-advsearch.tt | 29 +++++++++++--------- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 7 +++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css index a56dbc3..36b7a1e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css +++ b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css @@ -104,7 +104,8 @@ table, td { background-color: #FFF; } -#advsearches label { +#advsearches label, +#booleansearch label { display: inline; } #basketcount { diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt index 5d2fa45..c55eccc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -25,15 +25,23 @@

[% IF ( expanded_options ) %] [% IF ( search_box.boolean ) %] - + [% END %] + [% ELSE %] + [% END %] [% IF ( expanded_options ) %][% left_content %][% END %] - [% IF ( expanded_options ) %] @@ -142,7 +150,7 @@ [% END # / FOREACH advancedsearchesloop %] - +

@@ -329,9 +337,6 @@
[% END # / IF expanded_options %] - - - @@ -344,11 +349,9 @@ [% PROCESS searchbuttons %] - - + - [% INCLUDE 'opac-bottom.inc' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less index 7424d67..106fb3a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less +++ b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less @@ -121,8 +121,11 @@ table, td { background-color: #FFF; } -#advsearches label { - display: inline; +#advsearches, +#booleansearch { + label { + display: inline; + } } #basketcount { -- 1.7.9.5