ISTWCMS-4199: updating menu structure to allow for parenting to be displayed correctly

source/_patterns/04-components/menu/menu.twig

@@ -4,6 +4,7 @@
 
 {% macro menu_links(items, attributes, menu_level, menu_name, menu_class, item_class, link_class, parent) %}
   {% import _self as menus %}
+
   {% if items %}
 
     {% if menu_level == 0 %}
@@ -89,7 +90,7 @@
 
 
 
-      {% if menu_level == 1 and parent and not menu_parent_hide  %}
+      {% if menu_level == 1 and parent %}
 
         <li {{ add_attributes(additional_item_attributes) }}>
 
@@ -103,18 +104,22 @@
             </span>
           </a>
         </li>
-        {% endif %}
-
-      <li {{ add_attributes(additional_item_attributes) }}>
 
+      {% endif %}
 
+      <li {{ add_attributes(additional_item_attributes) }}>
         <a
-          {% if item.submenu %}
+          {% if item.submenu and menu_level == 0 %}
+            tabindex="0"
+            aria-haspopup="true"
+            role="button"
+          {% elseif item.submenu %}
             tabindex="0"
             aria-haspopup="true"
             role="button"
+            href="{{ item.url }}"
           {% else %}
-           href="{{ item.url }}"
+            href="{{ item.url }}"
           {% endif %}
           {{ add_attributes(link_attributes) }}
         >