From 8bd6620d08dac540b1ebde0534c39df59dec05f2 Mon Sep 17 00:00:00 2001
From: Dan Scott <dscott@laurentian.ca>
Date: Mon, 30 Jul 2012 09:44:17 -0400
Subject: [PATCH 1/1] TPAC advanced search org unit selector

Make the advanced search org selector a bit more i18n and accessibility
friendly by giving the fields an explicit label. We shouldn't really build
strings out of individual parts like "in" out of context, because the
translators won't know what "in" refers to; and the label elements help
guide screen readers.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../templates/opac/parts/advanced/expert.tt2  | 26 +++++++++++--------
 .../templates/opac/parts/advanced/numeric.tt2 | 11 +++++---
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 09176c2450..b5abd34adb 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -19,20 +19,24 @@
         </tbody>
         <tfoot>
             <tr>
-               <td colspan="7"><a href="javascript:addExpertRow();">[ [% l("Add row") %] ]</a>
-	       </td>
+               <td colspan="7"><a href="javascript:addExpertRow();">[ [% l("Add row") %] ]</a></td>
             </tr>
             <tr>
                <td colspan="5" class="expert-search-row">
-	           [% PROCESS "opac/parts/org_selector.tt2";
-	              l("in");   INCLUDE build_org_selector show_loc_groups=1 %]
-	       </td>
-	       <td colspan="2" class="expert-search-row">
-	            <input type="submit" value="[% l('Search') %]"
-	               alt="[% l('Search') %]" title="[% l('Search') %]"
-	               class="opac-button" />
-	       </td>
-	     </tr>
+                   <label><strong>[% l("Search Library:") %]</strong>
+                       [%- PROCESS "opac/parts/org_selector.tt2";
+                           INCLUDE build_org_selector show_loc_groups=1 
+                       %]
+                   </label>
+               </td>
+            </tr>
+            <tr>
+                <td colspan="2" class="expert-search-row">
+                <input type="submit" value="[% l('Search') %]"
+                    alt="[% l('Search') %]" title="[% l('Search') %]"
+                    class="opac-button" />
+                </td>
+            </tr>
         </tfoot>
     </table>
 </form>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index c685aaf967..819fd79721 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -4,7 +4,7 @@
     <input type="hidden" name="_special" value="1" />
     <table>
         <tr>
-            <td>
+            <td><label><strong>[% l("Field:") %]</strong>
                 <select name="qtype">
                     <!-- TODO: Pull labels from config.metabib_field.label -->
                     <option value="identifier|isbn">[% l('ISBN') %]</option>
@@ -15,13 +15,18 @@
                     <option value="identifier|tcn">[% l('TCN') %]</option>
                     <option value="item_barcode">[% l('Item Barcode') %]</option>
                 </select>
+                </label>
             </td>
             <td>
                 <input type="text" name="query" size="16" autofocus />
             </td>
-            <td>
+        </tr>
+        <tr>
+            <td colspan="2"><label><strong>[% l("Search Library:") %]</strong>
                   [% PROCESS "opac/parts/org_selector.tt2";
-                     l(' in '); INCLUDE build_org_selector show_loc_groups=1 %]
+                     INCLUDE build_org_selector show_loc_groups=1
+                  %]
+                </label>
             </td>
         </tr>
         <tr>
-- 
2.43.2