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>

diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 09176c2..b5abd34 100644 (file)
--- 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 c685aaf..819fd79 100644 (file)
--- 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>