From 7e4e9d669a144e20177cfac0f9485413efab8ad6 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Wed, 2 Apr 2014 16:46:25 -0400
Subject: [PATCH] LP#1301599 TPAC advanced search additional labels

Provides a number of labels, primarily for select widgets, in the TPAC
advanced search form for improved accessibility.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
---
 .../templates/opac/parts/advanced/global_row.tt2  |  9 ++++++---
 .../src/templates/opac/parts/advanced/search.tt2  | 15 +++++++++++----
 .../templates/opac/parts/coded_value_selector.tt2 |  2 +-
 .../opac/parts/filter_group_selector.tt2          |  1 +
 Open-ILS/src/templates/opac/parts/filtersort.tt2  |  4 +++-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2 b/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
index 4d9ff4f379..6302a297e6 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
@@ -27,7 +27,8 @@
     <td align='left' width='100%'>
 
         <!-- bool selector.  hide for first row.  safe to ignore first bool value in form submission -->
-        <select name='bool' style='width: auto' [% IF loop.first %] class='invisible' [% END %]>
+        <select title="[% l('Boolean search operator') %]" 
+          name='bool' style='width: auto' [% IF loop.first %] class='invisible' [% END %]>
             <option value='and' [% b == 'and' ? 'selected="selected"' : '' %]>[% l('And') %]</option>
             <option value='or' [% b == 'or' ? 'selected="selected"' : '' %]>[% l('Or') %]</option>
         </select>
@@ -38,12 +39,14 @@
                 query_type=qtype %]
         </span>
 
-        <select name='contains' style='margin-right: 7px;'>
+        <select title="[% l('Search phrase match strictness') %]"
+          name='contains' style='margin-right: 7px;'>
             [% FOR o IN contains_options; -%]
             <option value="[% o.value %]" [% c == o.value ? ' selected="selected"' : '' %]>[% o.label %]</option>
             [% END %]
         </select>
-        <input type='text' size='18' name='query' value="[% q | html %]" x-webkit-speech [% IF loop.index == 0 %] autofocus [% END %] />
+        <input title="[% l('Search term') %]"
+          type='text' size='18' name='query' value="[% q | html %]" x-webkit-speech [% IF loop.index == 0 %] autofocus [% END %] />
         <a href="javascript:;" class="row-remover"
             title="[% l('Remove row') %]" alt="[% l('Remove row') %]"
             onclick='return killRowIfAtLeast(2, this);'>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index eb863a743a..b6e5e3d120 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -76,6 +76,7 @@
 [%
                 CASE "pub_year"; %]
                             <select name='pubdate' 
+                                title="[% l('Publicatiion date search modifier') %]"
                                 onchange='if(this.selectedIndex == 3)
                                     unHideMe($("adv_global_pub_date_2_span"));
                                 else
@@ -90,9 +91,11 @@
                             </select>    
                             <br/>
                             <div id='adv_special_block'>
-                                <input name='date1' type='text' size='4' maxlength='4' value="[% CGI.param('date1') | html %]" />
+                                <input title="[% l('First date') %]" 
+                                  name='date1' type='text' size='4' maxlength='4' value="[% CGI.param('date1') | html %]" />
                                 <span id='adv_global_pub_date_2_span' class='[% CGI.param("pubdate") == "between" ? "" : "hide_me" %]'>
-                                   [% l("and") %] <input name='date2' type='text' size='4' maxlength='4' value="[% CGI.param('date2') | html %]" />
+                                   [% l("and") %] <input name='date2' 
+                                    title="[% l('Second date') %]" type='text' size='4' maxlength='4' value="[% CGI.param('date2') | html %]" />
                                 </span>
                             </div>
 [%
@@ -123,10 +126,14 @@
             END;
         ELSIF adv_chunk.adv_attr;
             INCLUDE "opac/parts/coded_value_selector.tt2"
-                attr=adv_chunk.adv_attr multiple="multiple" size=adv_chunk.adv_size || search.default_adv_select_height || "4";
+                attr=adv_chunk.adv_attr multiple="multiple" 
+                filter_label=l('Select [_1]', adv_chunk.adv_label)
+                size=adv_chunk.adv_size || search.default_adv_select_height || "4";
         ELSIF adv_chunk.adv_filter;
             INCLUDE "opac/parts/filter_group_selector.tt2"
-                filter_group=adv_chunk.adv_filter multiple="multiple" size=adv_chunk.adv_size || search.default_adv_select_height || "4";
+                filter_group=adv_chunk.adv_filter multiple="multiple" 
+                filter_label=l('Select [_1]', adv_chunk.adv_label)
+                size=adv_chunk.adv_size || search.default_adv_select_height || "4";
         END; %]
             </div>
         </div>
diff --git a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2 b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
index 7e6beb8eed..3c242f2be0 100644
--- a/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/coded_value_selector.tt2
@@ -19,7 +19,7 @@
 <select id='[% id %]' name='[% name %]'[%
     multiple ? ' multiple="multiple"' : '';
     size ? (' size="' _ size _ '"') : '';
-%] aria-label="[% l('Select item type:') %]">
+%] aria-label="[% filter_label || l('Select item type:') %]">
 [% IF none_ok %]
     <option value=''>[% none_label ? none_label : l('-- Any --') %]</option>
 [% END;
diff --git a/Open-ILS/src/templates/opac/parts/filter_group_selector.tt2 b/Open-ILS/src/templates/opac/parts/filter_group_selector.tt2
index 239516d96c..8cab0efd1e 100644
--- a/Open-ILS/src/templates/opac/parts/filter_group_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/filter_group_selector.tt2
@@ -16,6 +16,7 @@
 
 <select id='[% id %]' class='[% class %]' name='[% name %]'[%
     multiple ? ' multiple="multiple"' : '';
+    title="[% filter_label || l('Search Filter') %]"
     size ? (' size="' _ size _ '"') : ''; %]>
 [% IF none_ok %]
     <option value=''>[% none_label ? none_label : l('-- Any --') %]</option>
diff --git a/Open-ILS/src/templates/opac/parts/filtersort.tt2 b/Open-ILS/src/templates/opac/parts/filtersort.tt2
index 8d47979711..1907058175 100644
--- a/Open-ILS/src/templates/opac/parts/filtersort.tt2
+++ b/Open-ILS/src/templates/opac/parts/filtersort.tt2
@@ -1,4 +1,6 @@
-<select [% class ? ('class="' _ class _ '"') : '' %] id='[% id || "opac.result.sort" %]' name="[% name || 'sort' %]" [% IF submit_on_change %]onchange='this.form.submit()'[% END %]>
+<select title="[% l('Search sorting') %]" 
+    [% class ? ('class="' _ class _ '"') : '' %] id='[% id || "opac.result.sort" %]' 
+    name="[% name || 'sort' %]" [% IF submit_on_change %]onchange='this.form.submit()'[% END %]>
     [% IF mode != 'bookbag' %]<option value=''>[% l("Sort by Relevance") %]</option>[% END %]
     <optgroup label='[% l("Sort by Title") %]'>
         <option value='titlesort'[% value == 'titlesort' ? ' selected="selected"' : '' %]>[% l("Title: A to Z") %]</option>
-- 
2.43.2