From 5934d5eb4407d576350ff4c8735296e843a9db0d Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@matomo.org>
Date: Tue, 12 Jan 2021 12:13:40 +0100
Subject: Make admin menu collapsible (#17073)

* Make admin menu collapsible

* updates expected UI files

* improve/fix menu ui tests

* update submodule

* updates expected UI files
---
 plugins/CoreHome/templates/_menu.twig | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'plugins/CoreHome/templates')

diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig
index 5aee9e8456..4e9129881a 100644
--- a/plugins/CoreHome/templates/_menu.twig
+++ b/plugins/CoreHome/templates/_menu.twig
@@ -1,9 +1,10 @@
-{% macro menu(menu, anchorlink, cssClass, currentModule, currentAction) %}
+{% macro menu(menu, anchorlink, cssClass, currentModule, currentAction, collapsible) %}
     <div id="secondNavBar" class="{{ cssClass }} z-depth-1">
-        <ul class="navbar hide-on-med-and-down" aria-label="{{ 'CoreHome_MainNavigation'|translate|e('html_attr') }}" role="menu">
+        <ul class="navbar {% if collapsible %}collapsible collapsible-accordion{% endif %} hide-on-med-and-down" aria-label="{{ 'CoreHome_MainNavigation'|translate|e('html_attr') }}" role="menu">
             {% for level1,level2 in menu %}
 
                 {% set hasSubmenuItem = false %}
+                {% set hasActive = false %}
                 {% for name,urlParameters in level2 %}
                     {% if name|slice(0,1) != '_' %}
                         {% set hasSubmenuItem = true %}
@@ -11,18 +12,19 @@
                 {% endfor %}
 
                 {% if hasSubmenuItem %}
-                    <li class="menuTab" role="menuitem">
-
-                        <a class="item" tabindex="5">
+                    {% set subMenu %}
+                        <a class="item {% if collapsible %}collapsible-header{% endif %}" tabindex="5">
                             <span class="menu-icon {{ level2._icon|default('icon-arrow-right') }}"></span>{{ level1|translate }}
                             <span class="hidden">
                              {{ 'CoreHome_Menu'|translate }}
                            </span>
                         </a>
-                        <ul role="menu">
+                        <ul role="menu" {% if collapsible %}class="collapsible-body"{% endif %}>
                             {% for name,urlParameters in level2 %}
                                 {% if name|slice(0,1) != '_' %}
-                                    <li {% if urlParameters._url.module is defined and urlParameters._url.module == currentModule and urlParameters._url.action is defined and urlParameters._url.action == currentAction %}class="active"{% endif %}
+                                    {% set isActive = urlParameters._url.module is defined and urlParameters._url.module == currentModule and urlParameters._url.action is defined and urlParameters._url.action == currentAction %}
+                                    {% set hasActive = hasActive or isActive %}
+                                    <li {% if isActive %}class="active"{% endif %}
                                         role="menuitem"
                                     >
                                         <a class="item" tabindex="5" target="_self"
@@ -40,6 +42,9 @@
                                 {% endif %}
                             {% endfor %}
                         </ul>
+                    {% endset %}
+                    <li class="menuTab {% if hasActive %}active{% endif %}" role="menuitem">
+                        {{ subMenu }}
                     </li>
                 {% endif %}
             {% endfor %}
-- 
cgit v1.2.3