Issue #3262904 by jannakha, VladimirAus: Make menus accessible

templates/navigation/menu--main.html.twig

@@ -50,23 +50,26 @@ We call a macro which calls itself to render the full tree.
   ]
   %}
   {%
-    set link_class = [
-    'nav-item',
-    'nav-link',
+  set link_classes = [
+    menu_level == 0 ? 'nav-link' : 'dropdown-item',
     item.in_active_trail ? 'active',
     menu_level == 0 and (item.is_expanded or item.is_collapsed) ? 'dropdown-toggle',
   ]
   %}
-  {%
-    set toggle_class = [
-  ]
-  %}
   <li{{item.attributes.addClass(list_item_classes)}}>
+  {% set link_attrs = { 'class': link_classes } %}
+  {% if menu_level == 0 and item.below %}
+    {% set link_attrs = link_attrs|merge({'data-toggle' : 'dropdown', 'title': ('Expand menu' | t) ~ ' ' ~ item.title, 'aria-haspopup' : 'true', 'aria-expanded' : 'false' }) %}
+  {% endif %}
+  {% if item.in_active_trail %}
+    {% set link_attrs = link_attrs|merge({ 'aria-current': 'page' }) %}
+  {% endif %}
+
   {% if menu_level == 0 and item.below %}
-      {{ link(item.title, item.url, { 'class': link_class, 'data-toggle' : 'dropdown', 'title': ('Expand menu' | t) ~ ' ' ~ item.title }) }}
+    {{ link(item.title, item.url, link_attrs) }}
     {{ menus.build_menu(item.below, attributes, menu_level + 1) }}
   {% else %}
-      {{ link(item.title, item.url, { 'class': link_class }) }}
+    {{ link(item.title, item.url, link_attrs) }}
   {% endif %}
   </li>
 {% endmacro %}

templates/navigation/menu.html.twig

@@ -32,19 +32,23 @@
     {% if menu_level == 0 %}
       <ul{{ attributes.addClass(['nav navbar-nav']) }}>
     {% else %}
-      <ul>
+      <ul class="list-unstyled ml-3">
     {% endif %}
     {% for item in items %}
       {%
-        set classes_link = [
+        set link_classes = [
           'nav-link',
-          item.is_expanded ? 'dropdown-toggle',
-          item.is_collapsed ? 'dropdown-toggle',
           item.in_active_trail ? 'active',
         ]
       %}
+
+      {% set link_attrs = { 'class': link_classes} %}
+      {% if item.in_active_trail %}
+      {% set link_attrs = link_attrs|merge({ 'aria-current': 'page' }) %}
+      {% endif %}
+
       <li{{ item.attributes.addClass('nav-item') }}>
-        {{ link(item.title, item.url, { 'class': classes_link }) }}
+        {{ link(item.title, item.url, link_attrs) }}
         {% if item.below %}
           {{ menus.menu_links(item.below, attributes, menu_level + 1) }}
         {% endif %}