Merge pull request #1275 from afuna/navigation-landmarks-bug-953

[#953] Add labels when there are multiple navigation landmarks

bin/upgrading/en.dat

@@ -3767,6 +3767,10 @@ sitescheme.footer.sitemap=Site Map
 
 sitescheme.footer.suggestion=Make a Suggestion
 
+sitescheme.navigation.accountlinks=Account Links
+
+sitescheme.navigation.sitelinks=Site Navigation
+
 siteskins.celerity.alt=Celerity: Black text on white background; olive color highlights
 
 siteskins.celerity.desc=Default-sized sans-serif font; vertical, fixed, non-expanding menus.

schemes/celerity.tt

@@ -77,7 +77,7 @@ the same terms as Perl itself.  For a copy of the license, please reference
 
             [% PROCESS block.accountlinks %]
 
-            <nav role="navigation"  class="main-nav top-bar contain-to-grid" data-topbar>
+            <nav role="navigation" aria-label="[% 'sitescheme.navigation.sitelinks' | ml %]" class="main-nav top-bar contain-to-grid" data-topbar>
                 [% PROCESS block.userpic %]
                 <ul class="title-area">
                 <li class="name"></li>
@@ -134,7 +134,7 @@ the same terms as Perl itself.  For a copy of the license, please reference
 
             [% PROCESS block.accountlinks %]
 
-            <nav role="navigation">
+            <nav role="navigation" aria-label="[% 'sitescheme.navigation.sitelinks' | ml %]">
                 [% PROCESS block.userpic %]
                 [% PROCESS block.menunav %]
             </nav>

schemes/common.tt

@@ -92,7 +92,7 @@ the table based way can be removed when the entire site is Foundation-based.
 [%- IF resource_group == "foundation" -%]
 [%- IF remote -%]
 
-<div class="row" id="account-links" role="navigation">
+<div class="row" id="account-links">
 <div class="columns large-12 small-12">
 [%- inbox = remote.notification_inbox -%]
 [%- unread = inbox.unread_count -%]
@@ -102,7 +102,7 @@ the table based way can be removed when the entire site is Foundation-based.
 [%- PROCESS block.userpic -%]
 [%- END -%]
 
-<div id='account-links-text' data-reveal>
+<div id='account-links-text' role="navigation" aria-label="[% 'sitescheme.navigation.accountlinks' | ml %]" data-reveal>
 [%- IF dw_scheme.show_logout_button -%]
 <div class='row'><div class='columns'>
 <form action='[% site.root %]/logout?ret=1' method='post'>
@@ -134,7 +134,7 @@ the table based way can be removed when the entire site is Foundation-based.
 [%- ELSE -%]
     [%- chal = dw_scheme.challenge_generate(300) -%]
     <div class="row" id='account-links'>
-    <div class="columns show-for-medium-up small-12" role="navigation">
+    <div class="columns show-for-medium-up small-12" role="navigation" aria-label="[% 'sitescheme.navigation.accountlinks' | ml %]">
     <a href="/login" class="button radius" data-reveal-id="nav-login-form">Log In</a>
     <div id='nav-login-form' class="reveal-modal" data-reveal>
       <div class="row"><div class="columns">
@@ -167,7 +167,7 @@ the table based way can be removed when the entire site is Foundation-based.
     </div>
 [%- END -%]
 [%- ELSE -%]
-<div id="account-links" role="navigation">
+<div id="account-links" role="navigation" aria-label="[% 'sitescheme.navigation.accountlinks' | ml %]">
 [%- IF remote -%]
     [%- IF ! account_link_options.no_userpic -%]
         [%- PROCESS block.userpic -%]
@@ -239,7 +239,7 @@ the table based way can be removed when the entire site is Foundation-based.
     [% content %]
     </div>
     [% PROCESS block.accountlinks %]
-    <nav role="navigation">
+    <nav role="navigation" aria-label="[% 'sitescheme.navigation.sitelinks' | ml %]">
         [% PROCESS block.menunav %]
     </nav>
     <div id="header-search" role="search">
@@ -287,7 +287,7 @@ the table based way can be removed when the entire site is Foundation-based.
 
             [% PROCESS block.accountlinks %]
 
-            <nav role="navigation"  class="main-nav top-bar contain-to-grid" data-topbar>
+            <nav role="navigation" aria-label="[% 'sitescheme.navigation.sitelinks' | ml %]" class="main-nav top-bar contain-to-grid" data-topbar>
 
                 <ul class="title-area">
                 <li class="name"></li>