Make admin menu collapsible (#17073)

* Make admin menu collapsible

* updates expected UI files

* improve/fix menu ui tests

* update submodule

* updates expected UI files

23 files changed, 62 insertions, 40 deletions

diff --git a/plugins/CoreHome/javascripts/corehome.js b/plugins/CoreHome/javascripts/corehome.js
index 90e74d7de4..8ff2e36a85 100644
--- a/plugins/CoreHome/javascripts/corehome.js
+++ b/plugins/CoreHome/javascripts/corehome.js
@@ -90,6 +90,8 @@ $( document ).ready(function() {
         edge: 'right'
     });
 
+    $('.navbar.collapsible').collapsible();
+
     $('select').material_select();
 
     piwikHelper.registerShortcut('?', _pk_translate('CoreHome_ShortcutHelp') , function (event) {
diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less
index 67967f20ca..626f7ebabf 100644
--- a/plugins/CoreHome/stylesheets/layout.less
+++ b/plugins/CoreHome/stylesheets/layout.less
@@ -327,6 +327,21 @@ nav {
         content: "\e63b";
       }
     }
+
+    .collapsible {
+      margin: 0;
+      border: 0;
+    }
+
+    .collapsible-header {
+      border-bottom: 0;
+      cursor: pointer!important;
+    }
+
+    .collapsible-body {
+      border-bottom: 0;
+      padding: 0;
+    }
   }
 }
 
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 %}
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
-Subproject b376d8f950a497410eb2c4ac3ad94d21c4a8e08
+Subproject efec21e9f55a285e93a79c2d2044b8db3ce4b93
diff --git a/plugins/CustomVariables b/plugins/CustomVariables
-Subproject 4b93427ec12b1172c6585533d6f03528e152fbc
+Subproject eae0b21cb3ef6ea4ce1c5f70466daef6d8dca5d
diff --git a/plugins/LogViewer b/plugins/LogViewer
-Subproject f9f5fed1e37939ccb9880f074406f6d487068f2
+Subproject 00c4b77969b323aac1a5ed2e80533c851a1d683
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png
index 2fdef7804e..72ff2004c8 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_noentries.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c30a56aaae4a21983a6dfc85e1c0a262ec07dd03ce517c6901c3d217aa05c2db
-size 90243
+oid sha256:a144c6e43a86a9286defe3dfc1798408d85f51472f136983e42afe86edb1ec79
+size 49830
diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png
index 00efad964b..449e5c19b9 100644
--- a/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png
+++ b/plugins/Login/tests/UI/expected-screenshots/Login_bruteforcelog_withentries.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bea984631435dc33f453d9f99174172652e330f88e6d5f05367f604c81996a44
-size 107958
+oid sha256:a731f0f05758fcd67663059bc5d4acf6677483501c1ad4d8e88703d12911c9d1
+size 67431
diff --git a/plugins/Morpheus/templates/admin.twig b/plugins/Morpheus/templates/admin.twig
index a7fb887dc5..26adf951ff 100644
--- a/plugins/Morpheus/templates/admin.twig
+++ b/plugins/Morpheus/templates/admin.twig
@@ -34,7 +34,7 @@
 
         {% if showMenu is not defined or showMenu %}
             {% import '@CoreHome/_menu.twig' as menu %}
