From 0db54244ec881a739767fe97b6d37a290d36c397 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 17 Nov 2010 14:31:13 +0000
Subject: [PATCH] NIHVIVO-556: Added accessibility (aria roles).

---
 themes/wilma/templates/footer.ftl |  4 ++--
 themes/wilma/templates/menu.ftl   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl
index 119907f6..96220196 100644
--- a/themes/wilma/templates/footer.ftl
+++ b/themes/wilma/templates/footer.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
 
-<footer>
+<footer role="contentinfo">
     <#if copyright??>
         <p class="copyright"><small>&copy;${copyright.year?c} 
         <#if copyright.url??>
@@ -16,7 +16,7 @@
         </p>
     </#if>
     
-    <nav>
+    <nav role="navigation">
         <ul id="footer-nav">
             <li><a href="${urls.about}">About</a></li>
             <#if urls.contact??>
diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl
index 279054d0..439ff666 100644
--- a/themes/wilma/templates/menu.ftl
+++ b/themes/wilma/templates/menu.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
 
-<header id="branding">
+<header id="branding" role="banner">
     <h1 class="vivo-logo"><a href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
     <!-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
 
@@ -11,7 +11,7 @@
     
 <#import "lib-list.ftl" as l>
 
-    <nav>
+    <nav role="navigation">
         <ul id="header-nav">    
             <#if loginName??>
                 <li><span class="pictos-arrow-10">U</span> ${loginName}</li>
@@ -32,11 +32,11 @@
         </ul>
     </nav>
 
-    <section id="search">
+    <section id="search" role="region">
         <fieldset>
             <legend>Search form</legend>
 
-            <form id="searchForm" action="${urls.search}" name="searchForm"> 
+            <form id="searchForm" action="${urls.search}" name="searchForm" role="search"> 
                 <#if showFlag1SearchField??>
                     <select id="search-form-modifier" name="flag1" class="form-item" >
                         <option value="nofiltering" selected="selected">entire database (${loginName})</option>
@@ -58,7 +58,7 @@
     </section>
 </header>
 
-<nav>
+<nav role="navigation">
     <ul id="main-nav">
         <#list tabMenu.items as item>
             <li><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>