diff options
46 files changed, 116 insertions, 82 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 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png index 65a1ad89b9..8c6c669fbc 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fa82a3639fb75e1e1fcdaec8b6c1892122dd5e59153246ec54ecbab32f2bb8ee -size 9835 +oid sha256:e5db1b3299d553b510eddf88bc01ac1023c06f462efc5840d1d12ceb117c2506 +size 9832 diff --git a/tests/UI/expected-screenshots/Menus_admin_changed.png b/tests/UI/expected-screenshots/Menus_admin_changed.png index 3c5fed55d7..a0b897583f 100644 --- a/tests/UI/expected-screenshots/Menus_admin_changed.png +++ b/tests/UI/expected-screenshots/Menus_admin_changed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59b7f618ddfa675ac6f7015e3a9e80126e174d0761ad874dc89725f36c943a22 -size 59289 +oid sha256:3d4d0dc1a9fae3c3578a90eaa20cc4f9a779a97bb1a26b071221f255b4365ecd +size 16856 diff --git a/tests/UI/expected-screenshots/Menus_admin_loaded.png b/tests/UI/expected-screenshots/Menus_admin_loaded.png index 6ef69198b9..13b0c6635d 100644 --- a/tests/UI/expected-screenshots/Menus_admin_loaded.png +++ b/tests/UI/expected-screenshots/Menus_admin_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7c9df46e7a2ac1a4792ab4f12ba06ec42dc8e1d67f97beeee7f63f38ca506f7 -size 59317 +oid sha256:99d83435f81a0d63949e62f88426b529ed4f54ef71eef5accb69ea1b93ac7232 +size 17009 diff --git a/tests/UI/expected-screenshots/Menus_admin_websites.png b/tests/UI/expected-screenshots/Menus_admin_websites.png new file mode 100644 index 0000000000..5887e0b19d --- /dev/null +++ b/tests/UI/expected-screenshots/Menus_admin_websites.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04fa17259b5fee97a4518270a37916176c0d309be87020df3dca4c90a343aac0 +size 16854 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 1d15c53531..e9d32bdf61 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e855f4370102ab6fe3c510b58f97911312d2d528077f6ddf56bf8d481d9e8e9 -size 4617420 +oid sha256:34e381cc6fb38ebe63cd2f077782eaa6199d7ce02f13105aa55d9beeb3c2c79b +size 4618223 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png index 723ed9c1ef..db020354ac 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d44615400b4ea2d5899779a2d981efcb44470545e214353986b4cc185252a24 -size 158906 +oid sha256:2fd7d0661167c97e7a2d34606aa86a43c513c9832160c50d28263f4e01886adc +size 159010 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png index c8940f4e67..22764853fb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_tracking_code.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73114b34c9a35a6c99c8d9962cdb863b7378c8b43b0b81ddfda94ad5cd14943b -size 442648 +oid sha256:6834f27568c174f646599f3fc9e38d82a695e9ade9c9e6d1509bac188b9ee592 +size 442940 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png index 0ca50045b3..19672aff7f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ba1fa621d383b086213ab1e0594baf9a203291175344526aa3b5a27d06f626f -size 203643 +oid sha256:d22be9c7e58626f8b31bec4f0b34a084ec2341dd164a69fdd91b963ff3c0f2ec +size 203733 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png index 49fd415897..f4100cc360 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51248a0424c5e36335d36274c7f8569dc2d627fece4c689e8fb2fbbd8f2ceb62 -size 1067191 +oid sha256:2107e0051c523ffd1be1b2f5aac35e9306713e1177a4436d3477e4e9789b6cd6 +size 1067380 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png index c81dc9e4c5..0cb6c0cbd7 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c402f9b50e7ed1d29e0ee290e9d6f47b776701649984573519cabd15c37b96c -size 1069721 +oid sha256:225bdcd5bf2cd2a58ef83275b6db7d32e1e9e7b9aac4218db45da1b12d2c4108 +size 1069870 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index 48fd68629b..3f2be35d00 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fb3cf9625aca5189dab9f42d29f9490b70765a5317517bf9db514e3eeab9cd5 -size 1106149 +oid sha256:90a7ad14be5467b6c040dbb0f593a3ec91aa2b63c30749459ec28f984b5ae17d +size 1106238 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png index bc846eb275..feb1c97bcc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0020402d2283f1867577162559e87594a20398f153ef859200768c6d0f744eb9 -size 147279 +oid sha256:dda77295620e3f3d063cdbae1a616eb361d7ba33339dba70a981767697e4c7c0 +size 147389 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png index b60b2c6572..3c4a8688d6 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_mobilemessaging_provider.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42bcc207cec4fcdda7e4cc03f0deb23bab433c23b77f3df311b414112f2ef882 -size 120084 +oid sha256:0f90c81de61a11dc755c1ec572feece95cf5cec7f4dc67b7bf2e17c2a4a81802 +size 120238 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png index fae1adeac8..dce7df2e28 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_themes.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:840c3fbca67d466ec8079b402da4ef5f7f74286fc8e6978e5a09248d6196d068 -size 79078 +oid sha256:d5a24ea81cfb5b301cc60dc88ba8b640beb5f163317918164d1bb7a356c88121 +size 79192 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png index e1e0be8145..e8a06615e6 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_visitor_generator.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:775b506a1184f8e6399d4310fe48510c9b63466deda4efae76f2bc3bf1bf05bb -size 84924 +oid sha256:59f1fec2b3363f78ccd7b2d69f1d73beba93928921de12f7a96a735dd896c2f4 +size 85070 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png index 723ed9c1ef..db020354ac 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d44615400b4ea2d5899779a2d981efcb44470545e214353986b4cc185252a24 -size 158906 +oid sha256:2fd7d0661167c97e7a2d34606aa86a43c513c9832160c50d28263f4e01886adc +size 159010 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png index 06f5b0d6e3..243a093340 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b13abc0e4ad9301bf72b83d5d9842ad6d98e954c680f1dedcf395b56b69c997 -size 4978469 +oid sha256:8294588b41f37f3ce2abe92ebbf94b1b304bf50975c623218d5be665f0af3050 +size 4978725 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png index 187ef099ce..f7e0216c4d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b114fb25ab99afcc5c24592d092b3a9a43382a5231d58c3094184c93582b008 -size 95864 +oid sha256:7e8ea75d84f2291d0e2f44fb3a31c385f151b5d8c20edf6e767994efabb88c4c +size 96022 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png index c4d66f7e95..2b7aad509c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:905850e54c3a3ace16cf914e10b0ef23aa6219c042b3e0dbdc0e81d07fc80bad -size 475553 +oid sha256:3d1263a789717dca414cc0ee15d172919ba479daf4483e792b49dc07adacefa3 +size 475734 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png b/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png index 40453c2b8e..3c8a7d6181 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_glossary.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65be736a09dabcb0956ffa92e154a9b73e6748545f5ef30614ff18eba2a5336c -size 604316 +oid sha256:e93b71cde146772dae327214cd08350aa0c7f86cb6377d1aa10b580381fbd994 +size 604468 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png b/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png index 7b10f030ad..6b90a55b2f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_notifications.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe35485392dd6b3075533e3a3256e3a8e955b7e51f78d89abdf071de75aa1699 -size 46987 +oid sha256:c23f486e25afaabf72adbed8ce90fe878500ff243301add38b737776a2d435cc +size 47075 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png index 70f755f83e..78f1375373 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgets_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fd50c1507737a2a250a84f522fbf223d87300eeb2137cfc8f3d9a9ba83dea75 -size 189818 +oid sha256:528f8ed421af3afd5d06d995a66b96d3928a05e4757bd1db64c130715ce6857d +size 190087 diff --git a/tests/UI/specs/Menus_spec.js b/tests/UI/specs/Menus_spec.js index 56f5fffbb1..d40011cbcd 100644 --- a/tests/UI/specs/Menus_spec.js +++ b/tests/UI/specs/Menus_spec.js @@ -50,6 +50,15 @@ describe("Menus", function () { expect(await element.screenshot()).to.matchImage('admin_loaded'); }); + it('should toggle the submenu visibility when main item is clicked', async function() { + await openMenuItem(page, 'Website'); + await page.mouse.move(0, 0); + await page.waitFor(500); // wait for animation + + const element = await page.jQuery('#secondNavBar'); + expect(await element.screenshot()).to.matchImage('admin_websites'); + }); + it('should change the admin page correctly when an admin menu item is clicked', async function() { await openMenuItem(page, 'Manage'); await page.waitForNetworkIdle(); |