-            {{ menu.menu(adminMenu, false, 'Menu--admin', currentModule, currentAction) }}
+            {{ menu.menu(adminMenu, false, 'Menu--admin', currentModule, currentAction, hasSomeAdminAccess) }}
         {% endif %}
 
 
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_consent_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_consent_default.png
index 7efe11492f..1d1cf6da45 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_consent_default.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_consent_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b5f9ace6bd01b341c16e4a7b9f61d6ed7766bb26b7664e2ae4c66e7b2b3f31d
-size 76568
+oid sha256:61a60977fc9665df67f735a4995a49e0ddc6df7dbbff7636144b5e3fb79883d8
+size 76793
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_overview.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_overview.png
index d983f413a0..6110c9b4ec 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_overview.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_overview.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:140b8a900620d40721a8988e974ada2ce7d2b5c610bd80a81e09b628ae91b6db
-size 244201
+oid sha256:3ad3973d6b6c4bc66171455bc66a6ef98a8857561071e9f34c36235f328417ec
+size 244393
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_overview_no_retention.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_overview_no_retention.png
index 518d998263..f4d5aa22bb 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_overview_no_retention.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_overview_no_retention.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f47dc98b5510b79a29cd1103cd47bf7eb0391ecd624c799be5cd1a6e01ef91b
-size 241441
+oid sha256:eae70f92c4c7bf29fc93eb5d6bdd2df1ad427dadfabd3beb23dda222e7b4c3f4
+size 241630
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png
index da7af17b3f..8a01ce40eb 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11f9098ab032aedf4b7f8bf9d2e574585e27e7e840e655d1e13878b0f900a45d
-size 62588
+oid sha256:b05186a554001b0ac13caf51778acb72565b2955478f20e2486481d47ed2ca0a
+size 62774
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png
index db52d9cef1..6e8392eecb 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30431ac84b6e0e142ac42c68d6c04ba4be1b341eb163ae507ad842ecd95f6c37
-size 580871
+oid sha256:a8931e34b2f9c591e7b293a0fd1c3078bdbd3d081d1cb6e119b024a71fc96ddf
+size 581083
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png
index 5e355047bf..6216e88f41 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_cancelled_verified_no_data_deleted.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33d307e401915562c26f4acda565b5aef98a618a0798cee18ba5e8d4ea0561e1
-size 574762
+oid sha256:323b04402124efac3c47a76fb178d05a2989ffdf3fceb7d780096160720feb84
+size 574962
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png
index 6689daa40b..788f1fce8d 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:096a6667641694a089b6f97d7d4e86c8bce208b5286eb48a12a9a13fa7b966c4
-size 129434
+oid sha256:86f7d76734614cd895bed0e973bb469a50d936c704260f94b328e5055a061d43
+size 129652
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png
index a73ded7f64..a5c0c71d0f 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_enrich_segment_by_ip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f342c1379fa7586e416b7592dc55f6b55cc9910844effe8307300d4b4e14657f
-size 581241
+oid sha256:42452acb7ad8a17c73f51eb3b7d49bbd33f1366d546faab54ee2373f25a870db
+size 581465
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png
index 06c0c12808..bd47680816 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_no_visits_found.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ddcb3e4508756d5a21f9c421543882cc2b903bbd7c65a71164a9559832b3bb6
-size 68329
+oid sha256:148476ea54401b0a3ba9a6e2eb3a8c27d912f029fd44dc33813fc35dce151e55
+size 68531
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png
index db52d9cef1..6e8392eecb 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_uncheck_one_visit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30431ac84b6e0e142ac42c68d6c04ba4be1b341eb163ae507ad842ecd95f6c37
-size 580871
+oid sha256:a8931e34b2f9c591e7b293a0fd1c3078bdbd3d081d1cb6e119b024a71fc96ddf
+size 581083
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png
index f95f15e480..dcda22afde 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_found.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76738c720894be7a49f4016ca7e6fe96e2bcb5c8e456aa1fe049929fa4269dbc
-size 575114
+oid sha256:03fb293c3e477a3e51c966aa5d9a401e95c124b531b1398bc5336a75a0a06467
+size 575315
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png
index ae71c0b0c2..c04fc1e707 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_privacy_settings_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9328de47fe06bb50ffa0e433d6df9bb237a6460c82286041f8efd166f9b05df
-size 545035
+oid sha256:7e2a05a2210124164554166a5a381cb1cb4cea7889c2e6efae56c24602302f0f
+size 545190
diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png
index 6abca7dbcf..89a9410ba8 100644
--- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png
+++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_users_opt_out_default.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14ae07033c8f9b195caa2bd72929ecfc92a099592ba95ea080f6dda6a7fa0077
-size 154164
+oid sha256:20306dce97d09ad756083c0cf55d53b02ea44023f68c7a3fad8dddc151c9b499
+size 154394
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png
index bd1c7bf213..047c3d5a2b 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_signup_success.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc867d9b7bbb7d5965817c6b2f617cdb9553bc0a5acd0ce71689ae357450c746
-size 190594
+oid sha256:949eee52f63dc4ab0e99a0396210f503b5e7428b2160a1dc6d064a144ce895e4
+size 190696