Merge pull request #9149 from RegioneER/i91482.15.1-b1

Adding role menu and menuitem to navigation menu trees and leafs

1 files changed, 6 insertions, 9 deletions

diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig
index 4086367d2a..4c4643723d 100644
--- a/plugins/CoreHome/templates/_menu.twig
+++ b/plugins/CoreHome/templates/_menu.twig
@@ -1,6 +1,6 @@
 {% macro submenuItem(name, url, anchorlink) %}
     {% if name|slice(0,1) != '_' %}
-        <li>
+        <li role="menuitem" title="{{ name|translate|e('html_attr') }}">
             <a class="item" href="{% if anchorlink %}#{% else %}index.php?{% endif %}{{ url|urlRewriteWithParameters|slice(1) }}">
                 {{ name|translate }}
             </a>
@@ -9,7 +9,7 @@
 {% endmacro %}
 
 {% macro groupedItem(name, group, anchorlink) %}
-    <li>
+    <li role="menuitem" title="{{ name|translate|e('html_attr') }}">
         <div piwik-menudropdown show-search="true" menu-title="{{ name|translate|e('html_attr') }}">
             {% for item in group.getItems %}
                 <a class="item menuItem"
@@ -33,7 +33,7 @@
         <div id="search" ng-cloak>
             <div piwik-quick-access class="borderedControl"></div>
         </div>
-        <ul class="navbar">
+        <ul role="menu" class="navbar">
             {% for level1,level2 in menu %}
                 {% set hasSubmenuItem = false %}
                 {% for name,urlParameters in level2 %}
@@ -45,15 +45,12 @@
                 {% endfor %}
 
                 {% if hasSubmenuItem %}
-                    <li id="{% if level2._url is defined and level2._url is not empty %}{{ _self.getId(level2._url) }}{% endif %}" class="menuTab">
-
+                    <li role="menuitem" class="menuTab" title="{{ level1|translate|e('html_attr') }}" id="{% if level2._url is defined and level2._url is not empty %}{{ _self.getId(level2._url) }}{% endif %}">
                         <a class="item" href="">
                             <span class="menu-icon {{ level2._icon|default('icon-arrow-right') }}"></span>{{ level1|translate }}
-                            <span class="hidden">
-                             {{ 'CoreHome_Menu'|translate }}
-                           </span>
                         </a>
-                        <ul>
+
+                        <ul role="menu" title="{{ level1|translate|e('html_attr') }}">
                             {% for name,urlParameters in level2 %}
                                 {% if urlParameters._url is defined and urlParameters._url is not iterable %}
                                     {{ _self.groupedItem(name,urlParameters._url, anchorlink) }}