From f21d18254f636d882563f0c56dd84ebe48c9398f Mon Sep 17 00:00:00 2001
From: Srikanth Dhondi <srikanth@catalyst.net.nz>
Date: Tue, 30 Oct 2012 11:17:52 +1300
Subject: [PATCH] Bug 8712: add 'and' label for inputs in OPAC "fewer options"
 advanced search page

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: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Actually only adds a label and an id to the select.
Note that the boxes do not exactly align anymore now (with fewer options).

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 98bd9de54aa7cab6fe3dec8e7cd88378a06e8684)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../prog/en/modules/opac-advsearch.tt         | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

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 4fef1c63d5..4c1c552868 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt
@@ -57,15 +57,23 @@
         <p>
         [% IF ( expanded_options ) %]
             [% IF ( search_box.boolean ) %]
-            <select name="op">
-                <option value="and" selected="selected">and</option>
-                <option value="or">or</option>
-                <option value="not">not</option>
-            </select>
+                <select name="op">
+                    <option value="and" selected="selected">and</option>
+                    <option value="or">or</option>
+                    <option value="not">not</option>
+                </select>
+            [% END %]
+        [% ELSE %]
+            <label for="search-field_[% loop.index %]">
+                [% IF loop.index == 0 %]
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                [% ELSE %]
+                    and
+                [% END %]
+            </label>
             [% END %]
-        [% END %]
         [% IF ( expanded_options ) %][% left_content %][% END %] 
-        <select name="idx">
+        <select name="idx" id="search-field_[% loop.index %]">
             <option value="kw">Keyword</option>
             <option value="su,wrdl">Subject</option>
 [% IF ( expanded_options ) %]
-- 
2.39.5