Fix header landmark regions

fixes CNVS-29878

Test plan:
- Visit any page on Canvas with a header
- Verify that all the buttons read as expected when tabbed to with a
  screen reader.
- Verify that the landmark regions don't repeat the word "navigation".
- Verify that the screen reader does not enter forms/application mode
  when pressing enter on a link inside any of the nav regions.

Change-Id: I16f32fc4fad919223dc436b8a85c077ace3262b8
Reviewed-on: https://gerrit.instructure.com/82351
Tested-by: Jenkins
Reviewed-by: Jennifer Stern <jstern@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Aaron Cannon <acannon@instructure.com>
This commit is contained in:
Aaron Cannon 2016-06-13 11:40:53 -05:00
parent 75d4418952
commit 14e53f2edb
1 changed files with 4 additions and 7 deletions

View File

@ -3,7 +3,7 @@
<div class="ic-app-header__layout">
<div class="ic-app-header__primary">
<a href="#content" id="skip_navigation_link"><%= t 'links.skip_to_content', "Skip To Content" %></a>
<div role="navigation" class="ic-app-header__main-navigation">
<div role="region" class="ic-app-header__main-navigation" aria-label="<%= t('Main Navigation') %>">
<% unless @current_user.try(:prefers_high_contrast?) %>
<div class="ic-app-header__logomark-container">
<a href="<%= dashboard_url %>" class="ic-app-header__logomark">
@ -11,10 +11,7 @@
</a>
</div>
<% end %>
<ul role="menu" id="menu"
class="ic-app-header__menu-list"
aria-label="<%= t('Main Navigation') %>"
>
<ul id="menu" class="ic-app-header__menu-list">
<% if @current_user %>
<li class="menu-item ic-app-header__menu-list-item <%= ' ic-app-header__menu-list-item--active' if active_path?('/profile') %>">
<a id="global_nav_profile_link" href="/profile" class="ic-app-header__menu-list-link">
@ -109,8 +106,8 @@
</ul>
</div>
<% if show_help_link? %>
<div role="navigation" class="ic-app-header__secondary-navigation">
<ul role="menu" class="ic-app-header__menu-list">
<div role="region" aria-label="<%= t('Secondary Navigation') %>" class="ic-app-header__secondary-navigation">
<ul class="ic-app-header__menu-list">
<li class="ic-app-header__menu-list-item">
<%= link_to help_link_url,
:class => help_link_classes(["ic-app-header__menu-list-link"]),