From 2d80caec568073ee1d7a9968194b27734cd0861e Mon Sep 17 00:00:00 2001
From: Bart Jorgensen <bart.tj@gmail.com>
Date: Wed, 16 Jan 2013 14:39:43 +1300
Subject: [PATCH] Bug 9399: making search box options more accessable for
 screen reader users to test: -inspect the options under
 search box (eg checkout) with firebug and check that they
 are within divs with "button" as the role -check the
 different options on all the main pages OR -use a screen
 reader that recognises div tags and see if they recognise
 the option as a 'button'

---
 .../prog/en/includes/acquisitions-search.inc       |    4 ++--
 .../prog/en/includes/authorities-search.inc        |    6 +++---
 .../intranet-tmpl/prog/en/includes/cat-search.inc  |    6 +++---
 .../prog/en/includes/cataloging-search.inc         |    4 ++--
 .../intranet-tmpl/prog/en/includes/circ-search.inc |    6 +++---
 .../prog/en/includes/patron-search.inc             |    8 ++++----
 .../prog/en/includes/serials-search.inc            |    6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index 5855c78..439c08b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -24,8 +24,8 @@
 	</form>
 	</div>	
 			<ul id="tabtriggers">
-            <li><a href="#supplier_search">Vendor search</a></li>
-            <li><a href="#orders_search">Orders search</a></li>
+            <li><div role="button"><a href="#supplier_search">Vendor search</a></div></li>
+            <li><div role="button"><a href="#orders_search">Orders search</a></div></li>
 			</ul>	
 </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
index d0b13a7..4df46ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
@@ -185,9 +185,9 @@
     </form>
     </div>
     <ul>
-        <li><a href="#main_heading">Search main heading</a></li>
-        <li><a href="#matchheading_search">Search all headings</a></li>
-        <li><a href="#all_headings">Keyword search</a></li>
+        <li><div role="button"><a href="#main_heading">Search main heading</a></div></li>
+        <li><div role="button"><a href="#matchheading_search">Search all headings</a></div></li>
+        <li><div role="button"><a href="#all_headings">Keyword search</a></div></li>
     </ul>
 </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 186f1d1..e827d00 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -24,9 +24,9 @@
 	[% END %]
 	
 			<ul>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-selected"><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            [% IF ( CAN_user_circulate ) %]<li><div role="button"><a href="#circ_search">Check out</a></div></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><div role="button"><a href="#checkin_search">Check in</a></div></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-selected"><div role="button"><a href="#catalog_search">Search the catalog</a></div></li>[% END %]
 			</ul>	
 </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index ba878ce..8d39472 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -14,8 +14,8 @@
 </div>
     [% INCLUDE 'patron-search-box.inc' %]
 			<ul>
-            <li><a href="#addbooks_search">Cataloging search</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
+            <li><div role="button"><a href="#addbooks_search">Cataloging search</a></div></li>
+            [% IF ( CAN_user_circulate ) %]<li><div role="button"><a href="#circ_search">Check out</a></div></li>[% END %]
 			</ul>	
 </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 5a145c6..35e6d0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -21,9 +21,9 @@
 </div>[% END %]
 
 <ul>
-    [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><div role="button"><a href="#circ_search">Check out</a></div></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><div role="button"><a href="#checkin_search">Check in</a></div></li>[% END %]
+    [% IF ( CAN_user_catalogue ) %]<li><div role="button"><a href="#catalog_search">Search the catalog</a></div></li>[% END %]
 </ul>   
 
 </div><!-- /header_search -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 880c34c..2a4e839 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -63,10 +63,10 @@
     </div>
     [% END %]
 			<ul>
-            <li><a href="#patron_search">Search patrons</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate ) %]<li><a href="#checkin_search">Check in</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+            <li><div role="button"><a href="#patron_search">Search patrons</a></li>
+            [% IF ( CAN_user_circulate ) %]<li><div role="button"><a href="#circ_search">Check out</a></div></li>[% END %]
+    [% IF ( CAN_user_circulate ) %]<li><div role="button"><a href="#checkin_search">Check in</a></div></li>[% END %]
+            [% IF ( CAN_user_catalogue ) %]<li><div role="button"><a href="#catalog_search">Search the catalog</a></div></li>[% END %]
 			</ul>
 </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index beb309c..ac07051 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -28,9 +28,9 @@
       </div>
     [% END %]
     <ul>
-      <li><a href="#subscription_search">Search subscriptions</a></li>
-      [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-      [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
+      <li><div role="button"><a href="#subscription_search">Search subscriptions</a></div></li>
+      [% IF ( CAN_user_circulate ) %]<li><div role="button"><a href="#circ_search">Check out</a></div></li>[% END %]
+      [% IF ( CAN_user_catalogue ) %]<li><div role="button"><a href="#catalog_search">Search the catalog</a></div></li>[% END %]
     </ul>
   </div><!-- /header_search -->
 </div><!-- /gradient -->
-- 
1.7.9.5