From a4e2d645715f64ab71ee0bdfc68d4cafb26e1151 Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Wed, 16 Nov 2016 16:52:03 +0000
Subject: [PATCH] MDL-56943 boost: correct ARIA roles

* role="navigation" can't go directly on a list
* role="banner" should only be done once and not on a link
---
 theme/boost/templates/core/navbar.mustache | 22 ++++++++++++----------
 theme/boost/templates/header.mustache      |  2 +-
 theme/boost/templates/secure.mustache      |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/theme/boost/templates/core/navbar.mustache b/theme/boost/templates/core/navbar.mustache
index c91bb97689a..0f2c1579438 100644
--- a/theme/boost/templates/core/navbar.mustache
+++ b/theme/boost/templates/core/navbar.mustache
@@ -58,13 +58,15 @@
         ]
     }
 }}
-<ol class="breadcrumb" role="navigation">
-    {{#get_items}}
-        {{#has_action}}
-            <li class="breadcrumb-item"><a href="{{{action}}}" {{#get_title}}title="{{get_title}}"{{/get_title}}>{{{text}}}</a></li>
-        {{/has_action}}
-        {{^has_action}}
-            <li class="breadcrumb-item">{{{text}}}</li>
-        {{/has_action}}
-    {{/get_items}}
-</ol>
+<nav role="navigation">
+    <ol class="breadcrumb">
+        {{#get_items}}
+            {{#has_action}}
+                <li class="breadcrumb-item"><a href="{{{action}}}" {{#get_title}}title="{{get_title}}"{{/get_title}}>{{{text}}}</a></li>
+            {{/has_action}}
+            {{^has_action}}
+                <li class="breadcrumb-item">{{{text}}}</li>
+            {{/has_action}}
+        {{/get_items}}
+    </ol>
+</nav>
diff --git a/theme/boost/templates/header.mustache b/theme/boost/templates/header.mustache
index e881acb6578..bda544c4a1f 100644
--- a/theme/boost/templates/header.mustache
+++ b/theme/boost/templates/header.mustache
@@ -25,7 +25,7 @@
         <button aria-expanded="{{#navdraweropen}}true{{/navdraweropen}}{{^navdraweropen}}false{{/navdraweropen}}" aria-controls="nav-drawer" type="button" class="btn pull-xs-left m-r-1 btn-secondary" data-action="toggle-drawer" data-side="left" data-preference="drawer-open-nav">&#9776;<span class="sr-only">{{#str}}expand, core{{/str}}</span></button>
         </div>
 
-        <a role="banner" href="{{{ config.wwwroot }}}" class="navbar-brand {{# output.should_display_navbar_logo }}has-logo{{/ output.should_display_navbar_logo }}
+        <a href="{{{ config.wwwroot }}}" class="navbar-brand {{# output.should_display_navbar_logo }}has-logo{{/ output.should_display_navbar_logo }}
             {{^ output.should_display_navbar_logo }}
                 hidden-sm-down
             {{/ output.should_display_navbar_logo }}
diff --git a/theme/boost/templates/secure.mustache b/theme/boost/templates/secure.mustache
index b75d798233a..03cc9bdb108 100644
--- a/theme/boost/templates/secure.mustache
+++ b/theme/boost/templates/secure.mustache
@@ -47,13 +47,13 @@
 
 {{{ output.standard_top_of_body_html }}}
 
-<header class="navbar navbar-full navbar-light bg-faded navbar-static-top moodle-has-zindex">
+<header class="navbar navbar-full navbar-light bg-faded navbar-static-top moodle-has-zindex" role="banner">
     <div class="container">
         <div class="clearfix">
             <button class="navbar-toggler pull-xs-right hidden-sm-up" data-toggle="collapse" data-target="#bd-main-mav">☰<span class="sr-only">{{#str}}expand{{/str}}</span></button>
         </div>
 
-        <a role="banner" href="{{{ config.wwwroot }}}" class="navbar-brand">
+        <a href="{{{ config.wwwroot }}}" class="navbar-brand">
             {{# output.should_display_navbar_logo }}
                 <div class="logo">
                     <img src="{{output.get_compact_logo_url}}" alt={{#quote}}{{sitename}}{{/quote}}>