diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2020-06-08 02:46:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 02:46:56 +0300 |
| commit | d0aaab95f1ef6d8b748b0e8d54f811a366864249 (patch) | |
| tree | 86820438b4b56c764912316ebe8152362aa3e2dd /plugins | |
| parent | d10c4e89dc5d1081a3755497c45d366b470eeec7 (diff) | |
Switch from bower to npm and update JS libraries (#14082)
* Starting to replace bower with npm: use updated jquery-ui from npm.
* Use jquery from npm./
* Use angular from npm.
* Add more angular libraries.
* Use chroma-js from npm.
* Remove html5shiv, does not appear to be used.
* Use iframe resizer library from npm.
* Add jquery-mousewheel
* Add jquery.dotdotdot from npm.
* Get jquery.scrollto from npm.
* Get jscrollpane from npm.
* Get materialize-css from npm.
* Get mousetrap from npm.
* Remove ngDialog, as it is no longer used.
* Install qrcode.js from npm.
* Get sprintf-js from npm.
* Get visibillityjs from npm.
* Remove bower.json.
* Getting parts of matomo to work w/ new versions of libraries installed by npm.
* Ignore node_modules subfolders in node_modules since we only use npm for frontend dependencies + fix a test.
* Fix button padding.
* Fix series picker checkboxes.
* Fix karma conf.
* Fix CSS in right place.
* Fixing more css/less issues.
* More test fixes.
* Limit selection style fix.
* Fix more tests + materializecss issues.
* Fix a couple more tests.
* Fix annotation styling.
* remove error
* add ng-dialog files
* try to fix some tests
* Fix several UI tests.
* fixing more build issues
* Fix several more tests and issues.
* fixing more tests
* split ui tests into 3 groups
* fix several more issues and tests
* Fix some console warnings on chrome.
* Updating more test files.
* fix some tests
* yet more fixes
* couple more fixes
* another form fix
* Fix some tests.
* update screenshot
* update more expected files
* Fix two more form issues.
* test commit (travis is not fetching submodules for some reason...)
* remove scripts removed in merge
* three travis builds
* split UIIntegrationTest into multiple suites
* lets try this again
* updae several expected screenshots
* fix some more tests
* fix plugin details material select and tabs initiaialization
* update screenshots + css fix
* re-initialize materialize tabs since we load jquery-ui afterwards for datepicker which unsets materialize tabs
* update more screenshots and fix couple more issues
* update more screenshots + tweak to test
* more fixes and screenshot updates
* fix some issues and update more screenshots
* update submodules
* more fixes + more updated screenshots
* more css fixes and test fixes
* couple fixes & updated screenshots
* update screenshots
* fix random failure
* Map old bower_component files to new ones in AssetManager.
* Remove node_modules from PR and ignore node_modules in .gitignore and remove libs/jquery (adding new required libs).
* Update .travis.yml.
* update screenshots
* fixing some more issues
* fix copy pasta
* update screenshots
* fix more modal issues
* Update css & screenshots.
* correct close modal calls
* fixing more issues
* data-target instead of data-activates
* fix more tests
* trigger build that works?
* fix more tests
* update submodule
* debugging travis
* more debugging
* try to fix test
* fix modal no button click in test
* update more screenshots
* couple more test fixes
* some more fixes and updated screenshots
* update screenshots
* apply some review feedback
* Fix modal centering and initial top position.
* apply some more pr feedback
* another pr fix
* update submodule
* remove style
* fix color of checkbox mark
* Fix centering the popover
Note: centering the popover relative to body doesn't work poperly anymore, maybe because of the fixed position of the widget overlay. Using the ui-widget-overlay to position the dialog centered seems to work
* ignore line endings check for node modules
* updates expected UI files
* submodule updates
* use minified file of jquery.browser.js
* updates expected test files
* ensure to hide parent tooltips when row action tooltips are shown
* tweak less for datatable navigation
* style is only useful for dashboard
* update some screenshots
* update submodules
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins')
392 files changed, 1189 insertions, 1127 deletions
diff --git a/plugins/Actions/tests/UI/ActionsDataTable_spec.js b/plugins/Actions/tests/UI/ActionsDataTable_spec.js index bc4386281d..97d54c5a27 100644 --- a/plugins/Actions/tests/UI/ActionsDataTable_spec.js +++ b/plugins/Actions/tests/UI/ActionsDataTable_spec.js @@ -41,6 +41,7 @@ describe("ActionsDataTable", function () { await page.click('.dropdownConfigureIcon'); await page.mouse.move(-10, -10); const element = await page.$('.tableConfiguration'); + await page.waitFor(250); // rendering expect(await element.screenshot()).to.matchImage('configuration_options'); }); diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png index 6c754e41d8..c10bca3a54 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f6a68613b16f277108e9dbb619c62b7798f87c9cd3ebf4ac2d2ef991ce62cf1 -size 357737 +oid sha256:5de7b7a7a0fc1d720fcb234b608aa7a0e071fc8b9d8c504630f9808d562c30d5 +size 357699 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png index d184d5ddbf..3e49ef7c9f 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7759287c304992f1f842e66cf16b79a9d1ce8494c58827acfc5b2d0fe3533b39 -size 69427 +oid sha256:27d3f95e7b4ef8eb30bcaeb02fac72091c9e8b411b1e821f6b60ec89ea60219e +size 69377 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png index 097c9f57af..647c7e4c12 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24dd7d66d2045aa9ea8614b6be895e46cee27a8d3d331467af2a4a752ed32fc6 -size 461742 +oid sha256:ca15bf66fe5f55da4cfcc223412fd8a8960d90f989f69a87fae086e415fb5663 +size 461698 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png index 320fb20ed5..492c9000c0 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11d1c3bd15893259ff59337bade8b1e1d54db4cbc7829f08f054a0e1e1eaf964 -size 357082 +oid sha256:716859abfcc15b35c194c33b2b1105b51a7d46fe6ae31bbbca9c87ac0a25b568 +size 357043 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png index bdf602bde6..30b07fbd20 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:746378ca200921bfeb1520e6e8f92022417d6fb7ff6ec022bffc22997d72c73d -size 58816 +oid sha256:9b3b19d0ab0c55875975ed00239caebbcbd07684bde88737a21dfe882a51a1f5 +size 58768 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png index af54ed0b8e..15713f218a 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:962880a9260b646a9175fa5863d940f9622d425e77d5621610cc63ea4aa0b949 -size 70619 +oid sha256:63b4e00beb89ff63ade5bb4a64cb86abeab9da8cb659ec092f0ae881330442ae +size 70564 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png index 791e62e87d..ef573c08bb 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b189a4cf9bae52784f96e556ba78af48e756644244ffc8a1e4c65f0f62df69ac -size 50980 +oid sha256:4a9c49e14f360db921b2f984ce05723e835759487735d8009b5d87296585f4cc +size 50939 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png index 849b20b551..00089871d6 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6361d4f231068d7c50d80ad42affaea174f2b6f7147302cd7d8c20d412142e22 -size 56484 +oid sha256:4f016783248998f66b070b954c6d990b6752ce700078c4f36736ef912f57f9b3 +size 56427 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png index c80b646e0d..e3d26f3edf 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3784d05437ee1d386d6bdfd55f44cfdaa2b0a5401152e137f29570c82c64b4e -size 381976 +oid sha256:2d222e160410b7993cb97985d8efcbdccb374805b255e62ba6fdb5395946b1eb +size 377585 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png index 9eec71f9c6..5a9cc1e341 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9a57f53cc739c6d7d12430f85e84f63e8eefb8ea5d1a98551b29d05f8021447 -size 63357 +oid sha256:865bff54679f89311a48de0c73776100bc98953f654e6ed5e93f5ddd47b072ad +size 63312 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png index 791e62e87d..ef573c08bb 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b189a4cf9bae52784f96e556ba78af48e756644244ffc8a1e4c65f0f62df69ac -size 50980 +oid sha256:4a9c49e14f360db921b2f984ce05723e835759487735d8009b5d87296585f4cc +size 50939 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png index bdf602bde6..30b07fbd20 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:746378ca200921bfeb1520e6e8f92022417d6fb7ff6ec022bffc22997d72c73d -size 58816 +oid sha256:9b3b19d0ab0c55875975ed00239caebbcbd07684bde88737a21dfe882a51a1f5 +size 58768 diff --git a/plugins/Annotations/stylesheets/annotations.less b/plugins/Annotations/stylesheets/annotations.less index 74ede38ba3..ac958a811e 100644 --- a/plugins/Annotations/stylesheets/annotations.less +++ b/plugins/Annotations/stylesheets/annotations.less @@ -30,9 +30,6 @@ height: 145px; .input-field { margin-top: 2px; - .new-annotation-edit { - padding-bottom: 4px; - } } } @@ -41,11 +38,16 @@ .input-field { margin-top: 2px; - .annotation-edit { - padding-bottom: 4px; - } } } + + .input-field { + margin-bottom: 0; + input { + height: 1rem; + padding-bottom: 4px; + } + } } span.annotation { diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig index c90e99a428..77f9f3304d 100644 --- a/plugins/Annotations/templates/_annotation.twig +++ b/plugins/Annotations/templates/_annotation.twig @@ -36,7 +36,7 @@ {% if annotation.canEditOrDelete %} <div class="annotation-edit-mode" style="display:none;"> <div class="input-field"> - <input class="annotation-edit browser-default" type="text" value="{{ annotation.note|raw }}"/> + <input class="annotation-edit" type="text" value="{{ annotation.note|raw }}"/> </div> <br/> <input class="annotation-save btn" type="button" value="{{ 'General_Save'|translate }}"/> diff --git a/plugins/Annotations/templates/_annotationList.twig b/plugins/Annotations/templates/_annotationList.twig index e7f8a503e3..7e53c4ac9c 100644 --- a/plugins/Annotations/templates/_annotationList.twig +++ b/plugins/Annotations/templates/_annotationList.twig @@ -25,7 +25,7 @@ <td class="annotation-value"> <div class="input-field"> <input type="text" value="" - class="new-annotation-edit browser-default" + class="new-annotation-edit" placeholder="{{ 'Annotations_EnterAnnotationText'|translate }}"/> </div><br/> <input type="button" class="btn new-annotation-save" value="{{ 'General_Save'|translate }}"/> diff --git a/plugins/AnonymousPiwikUsageMeasurement b/plugins/AnonymousPiwikUsageMeasurement -Subproject 6a41db23db9eeb0e7d43dca7d6f6c6814f8e063 +Subproject ebda218674b7abf483cf8985a180099cb017be8 diff --git a/plugins/Bandwidth b/plugins/Bandwidth -Subproject 2e4d04472b2a0bdbf77f110a5da7aec5a2fef2e +Subproject 9ca3adb24750fc16a5b6c5cb486ab59d8070fcb diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php index a92b434445..2d5fcb9673 100644 --- a/plugins/CoreAdminHome/CoreAdminHome.php +++ b/plugins/CoreAdminHome/CoreAdminHome.php @@ -55,7 +55,7 @@ class CoreAdminHome extends \Piwik\Plugin public function getStylesheetFiles(&$stylesheets) { - $stylesheets[] = "libs/jquery/themes/base/jquery-ui.min.css"; + $stylesheets[] = "node_modules/jquery-ui-dist/jquery-ui.min.css"; $stylesheets[] = "plugins/Morpheus/stylesheets/base.less"; $stylesheets[] = "plugins/Morpheus/stylesheets/main.less"; $stylesheets[] = "plugins/CoreAdminHome/stylesheets/generalSettings.less"; @@ -64,10 +64,10 @@ class CoreAdminHome extends \Piwik\Plugin public function getJsFiles(&$jsFiles) { - $jsFiles[] = "libs/bower_components/jquery/dist/jquery.min.js"; - $jsFiles[] = "libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js"; - $jsFiles[] = "libs/jquery/jquery.browser.js"; - $jsFiles[] = "libs/bower_components/sprintf/dist/sprintf.min.js"; + $jsFiles[] = "node_modules/jquery/dist/jquery.min.js"; + $jsFiles[] = "node_modules/jquery-ui-dist/jquery-ui.min.js"; + $jsFiles[] = "node_modules/jquery.browser/dist/jquery.browser.min.js"; + $jsFiles[] = "node_modules/sprintf-js/dist/sprintf.min.js"; $jsFiles[] = "plugins/Morpheus/javascripts/piwikHelper.js"; $jsFiles[] = "plugins/Morpheus/javascripts/ajaxHelper.js"; $jsFiles[] = "plugins/CoreHome/javascripts/broadcast.js"; diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index d959492b89..d27c184f6a 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -17,23 +17,22 @@ <h3 class="col s12">{{ 'General_AllowPiwikArchivingToTriggerBrowser'|translate }}</h3> <div class="col s12 m6"> <p> - <input type="radio" value="1" id="enableBrowserTriggerArchiving1" - name="enableBrowserTriggerArchiving" {% if enableBrowserTriggerArchiving==1 %} checked="checked"{% endif %} - /> - <label for="enableBrowserTriggerArchiving1"> - {{ 'General_Yes'|translate }} + <label> + <input type="radio" value="1" id="enableBrowserTriggerArchiving1" + name="enableBrowserTriggerArchiving" {% if enableBrowserTriggerArchiving==1 %} checked="checked"{% endif %} + /> + <span>{{ 'General_Yes'|translate }}</span> <span class="form-description">{{ 'General_Default'|translate }}</span> </label> </p> <p> - <input type="radio" value="0" - id="enableBrowserTriggerArchiving2" - name="enableBrowserTriggerArchiving" - {% if enableBrowserTriggerArchiving==0 %} checked="checked"{% endif %} /> - <label for="enableBrowserTriggerArchiving2"> - {{ 'General_No'|translate }} + <input type="radio" value="0" + id="enableBrowserTriggerArchiving2" + name="enableBrowserTriggerArchiving" + {% if enableBrowserTriggerArchiving==0 %} checked="checked"{% endif %} /> + <span>{{ 'General_No'|translate }}</span> <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/docs/setup-auto-archiving/'>","</a>")|raw }}</span> </label> </p> diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png index f85fef595a..6572fd23e4 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_no_failures.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54b842fd7a71ffa84c7d5ef3912e85c2fefd33430428fc3d964410da63fdcb88 -size 24707 +oid sha256:c07d50aed2ae2caa61b554574cab3e127c6ec6483df31dc6d399fc2b3cdd1475 +size 24509 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png index 4a2c73c645..0f44eb186f 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0aeeea0ce0943a1835e7dbf764948f23c075ced716bb8ba0a84034280117702a -size 72264 +oid sha256:d48b5544ece3f513ef643a21d68d0683ce6671b02e75f68018fe3fca1f5d109e +size 72115 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_ask_confirmation.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_ask_confirmation.png index 149901d84b..326873034d 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_ask_confirmation.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_ask_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79afc61b65a622a84dcc02c2aee9f82acaf6e4c43d2d01788b837e7b26646a15 -size 7577 +oid sha256:53a01a5eeb2b09e18eac6237b35f90e6dd8f3d5abae6398776134db6c6e6dbad +size 7219 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png index f85fef595a..6572fd23e4 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_all_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54b842fd7a71ffa84c7d5ef3912e85c2fefd33430428fc3d964410da63fdcb88 -size 24707 +oid sha256:c07d50aed2ae2caa61b554574cab3e127c6ec6483df31dc6d399fc2b3cdd1475 +size 24509 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_ask_confirmation.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_ask_confirmation.png index 3dadaf2c84..69cc93de82 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_ask_confirmation.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_ask_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:475f045ae04e071a2296fc851e6913176facdcd5050f294192b4bb65f4faf5cd -size 7660 +oid sha256:746b6c81647fa04ac2ea80701b0b18db349ffb67b2be5461333f1dea6e9ce49a +size 7300 diff --git a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png index 7c3f5bf361..b855252a4b 100644 --- a/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png +++ b/plugins/CoreAdminHome/tests/UI/expected-screenshots/TrackingFailures_manage_with_failures_delete_one_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:461de4dfcd1b28ee4c4c39c0ca84d9c10b22f3830d48c42e20e8526977402333 -size 46674 +oid sha256:fc8775d82cda2eb4fcc4d0bf4d404e367f2336ce41c03128894823746fc6a71f +size 46526 diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt index 3395a14b9c..ac3966a0b3 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -9,3 +9,91 @@ If you cannot use the console because it requires CLI try 'php archive.php --url=http://your.piwik/path' ------------------------------------------------------- + +INFO [2020-06-04 14:00:11] 10320 --------------------------- +INFO [2020-06-04 14:00:11] 10320 INIT +INFO [2020-06-04 14:00:11] 10320 Running Matomo 4.0.0-b2 as Super User +INFO [2020-06-04 14:00:11] 10320 --------------------------- +INFO [2020-06-04 14:00:11] 10320 NOTES +INFO [2020-06-04 14:00:11] 10320 - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Matomo UI > Settings > General Settings. +INFO [2020-06-04 14:00:11] 10320 See the doc at: https://matomo.org/docs/setup-auto-archiving/ +INFO [2020-06-04 14:00:11] 10320 - Async process archiving supported, using CliMulti. +INFO [2020-06-04 14:00:11] 10320 - Reports for today will be processed at most every 900 seconds. You can change this value in Matomo UI > Settings > General Settings. +INFO [2020-06-04 14:00:11] 10320 --------------------------- +INFO [2020-06-04 14:00:11] 10320 START +INFO [2020-06-04 14:00:11] 10320 Starting Matomo reports archiving... +INFO [2020-06-04 14:00:11] 10320 Checking for queued invalidations... +INFO [2020-06-04 14:00:11] 10320 Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 +INFO [2020-06-04 14:00:12] 10320 Will invalidate archived reports for 2014-03-12 for following websites ids: 3,1 +INFO [2020-06-04 14:00:12] 10320 Will invalidate archived reports for 2012-09-30 for following websites ids: 1 +INFO [2020-06-04 14:00:12] 10320 Will invalidate archived reports for 2012-08-19 for following websites ids: 1 +INFO [2020-06-04 14:00:12] 10320 Will invalidate archived reports for 2012-08-15 for following websites ids: 3,2,1 +INFO [2020-06-04 14:00:12] 10320 Will invalidate archived reports for 2012-08-11 for following websites ids: 1 +INFO [2020-06-04 14:00:12] 10320 Will invalidate archived reports for 2012-08-10 for following websites ids: 1 +INFO [2020-06-04 14:00:12] 10320 Will invalidate archived reports for 2012-08-09 for following websites ids: 1 +INFO [2020-06-04 14:00:12] 10320 Segment "browserCode==IE" was created or changed recently and will therefore archive today (for site ID = 1) +INFO [2020-06-04 14:00:12] 10320 Segment "visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50" was created or changed recently and will therefore archive today (for site ID = 1) +INFO [2020-06-04 14:00:12] 10320 Segment "visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50" was created or changed recently and will therefore archive today (for site ID = 1) +INFO [2020-06-04 14:00:12] 10320 Done invalidating +INFO [2020-06-04 14:00:12] 10320 Start processing archives for site 1. +INFO [2020-06-04 14:00:14] 10320 Archived website id 1, period = day, date = 2014-03-13, segment = '', 11 visits found. Time elapsed: 1.164s +INFO [2020-06-04 14:00:14] 10320 Archived website id 1, period = day, date = 2014-03-12, segment = '', 1 visits found. Time elapsed: 1.164s +INFO [2020-06-04 14:00:14] 10320 Archived website id 1, period = day, date = 2012-09-30, segment = '', 1 visits found. Time elapsed: 1.446s +INFO [2020-06-04 14:00:16] 10320 Archived website id 1, period = week, date = 2014-03-10, segment = '', 12 visits found. Time elapsed: 1.113s +INFO [2020-06-04 14:00:16] 10320 Archived website id 1, period = week, date = 2012-09-24, segment = '', 1 visits found. Time elapsed: 1.113s +INFO [2020-06-04 14:00:16] 10320 Archived website id 1, period = week, date = 2012-08-13, segment = '', 3 visits found. Time elapsed: 1.658s +INFO [2020-06-04 14:00:18] 10320 Archived website id 1, period = month, date = 2014-03-01, segment = '', 12 visits found. Time elapsed: 1.123s +INFO [2020-06-04 14:00:18] 10320 Archived website id 1, period = month, date = 2012-09-01, segment = '', 1 visits found. Time elapsed: 1.123s +INFO [2020-06-04 14:00:18] 10320 Archived website id 1, period = month, date = 2012-08-01, segment = '', 33 visits found. Time elapsed: 1.941s +INFO [2020-06-04 14:00:20] 10320 Archived website id 1, period = year, date = 2014-01-01, segment = '', 12 visits found. Time elapsed: 0.940s +INFO [2020-06-04 14:00:20] 10320 Archived website id 1, period = year, date = 2012-01-01, segment = '', 34 visits found. Time elapsed: 0.940s +INFO [2020-06-04 14:00:24] 10320 Archived website id 1, period = year, date = 2014-01-01, segment = 'browserCode%3D%3DIE', 1 visits found. Time elapsed: 2.732s +INFO [2020-06-04 14:00:24] 10320 Archived website id 1, period = year, date = 2014-01-01, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dnon-existing-type%3BdaysSinceFirstVisit%3C%3D50', 10 visits found. Time elapsed: 3.950s +INFO [2020-06-04 14:00:24] 10320 Archived website id 1, period = year, date = 2014-01-01, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dre%252C%253Btest%2520is%2520encoded%3BdaysSinceFirstVisit%3C%3D50', 10 visits found. Time elapsed: 3.950s +INFO [2020-06-04 14:00:26] 10320 Archived website id 1, period = month, date = 2012-09-01, segment = 'browserCode%3D%3DIE', 0 visits found. Time elapsed: 1.121s +INFO [2020-06-04 14:00:26] 10320 Archived website id 1, period = month, date = 2012-09-01, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dnon-existing-type%3BdaysSinceFirstVisit%3C%3D50', 1 visits found. Time elapsed: 1.752s +INFO [2020-06-04 14:00:26] 10320 Archived website id 1, period = month, date = 2012-09-01, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dre%252C%253Btest%2520is%2520encoded%3BdaysSinceFirstVisit%3C%3D50', 1 visits found. Time elapsed: 2.024s +INFO [2020-06-04 14:00:29] 10320 Archived website id 1, period = week, date = 2012-08-13, segment = 'browserCode%3D%3DIE', 1 visits found. Time elapsed: 1.443s +INFO [2020-06-04 14:00:29] 10320 Archived website id 1, period = week, date = 2012-08-13, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dnon-existing-type%3BdaysSinceFirstVisit%3C%3D50', 3 visits found. Time elapsed: 2.083s +INFO [2020-06-04 14:00:29] 10320 Archived website id 1, period = week, date = 2012-08-13, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dre%252C%253Btest%2520is%2520encoded%3BdaysSinceFirstVisit%3C%3D50', 3 visits found. Time elapsed: 2.355s +INFO [2020-06-04 14:00:30] 10320 Archived website id 1, period = day, date = 2012-08-11, segment = 'browserCode%3D%3DIE', 1 visits found. Time elapsed: 1.122s +INFO [2020-06-04 14:00:30] 10320 Archived website id 1, period = day, date = 2012-08-11, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dnon-existing-type%3BdaysSinceFirstVisit%3C%3D50', 11 visits found. Time elapsed: 1.444s +INFO [2020-06-04 14:00:30] 10320 Archived website id 1, period = day, date = 2012-08-11, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dre%252C%253Btest%2520is%2520encoded%3BdaysSinceFirstVisit%3C%3D50', 11 visits found. Time elapsed: 1.444s +INFO [2020-06-04 14:00:32] 10320 Archived website id 1, period = day, date = 2012-08-10, segment = 'browserCode%3D%3DIE', 3 visits found. Time elapsed: 1.124s +INFO [2020-06-04 14:00:32] 10320 Archived website id 1, period = day, date = 2012-08-10, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dnon-existing-type%3BdaysSinceFirstVisit%3C%3D50', 8 visits found. Time elapsed: 1.124s +INFO [2020-06-04 14:00:32] 10320 Archived website id 1, period = day, date = 2012-08-10, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dre%252C%253Btest%2520is%2520encoded%3BdaysSinceFirstVisit%3C%3D50', 8 visits found. Time elapsed: 1.397s +INFO [2020-06-04 14:00:33] 10320 Archived website id 1, period = day, date = 2012-08-09, segment = 'browserCode%3D%3DIE', 1 visits found. Time elapsed: 1.380s +INFO [2020-06-04 14:00:33] 10320 Archived website id 1, period = day, date = 2012-08-09, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dnon-existing-type%3BdaysSinceFirstVisit%3C%3D50', 11 visits found. Time elapsed: 1.380s +INFO [2020-06-04 14:00:33] 10320 Archived website id 1, period = day, date = 2012-08-09, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dre%252C%253Btest%2520is%2520encoded%3BdaysSinceFirstVisit%3C%3D50', 11 visits found. Time elapsed: 1.380s +INFO [2020-06-04 14:00:35] 10320 Archived website id 1, period = week, date = 2012-08-06, segment = 'browserCode%3D%3DIE', 5 visits found. Time elapsed: 1.113s +INFO [2020-06-04 14:00:35] 10320 Archived website id 1, period = week, date = 2012-08-06, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dnon-existing-type%3BdaysSinceFirstVisit%3C%3D50', 30 visits found. Time elapsed: 1.420s +INFO [2020-06-04 14:00:35] 10320 Archived website id 1, period = week, date = 2012-08-06, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dre%252C%253Btest%2520is%2520encoded%3BdaysSinceFirstVisit%3C%3D50', 30 visits found. Time elapsed: 1.691s +INFO [2020-06-04 14:00:37] 10320 Archived website id 1, period = month, date = 2012-08-01, segment = 'browserCode%3D%3DIE', 6 visits found. Time elapsed: 1.492s +INFO [2020-06-04 14:00:37] 10320 Archived website id 1, period = month, date = 2012-08-01, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dnon-existing-type%3BdaysSinceFirstVisit%3C%3D50', 33 visits found. Time elapsed: 1.765s +INFO [2020-06-04 14:00:37] 10320 Archived website id 1, period = month, date = 2012-08-01, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dre%252C%253Btest%2520is%2520encoded%3BdaysSinceFirstVisit%3C%3D50', 33 visits found. Time elapsed: 2.039s +INFO [2020-06-04 14:00:39] 10320 Archived website id 1, period = year, date = 2012-01-01, segment = 'browserCode%3D%3DIE', 6 visits found. Time elapsed: 1.130s +INFO [2020-06-04 14:00:39] 10320 Archived website id 1, period = year, date = 2012-01-01, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dnon-existing-type%3BdaysSinceFirstVisit%3C%3D50', 34 visits found. Time elapsed: 1.760s +INFO [2020-06-04 14:00:39] 10320 Archived website id 1, period = year, date = 2012-01-01, segment = 'visitCount%3C%3D5%3BvisitorType%21%3Dre%252C%253Btest%2520is%2520encoded%3BdaysSinceFirstVisit%3C%3D50', 34 visits found. Time elapsed: 1.760s +INFO [2020-06-04 14:00:39] 10320 Finished archiving for site 1, 38 API requests, Time elapsed: 26.617s [1 / 3 done] +INFO [2020-06-04 14:00:39] 10320 Start processing archives for site 2. +INFO [2020-06-04 14:00:39] 10320 Archived website id 2, period = day, date = 2012-08-15, segment = '', 1 visits found. Time elapsed: 0.556s +INFO [2020-06-04 14:00:40] 10320 Archived website id 2, period = week, date = 2012-08-13, segment = '', 1 visits found. Time elapsed: 0.557s +INFO [2020-06-04 14:00:40] 10320 Archived website id 2, period = month, date = 2012-08-01, segment = '', 1 visits found. Time elapsed: 0.555s +INFO [2020-06-04 14:00:41] 10320 Archived website id 2, period = year, date = 2012-01-01, segment = '', 1 visits found. Time elapsed: 0.556s +INFO [2020-06-04 14:00:41] 10320 Finished archiving for site 2, 4 API requests, Time elapsed: 2.378s [2 / 3 done] +INFO [2020-06-04 14:00:41] 10320 Start processing archives for site 3. +INFO [2020-06-04 14:00:43] 10320 Archived website id 3, period = day, date = 2014-03-13, segment = '', 11 visits found. Time elapsed: 1.091s +INFO [2020-06-04 14:00:43] 10320 Archived website id 3, period = day, date = 2014-03-12, segment = '', 1 visits found. Time elapsed: 1.091s +INFO [2020-06-04 14:00:43] 10320 Archived website id 3, period = day, date = 2012-08-15, segment = '', 3 visits found. Time elapsed: 1.364s +INFO [2020-06-04 14:00:44] 10320 Archived website id 3, period = week, date = 2014-03-10, segment = '', 12 visits found. Time elapsed: 0.936s +INFO [2020-06-04 14:00:44] 10320 Archived website id 3, period = week, date = 2012-08-13, segment = '', 3 visits found. Time elapsed: 0.936s +INFO [2020-06-04 14:00:45] 10320 Archived website id 3, period = month, date = 2014-03-01, segment = '', 12 visits found. Time elapsed: 0.924s +INFO [2020-06-04 14:00:45] 10320 Archived website id 3, period = month, date = 2012-08-01, segment = '', 3 visits found. Time elapsed: 0.924s +INFO [2020-06-04 14:00:45] 10320 Archived website id 3, period = year, date = 2014-01-01, segment = '', 12 visits found. Time elapsed: 0.918s +INFO [2020-06-04 14:00:45] 10320 Archived website id 3, period = year, date = 2012-01-01, segment = '', 3 visits found. Time elapsed: 0.918s +INFO [2020-06-04 14:00:45] 10320 Finished archiving for site 3, 9 API requests, Time elapsed: 4.325s [3 / 3 done] +INFO [2020-06-04 14:00:46] 10320 --------------------------- +INFO [2020-06-04 14:00:46] 10320 SCHEDULED TASKS +INFO [2020-06-04 14:00:46] 10320 Starting Scheduled tasks... +INFO [2020-06-04 14:00:46] 10320 done +INFO [2020-06-04 14:00:46] 10320 ---------------------------
\ No newline at end of file diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index 0db5218744..be5944177a 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -113,10 +113,9 @@ class CoreHome extends \Piwik\Plugin public function getStylesheetFiles(&$stylesheets) { - $stylesheets[] = "libs/jquery/themes/base/jquery-ui.min.css"; - $stylesheets[] = "libs/bower_components/materialize/dist/css/materialize.min.css"; - $stylesheets[] = "libs/bower_components/ngDialog/css/ngDialog.min.css"; - $stylesheets[] = "libs/bower_components/ngDialog/css/ngDialog-theme-default.min.css"; + $stylesheets[] = "node_modules/jquery-ui-dist/jquery-ui.min.css"; + $stylesheets[] = "node_modules/jquery-ui-dist/jquery-ui.theme.min.css"; + $stylesheets[] = "node_modules/materialize-css/dist/css/materialize.min.css"; $stylesheets[] = "plugins/Morpheus/stylesheets/base/bootstrap.css"; $stylesheets[] = "plugins/Morpheus/stylesheets/base/icons.css"; $stylesheets[] = "plugins/Morpheus/stylesheets/base.less"; @@ -133,7 +132,6 @@ class CoreHome extends \Piwik\Plugin $stylesheets[] = "plugins/CoreHome/stylesheets/zen-mode.less"; $stylesheets[] = "plugins/CoreHome/stylesheets/layout.less"; $stylesheets[] = "plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less"; - $stylesheets[] = "plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less"; $stylesheets[] = "plugins/CoreHome/angularjs/notification/notification.directive.less"; $stylesheets[] = "plugins/CoreHome/angularjs/quick-access/quick-access.directive.less"; $stylesheets[] = "plugins/CoreHome/angularjs/selector/selector.directive.less"; @@ -153,19 +151,19 @@ class CoreHome extends \Piwik\Plugin public function getJsFiles(&$jsFiles) { - $jsFiles[] = "libs/bower_components/jquery/dist/jquery.min.js"; - $jsFiles[] = "libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js"; - $jsFiles[] = "libs/bower_components/materialize/dist/js/materialize.min.js"; - $jsFiles[] = "libs/jquery/jquery.browser.js"; - $jsFiles[] = "libs/jquery/jquery.truncate.js"; - $jsFiles[] = "libs/bower_components/jquery.scrollTo/jquery.scrollTo.min.js"; - $jsFiles[] = "libs/bower_components/sprintf/dist/sprintf.min.js"; - $jsFiles[] = "libs/bower_components/mousetrap/mousetrap.min.js"; - $jsFiles[] = "libs/bower_components/angular/angular.min.js"; - $jsFiles[] = "libs/bower_components/angular-sanitize/angular-sanitize.min.js"; - $jsFiles[] = "libs/bower_components/angular-animate/angular-animate.min.js"; - $jsFiles[] = "libs/bower_components/angular-cookies/angular-cookies.min.js"; - $jsFiles[] = "libs/bower_components/ngDialog/js/ngDialog.min.js"; + $jsFiles[] = "node_modules/jquery/dist/jquery.min.js"; + $jsFiles[] = "node_modules/jquery-ui-dist/jquery-ui.min.js"; + $jsFiles[] = "node_modules/materialize-css/dist/js/materialize.min.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/materialize-bc.js"; + $jsFiles[] = "node_modules/jquery.browser/dist/jquery.browser.min.js"; + $jsFiles[] = "node_modules/jquery.scrollto/jquery.scrollTo.min.js"; + $jsFiles[] = "node_modules/sprintf-js/dist/sprintf.min.js"; + $jsFiles[] = "node_modules/mousetrap/mousetrap.min.js"; + $jsFiles[] = 'node_modules/angular/angular.min.js'; + $jsFiles[] = "node_modules/angular-sanitize/angular-sanitize.min.js"; + $jsFiles[] = "node_modules/angular-animate/angular-animate.min.js"; + $jsFiles[] = "node_modules/angular-cookies/angular-cookies.min.js"; + $jsFiles[] = "node_modules/ng-dialog/js/ngDialog.min.js"; $jsFiles[] = "plugins/Morpheus/javascripts/piwikHelper.js"; $jsFiles[] = "plugins/Morpheus/javascripts/ajaxHelper.js"; $jsFiles[] = "plugins/Morpheus/javascripts/layout.js"; @@ -247,10 +245,6 @@ class CoreHome extends \Piwik\Plugin $jsFiles[] = "plugins/CoreHome/angularjs/content-intro/content-intro.directive.js"; $jsFiles[] = "plugins/CoreHome/angularjs/content-block/content-block.directive.js"; - $jsFiles[] = "plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.directive.js"; - $jsFiles[] = "plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.controller.js"; - $jsFiles[] = "plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler-urllistener.service.js"; - $jsFiles[] = "plugins/CoreHome/angularjs/notification/notification.controller.js"; $jsFiles[] = "plugins/CoreHome/angularjs/notification/notification.directive.js"; $jsFiles[] = "plugins/CoreHome/angularjs/notification/notification.service.js"; @@ -488,5 +482,8 @@ class CoreHome extends \Piwik\Plugin $translationKeys[] = 'General_ComparisonCardTooltip2'; $translationKeys[] = 'General_Comparisons'; $translationKeys[] = 'General_ClickToRemoveComp'; + $translationKeys[] = 'General_Custom'; + $translationKeys[] = 'General_PreviousPeriod'; + $translationKeys[] = 'General_PreviousYear'; } } diff --git a/plugins/CoreHome/angularjs/common/directives/dropdown-button.js b/plugins/CoreHome/angularjs/common/directives/dropdown-button.js index 00c9bf326f..04ac857795 100644 --- a/plugins/CoreHome/angularjs/common/directives/dropdown-button.js +++ b/plugins/CoreHome/angularjs/common/directives/dropdown-button.js @@ -19,14 +19,22 @@ return { restrict: 'C', compile: function (element, attrs) { + // BC for materializecss 0.97 => 1.0 + if (!element.attr('data-target') + && element.attr('data-activates') + ) { + element.attr('data-target', element.attr('data-activates')); + } - $(element).dropdown({ - inDuration: 300, - outDuration: 225, - constrain_width: false, // Does not change width of dropdown to that of the activator - // hover: true, // Activate on hover - belowOrigin: true // Displays dropdown below the button - }); + if (element.attr('data-target')) { + $(element).dropdown({ + inDuration: 300, + outDuration: 225, + constrainWidth: false, // Does not change width of dropdown to that of the activator + // hover: true, // Activate on hover + belowOrigin: true // Displays dropdown below the button + }); + } return function (scope, element, attrs) { diff --git a/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js b/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js index 12a9d74ff3..fc111100bb 100644 --- a/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js +++ b/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js @@ -24,7 +24,7 @@ restrict: 'A', link: function(scope, element, attr) { - var sensitiveData = attr.piwikShowSensitiveData || attr.text(); + var sensitiveData = attr.piwikShowSensitiveData || (attr.text ? attr.text() : ''); var showCharacters = attr.showCharacters || 6; var clickElement = attr.clickElementSelector || element; diff --git a/plugins/CoreHome/angularjs/common/directives/side-nav.js b/plugins/CoreHome/angularjs/common/directives/side-nav.js index 8906a28eda..1f62df58a3 100644 --- a/plugins/CoreHome/angularjs/common/directives/side-nav.js +++ b/plugins/CoreHome/angularjs/common/directives/side-nav.js @@ -25,7 +25,6 @@ restrict: 'A', priority: 10, link: function(scope, element, attr, ctrl) { - if (attr.piwikSideNav) { $timeout(function () { if (!initialized) { @@ -33,7 +32,7 @@ var sideNavActivator = $(attr.piwikSideNav).show(); - sideNavActivator.sideNav({ + $('#' + sideNavActivator.attr('data-target')).sidenav({ closeOnClick: true }); } diff --git a/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler-urllistener.service.js b/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler-urllistener.service.js deleted file mode 100644 index 481242408c..0000000000 --- a/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler-urllistener.service.js +++ /dev/null @@ -1,90 +0,0 @@ -/*! - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -/** - * AngularJS service that handles the popover query parameter for Piwik's angular code. - * - * If the popover parameter's first part is the name of an existing AngularJS directive, - * a dialog is created using ngDialog with the contents being an element with that directive. - * The other parts of the parameter are treated as attributes for the element, eg, - * `"mydirective:myparam=val:myotherparam=val2"`. - * - * It should not be necessary to use this service directly, instead the piwik-dialogtoggler - * directive should be used. - * - * TODO: popover as a query parameter refers less to dialogs and more to any popup window - * (ie, not necessarily modal). should replace it w/ 'dialog' or maybe 'modal'. - */ -(function () { - angular.module('piwikApp').factory('piwikDialogtogglerUrllistener', piwikDialogtogglerUrllistener); - - piwikDialogtogglerUrllistener.$inject = ['$rootScope', '$location', '$injector', '$rootElement', 'ngDialog']; - - function piwikDialogtogglerUrllistener($rootScope, $location, $injector, $rootElement, ngDialog) { - var service = {}, - dialogQueryParamName = 'popover'; - - function getHtmlFromDialogQueryParam(paramValue) { - var info = paramValue.split(':'), - directiveName = info.shift(), - dialogContent = ''; - - dialogContent += '<div ' + directiveName; - angular.forEach(info, function (argumentAssignment) { - var pair = argumentAssignment.split('='), - key = pair[0], - value = pair[1]; - dialogContent += ' ' + key + '="' + decodeURIComponent(value) + '"'; - }); - dialogContent += '/>'; - - return dialogContent; - } - - function directiveExists(directiveAttributeString) { - // NOTE: directiveNormalize is not exposed by angularjs and the devs don't seem to want to expose it: - // https://github.com/angular/angular.js/issues/7955 - // so logic is duplicated here. - var PREFIX_REGEXP = /^(x[\:\-_]|data[\:\-_])/i, - directiveName = angular.element.camelCase(directiveAttributeString.replace(PREFIX_REGEXP, '')); - - return $injector.has(directiveName + 'Directive'); - } - - service.checkUrlForDialog = function () { - var dialogParamValue = $location.search()[dialogQueryParamName]; - if (dialogParamValue && directiveExists(dialogParamValue)) { - var dialog = ngDialog.open({ - template: getHtmlFromDialogQueryParam(dialogParamValue), - plain: true, - className: '' - }); - - dialog.closePromise.then(function () { - $location.search(dialogQueryParamName, null); - }); - } - }; - - service.propagatePersistedDialog = function (directive, attributes) { - var paramValue = directive; - angular.forEach(attributes, function (value, name) { - paramValue += ':' + name + '=' + encodeURIComponent(value); - }); - - $location.search(dialogQueryParamName, paramValue); - }; - - $rootScope.$on('$locationChangeSuccess', function () { - service.checkUrlForDialog(); - }); - - service.checkUrlForDialog(); // check on initial page load - - return service; - } -})();
\ No newline at end of file diff --git a/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.controller.js b/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.controller.js deleted file mode 100644 index 429d0bbf4b..0000000000 --- a/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.controller.js +++ /dev/null @@ -1,68 +0,0 @@ -/*! - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -/** - * Controller for the piwikDialogToggler directive. Adds a couple methods to the - * scope allowing elements to open and close dialogs. - */ -(function () { - angular.module('piwikApp').controller('DialogTogglerController', DialogTogglerController); - - DialogTogglerController.$inject = ['$scope', 'piwik', 'ngDialog', 'piwikDialogtogglerUrllistener']; - - function DialogTogglerController($scope, piwik, ngDialog, piwikDialogtogglerUrllistener) { - /** - * Open a new dialog window using ngDialog. - * - * @param {object|string} contentsInfo If an object, it is assumed to be ngDialog open(...) config and is - * passed to ngDialog.open unaltered. - * If a string that beings with '#', we assume it is an ID of an element - * with the dialog contents. (Note: ngDialog doesn't appear to support arbitrary - * selectors). - * If a string that ends with .html, we assume it is a link to a an angular - * template. - * Otherwise we assume it is a raw angular - * @return {object} Returns the result of ngDialog.open. Can be used to close the dialog or listen for - * when the dialog is closed. - */ - $scope.open = function (contentsInfo) { - var ngDialogInfo; - if (typeof(contentsInfo) == 'object') { // is info to pass directly to ngDialog - ngDialogInfo = contentsInfo; - } else if (contentsInfo.substr(0, 1) == '#') { // is ID of an element - ngDialogInfo = {template: contentsInfo.substr(1)}; - } else if (contentsInfo.substr(-4) == '.html') { // is a link to an .html file - ngDialogInfo = {template: contentsInfo}; - } else { // is a raw HTML string - ngDialogInfo = {template: contentsInfo, plain: true}; - } - - return ngDialog.open(ngDialogInfo); - }; - - /** - * Opens a persisted dialog. Persisted dialogs are dialogs that will be launched on reload - * of the current URL. They are accomplished by modifying the URL and adding a 'popover' - * query parameter. - * - * @param {string} directive The denormalized name of an angularjs directive. An element with - * this directive will be the contents of the dialog. - * @param {object} attributes Key value mapping of the HTML attributes to add to the dialog's - * contents element. - */ - $scope.persist = function (directive, attributes) { - piwikDialogtogglerUrllistener.propagatePersistedDialog(directive, attributes); - }; - - /** - * Closes the currently open dialog window. - */ - $scope.close = function () { - ngDialog.close(); - }; - } -})();
\ No newline at end of file diff --git a/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.directive.js b/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.directive.js deleted file mode 100644 index 6963e57f3d..0000000000 --- a/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.directive.js +++ /dev/null @@ -1,30 +0,0 @@ -/*! - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -/** - * Directive for an element (such as a link) that creates and/or closes dialogs. - * - * Usage: - * <a piwik-dialogtoggler href="#" ng-click="open(...)" /> - * - * or: - * - * <div piwik-dialogtoggler> - * <a href="#" ng-click="open(...)">Open</a> - * <a href="#" ng-click="close()">Close</a> - * </div> - */ -(function () { - angular.module('piwikApp').directive('piwikDialogtoggler', piwikDialogtoggler); - - function piwikDialogtoggler() { - return { - restrict: 'A', - controller: 'DialogTogglerController' - }; - } -})();
\ No newline at end of file diff --git a/plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less b/plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less deleted file mode 100644 index 264dbda703..0000000000 --- a/plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less +++ /dev/null @@ -1,70 +0,0 @@ -.ngdialog { - position:absolute; -} - -.ngdialog-overlay { - opacity: 0.6; - background: none #000; - position: fixed; - z-index: 1000; -} - -.ngdialog-content { - z-index: 1001; - width: 950px; - border-radius: 4px; - margin: 0 auto; - max-width: 100%; - background-color: @theme-color-background-base; - padding: 1em 18px; - position: relative; - top: 100px; - - h2:first-of-type { - line-height:24px; - padding:0 0 1em; - } -} - -// remove some ngdialog animations (the remaining one is required for closing the dialog) -.ngdialog-overlay, .ngdialog.ngdialog-closing .ngdialog-overlay,.ngdialog-content { - -webkit-animation: none; - animation: none; -} - -.ngdialog-close { - // close button should be styled the same as other buttons - .submit; - - position: absolute; - right: 9px; - top: 18px; - width: 21px; - margin: 0 0 0 0; - height: 20px; - - &:before { - font-family:inherit; - content:''; - - display:inline-block; - - // center in div - position:absolute; - top: 50%; - left: 50%; - margin-top: -8px; - margin-left: -8px; - - // from jquery-ui css - background-image: url(libs/jquery/themes/base/images/ui-icons_888888_256x240.png); - background-position: -96px -128px; - width: 16px; - height: 16px; - opacity:0.5; - } - - &:hover:before { - background-image: url(libs/jquery/themes/base/images/ui-icons_454545_256x240.png); - } -} diff --git a/plugins/CoreHome/angularjs/dropdown-menu/dropdown-menu.directive.js b/plugins/CoreHome/angularjs/dropdown-menu/dropdown-menu.directive.js index 8571dbabbe..8829b671a5 100644 --- a/plugins/CoreHome/angularjs/dropdown-menu/dropdown-menu.directive.js +++ b/plugins/CoreHome/angularjs/dropdown-menu/dropdown-menu.directive.js @@ -13,10 +13,10 @@ * Note: if submenus are used, then dropdowns will never scroll. * * Usage: - * <a class='dropdown-trigger btn' href='' data-activates='mymenu' piwik-dropdown-menu>Menu</a> + * <a class='dropdown-trigger btn' href='' data-target='mymenu' piwik-dropdown-menu>Menu</a> * <ul id='mymenu' class='dropdown-content'> * <li> - * <a class='dropdown-trigger' data-activates="mysubmenu" piwik-dropdown-menu>Submenu</a> + * <a class='dropdown-trigger' data-target="mysubmenu" piwik-dropdown-menu>Submenu</a> * <ul id="mysubmenu" class="dropdown-content"> * <li>Submenu Item</li> * </ul> diff --git a/plugins/CoreHome/angularjs/field-array/field-array.directive.html b/plugins/CoreHome/angularjs/field-array/field-array.directive.html index 453fc3f07e..1ce3fcaecc 100644 --- a/plugins/CoreHome/angularjs/field-array/field-array.directive.html +++ b/plugins/CoreHome/angularjs/field-array/field-array.directive.html @@ -4,6 +4,7 @@ <div piwik-field uicontrol="{{ field.uiControl }}" data-title="{{ field.title }}" + name="{{ name + '-' + $index }}" full-width="true" ng-if="field.templateFile" template-file="{{ field.templateFile }}" diff --git a/plugins/CoreHome/angularjs/field-array/field-array.directive.js b/plugins/CoreHome/angularjs/field-array/field-array.directive.js index 5c87a205aa..000f16caa9 100644 --- a/plugins/CoreHome/angularjs/field-array/field-array.directive.js +++ b/plugins/CoreHome/angularjs/field-array/field-array.directive.js @@ -18,6 +18,7 @@ return { restrict: 'A', scope: { + name: '=', field: '=' }, require: "?ngModel", diff --git a/plugins/CoreHome/angularjs/multipairfield/multipairfield.directive.html b/plugins/CoreHome/angularjs/multipairfield/multipairfield.directive.html index 2eea7d959b..a14cc99c36 100644 --- a/plugins/CoreHome/angularjs/multipairfield/multipairfield.directive.html +++ b/plugins/CoreHome/angularjs/multipairfield/multipairfield.directive.html @@ -3,6 +3,7 @@ class="multiPairFieldTable multiPairFieldTable{{ index }} has{{ item.fieldCount }}Fields multiple valign-wrapper"> <div piwik-field uicontrol="{{ field1.uiControl }}" + name="{{ name + '-p1-' + $index }}" data-title="{{ field1.title }}" full-width="true" ng-if="field1.templateFile" @@ -16,6 +17,7 @@ </div> <div piwik-field uicontrol="{{ field2.uiControl }}" + name="{{ name + '-p2-' + $index }}" data-title="{{ field2.title }}" full-width="true" ng-if="field2.templateFile" diff --git a/plugins/CoreHome/angularjs/multipairfield/multipairfield.directive.js b/plugins/CoreHome/angularjs/multipairfield/multipairfield.directive.js index 58accd4d1e..d877c05609 100644 --- a/plugins/CoreHome/angularjs/multipairfield/multipairfield.directive.js +++ b/plugins/CoreHome/angularjs/multipairfield/multipairfield.directive.js @@ -18,6 +18,7 @@ return { restrict: 'A', scope: { + name: '=', field1: '=', field2: '=', field3: '=', diff --git a/plugins/CoreHome/angularjs/period-selector/period-selector.controller.js b/plugins/CoreHome/angularjs/period-selector/period-selector.controller.js index e418731f3e..8aa7d07683 100644 --- a/plugins/CoreHome/angularjs/period-selector/period-selector.controller.js +++ b/plugins/CoreHome/angularjs/period-selector/period-selector.controller.js @@ -16,6 +16,12 @@ var vm = this; + vm.comparePeriodDropdownOptions = [ + {key: 'custom', value: _pk_translate('General_Custom')}, + {key: 'previousPeriod', value: _pk_translate('General_PreviousPeriod').replace(/\s+/, piwikHelper.htmlDecode(' '))}, + {key: 'previousYear', value: _pk_translate('General_PreviousYear').replace(/\s+/, piwikHelper.htmlDecode(' '))}, + ]; + // the period & date currently being viewed vm.periodValue = null; vm.dateValue = null; diff --git a/plugins/CoreHome/angularjs/period-selector/period-selector.directive.html b/plugins/CoreHome/angularjs/period-selector/period-selector.directive.html index 6641d6714d..312ef05d46 100644 --- a/plugins/CoreHome/angularjs/period-selector/period-selector.directive.html +++ b/plugins/CoreHome/angularjs/period-selector/period-selector.directive.html @@ -42,23 +42,21 @@ <h6>{{ 'General_Period'|translate }}</h6> <div id="otherPeriods"> <p ng-repeat="period in periodSelector.periods"> - <input - type="radio" - name="period" - ng-attr-id="period_id_{{ period }}" - ng-model="periodSelector.selectedPeriod" - ng-value="period" - ng-change="periodSelector.selectedPeriod = period" - ng-dblclick="periodSelector.changeViewedPeriod(period)" - /> - <label - ng-attr-for="period_id_{{ period }}" ng-attr-title="{{ period === periodSelector.periodValue ? '' : ('General_DoubleClickToChangePeriod'|translate) }}" ng-class="{'selected-period-label': period === periodSelector.selectedPeriod}" ng-dblclick="periodSelector.changeViewedPeriod(period)" > - {{ periodSelector.getPeriodDisplayText(period) }} + <input + type="radio" + name="period" + ng-attr-id="period_id_{{ period }}" + ng-model="periodSelector.selectedPeriod" + ng-checked="periodSelector.selectedPeriod == period" + ng-change="periodSelector.selectedPeriod = period" + ng-dblclick="periodSelector.changeViewedPeriod(period)" + /> + <span>{{ periodSelector.getPeriodDisplayText(period) }}</span> </label> </p> </div> @@ -68,15 +66,21 @@ </table> <div class="compare-checkbox" ng-if="periodSelector.isComparisonEnabled()"> - <input id="comparePeriodTo" type="checkbox" ng-model="periodSelector.isComparing"/> - <label for="comparePeriodTo">Compare to:</label> + <label> + <input + id="comparePeriodTo" + type="checkbox" + ng-model="periodSelector.isComparing" + /> + <span>Compare to:</span> + </label> <div id="comparePeriodToDropdown" piwik-field name="comparePeriodToDropdown" uicontrol="select" - options="[{key: 'custom', value: 'Custom'}, {key: 'previousPeriod', value: 'Previous period'}, {key: 'previousYear', value: 'Previous year'}]" + options="periodSelector.comparePeriodDropdownOptions" ng-model="periodSelector.comparePeriodType" full-width="true" disabled="!periodSelector.isComparing" diff --git a/plugins/CoreHome/angularjs/period-selector/period-selector.directive.less b/plugins/CoreHome/angularjs/period-selector/period-selector.directive.less index 2cf453fd5b..167aadf052 100644 --- a/plugins/CoreHome/angularjs/period-selector/period-selector.directive.less +++ b/plugins/CoreHome/angularjs/period-selector/period-selector.directive.less @@ -30,10 +30,16 @@ height: 30px; display: inline-block; width: 60%; - transform: scale(.8); - margin-left: -5%; + transform: scale(.9); + margin-left: -2%; margin-right: -5%; + // dropdown width/height looks off due to scaling + .dropdown-content { + width: auto !important; + height: auto !important; + } + .form-group { margin: 0; } diff --git a/plugins/CoreHome/angularjs/piwikApp.js b/plugins/CoreHome/angularjs/piwikApp.js index b1115be23a..1fa735757b 100644 --- a/plugins/CoreHome/angularjs/piwikApp.js +++ b/plugins/CoreHome/angularjs/piwikApp.js @@ -9,7 +9,6 @@ 'ngSanitize', 'ngAnimate', 'ngCookies', - 'ngDialog', 'piwikApp.config', 'piwikApp.service', 'piwikApp.directive', @@ -18,6 +17,6 @@ angular.module('app', []); angular.module('piwikApp').config(['$locationProvider', function($locationProvider) { - $locationProvider.hashPrefix(''); + $locationProvider.html5Mode({ enabled: false, rewriteLinks: false }).hashPrefix(''); }]); })();
\ No newline at end of file diff --git a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js index 731ea0f1c3..21f678f161 100644 --- a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js +++ b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js @@ -71,7 +71,7 @@ var category = _pk_translate('CoreHome_Menu'); - $rootElement.find('nav .side-nav li > a').each(function (index, element) { + $rootElement.find('nav .sidenav li > a').each(function (index, element) { var $element = $(element); var text = trim($element.text()); diff --git a/plugins/CoreHome/angularjs/report-export/reportexport.directive.js b/plugins/CoreHome/angularjs/report-export/reportexport.directive.js index 2c8b523c16..e998131b03 100644 --- a/plugins/CoreHome/angularjs/report-export/reportexport.directive.js +++ b/plugins/CoreHome/angularjs/report-export/reportexport.directive.js @@ -269,7 +269,7 @@ } $timeout(function(){ - popover.dialog({position: ['center', 'center']}); + popover.dialog(); }, 100); }); }); diff --git a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.directive.html b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.directive.html index 4ef82e0270..c8f8e12759 100644 --- a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.directive.html +++ b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.directive.html @@ -36,7 +36,7 @@ </ul> </li> </ul> -<ul id="mobile-left-menu" class="side-nav hide-on-large-only"> +<ul id="mobile-left-menu" class="sidenav hide-on-large-only"> <li class="no-padding" ng-repeat="category in menuModel.menu"> <ul class="collapsible collapsible-accordion" piwik-side-nav="nav .activateLeftMenu"> <li> diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less index d49a0b1e39..f3bbcb2a22 100644 --- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less +++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less @@ -16,6 +16,10 @@ .dropdown { min-width: 210px; } + + .ui-widget.ui-widget-content { + border: none; + } } #content { diff --git a/plugins/CoreHome/javascripts/corehome.js b/plugins/CoreHome/javascripts/corehome.js index 35ef55c555..90e74d7de4 100644 --- a/plugins/CoreHome/javascripts/corehome.js +++ b/plugins/CoreHome/javascripts/corehome.js @@ -85,7 +85,7 @@ $( document ).ready(function() { $(window).scrollTo($('a[name="main"]')); }); - $("nav .activateTopMenu").sideNav({ + $("#mobile-top-menu").sideNav({ closeOnClick: true, edge: 'right' }); diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 137c832402..d6bd212afe 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -1974,6 +1974,24 @@ $.extend(DataTable.prototype, UIControl.prototype, { items: 'a', content: '<h3>'+action.dataTableIconTooltip[0]+'</h3>'+action.dataTableIconTooltip[1], tooltipClass: 'rowActionTooltip', + // ensure the tooltips of parent elements are hidden when the action tooltip is shown + // otherwise it can happen that tooltips for subtable rows are shown as well. + open: function() { + var tooltip = $(this).parents().filter(function() { + return jQuery.hasData(this) && $(this).data('ui-tooltip'); + }).tooltip('instance'); + if (tooltip) { + tooltip.disable(); + } + }, + close: function() { + var tooltip = $(this).parents().filter(function() { + return jQuery.hasData(this) && $(this).data('ui-tooltip'); + }).tooltip('instance'); + if (tooltip) { + tooltip.enable(); + } + }, show: false, hide: false }); diff --git a/plugins/CoreHome/javascripts/materialize-bc.js b/plugins/CoreHome/javascripts/materialize-bc.js new file mode 100644 index 0000000000..0bcede9018 --- /dev/null +++ b/plugins/CoreHome/javascripts/materialize-bc.js @@ -0,0 +1,18 @@ +/*! + * Matomo - free/libre analytics platform + * + * @link http://matomo.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ +(function () { + $(document).ready(function () { + window.Materialize = window.M; + $.fn.sideNav = $.fn.sidenav; + $.fn.material_select = $.fn.formSelect; + + // we load jquery-ui after materialize so we can use the jquery-ui datepicker, but + // some controls in materialize get overwritten too. so we undo that here. + M.initializeJqueryWrapper(M.Tabs, 'tabs', 'M_Tabs'); + M.initializeJqueryWrapper(M.Modal, 'modal', 'M_Modal'); + }); +})();
\ No newline at end of file diff --git a/plugins/CoreHome/javascripts/popover.js b/plugins/CoreHome/javascripts/popover.js index 2ff4457e06..44efe54e74 100644 --- a/plugins/CoreHome/javascripts/popover.js +++ b/plugins/CoreHome/javascripts/popover.js @@ -26,7 +26,6 @@ var Piwik_Popover = (function () { title: title, modal: true, width: '1050px', - position: ['center', 'center'], resizable: false, autoOpen: true, open: function (event, ui) { @@ -85,7 +84,7 @@ var Piwik_Popover = (function () { var centerPopover = function () { if (container !== false) { - container.dialog({position: ['center', 'center']}); + container.dialog("option", "position", {my: 'center', at: 'center', of: '.ui-widget-overlay', collision: 'fit'}); } }; @@ -186,7 +185,8 @@ var Piwik_Popover = (function () { container.children().each(function (i, childNode) { piwikHelper.compileAngularComponents(childNode); - }) + }); + centerPopover(); }, @@ -263,6 +263,7 @@ var Piwik_Popover = (function () { // make sure the minimum top position of the popover is 15px var ensureMinimumTop = function () { var popoverContainer = $('#Piwik_Popover').parent(); + popoverContainer.css('top', (window.scrollY + 15) + 'px'); if (popoverContainer.position().top < 106) { popoverContainer.css('top', '15px'); } diff --git a/plugins/CoreHome/stylesheets/coreHome.less b/plugins/CoreHome/stylesheets/coreHome.less index bfad34d3bb..48fbfee89e 100644 --- a/plugins/CoreHome/stylesheets/coreHome.less +++ b/plugins/CoreHome/stylesheets/coreHome.less @@ -101,6 +101,7 @@ div.ui-datepicker { padding: 5px 10px; font-size: 12px; line-height: 12px; + border: 0; } #calendarApply { diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less index 41c10bdf34..572cfc914f 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less +++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less @@ -231,10 +231,11 @@ table.dataTable img { color: #adadad !important; min-height: 30px !important; padding-left: 25px !important; - width: 100% !important; transition: opacity 0.3s ease !important; box-shadow: 0 0 !important; visibility: hidden; + height: 1rem !important; + width: calc(~'100% - 25px') !important; } .searchAction:hover { @@ -641,6 +642,11 @@ div.dataTableScroller { } } +#dashboard .dataTableFooterNavigation > .row { + margin-left: 0; + margin-right: 0; +} + @media only screen and (min-width: 993px) { #dashboardWidgetsArea .widget, .theWidgetContent > div:not(#dashboard) { diff --git a/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less b/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less index 9486e875cf..dc303cf27e 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less +++ b/plugins/CoreHome/stylesheets/dataTable/_limitSelection.less @@ -56,19 +56,19 @@ border-color: @theme-color-brand !important; } } - span.caret { - top: 11px; - right: 4px; - color: @theme-color-brand !important; + + svg.caret { + fill: @theme-color-brand !important; opacity: 0.7; &:hover { - color: @theme-color-brand !important; + fill: @theme-color-brand !important; opacity: 1; } } } margin-top: 0; + margin-bottom: 0; display: inline-block; width: 47px; height: 36px; diff --git a/plugins/CoreHome/templates/_dataTableActions.twig b/plugins/CoreHome/templates/_dataTableActions.twig index 7322800fc7..c1f52456b9 100644 --- a/plugins/CoreHome/templates/_dataTableActions.twig +++ b/plugins/CoreHome/templates/_dataTableActions.twig @@ -4,7 +4,7 @@ <a class='dropdown-button dropdownConfigureIcon dataTableAction' href='javascript:;' - data-activates='dropdownConfigure{{ randomIdForDropdown }}'><span class="icon-configure"></span></a> + data-target='dropdownConfigure{{ randomIdForDropdown }}'><span class="icon-configure"></span></a> {% set activeFooterIcon = '' %} {% set numIcons = 0 %} @@ -37,7 +37,7 @@ <a class="dropdown-button dataTableAction activatePeriodsSelection" href="javascript:;" title="{{ 'CoreHome_ChangePeriod'|translate|e('html_attr') }}" - data-activates="dropdownPeriods{{ randomIdForDropdown }}"> + data-target="dropdownPeriods{{ randomIdForDropdown }}"> <span class="icon-calendar"></span> </a> <ul id='dropdownPeriods{{ randomIdForDropdown }}' class='dropdown-content dataTablePeriods'> @@ -54,7 +54,7 @@ {% if activeFooterIcon and numIcons > 1 %} <a class="dropdown-button dataTableAction activateVisualizationSelection" href="javascript:;" - data-activates="dropdownVisualizations{{ randomIdForDropdown }}"> + data-target="dropdownVisualizations{{ randomIdForDropdown }}"> {% if activeFooterIcon starts with 'icon-' %} <span title="{{ 'CoreHome_ChangeVisualization'|translate|e('html_attr') }}" class="{{ activeFooterIcon }}"></span> {% else %} @@ -102,7 +102,7 @@ <input id="widgetSearch_{{ properties.report_id }}" title="{{ 'CoreHome_DataTableHowToSearch'|translate|e('html_attr') }}" type="text" - class="dataTableSearchInput browser-default" /> + class="dataTableSearchInput" /> </a> {% endif %} diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig index eb2d8a0ead..5aee9e8456 100644 --- a/plugins/CoreHome/templates/_menu.twig +++ b/plugins/CoreHome/templates/_menu.twig @@ -44,7 +44,7 @@ {% endif %} {% endfor %} </ul> - <ul id="mobile-left-menu" class="side-nav hide-on-large-only"> + <ul id="mobile-left-menu" class="sidenav hide-on-large-only"> {% for level1,level2 in menu %} {% set hasSubmenuItem = false %} diff --git a/plugins/CoreHome/templates/_topBar.twig b/plugins/CoreHome/templates/_topBar.twig index 598a511c02..febe664681 100644 --- a/plugins/CoreHome/templates/_topBar.twig +++ b/plugins/CoreHome/templates/_topBar.twig @@ -36,11 +36,11 @@ {% endfor %} {% endapply %} </ul> -<ul class="side-nav hide-on-large-only" id="mobile-top-menu"> +<ul class="sidenav hide-on-large-only" id="mobile-top-menu"> {% for label,menu in topMenu %} <li role="menuitem" class="{{ _self.isActiveItem(menu, topMenuModule, topMenuAction) }}" >{{ _self.topMenuItem(label, '', menu) }}</li> {% endfor %} </ul> -<a href="javascript:;" data-activates="mobile-left-menu" class="activateLeftMenu hide-on-large-only button-collapse" style="display:none;"><span class="icon-menu-hamburger"></span></a> -<a href="javascript:;" data-activates="mobile-top-menu" class="activateTopMenu hide-on-large-only button-collapse"><span class="icon-more-verti"></span></a> +<a href="javascript:;" data-target="mobile-left-menu" class="activateLeftMenu hide-on-large-only button-collapse sidenav-trigger" style="display:none;"><span class="icon-menu-hamburger"></span></a> +<a href="javascript:;" data-target="mobile-top-menu" class="activateTopMenu hide-on-large-only button-collapse sidenav-trigger"><span class="icon-more-verti"></span></a> diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php index 79485e0a39..4b9cb4ba19 100644 --- a/plugins/CorePluginsAdmin/CorePluginsAdmin.php +++ b/plugins/CorePluginsAdmin/CorePluginsAdmin.php @@ -64,7 +64,7 @@ class CorePluginsAdmin extends Plugin public function getJsFiles(&$jsFiles) { - $jsFiles[] = "libs/bower_components/jQuery.dotdotdot/src/js/jquery.dotdotdot.min.js"; + $jsFiles[] = "node_modules/jquery.dotdotdot/src/jquery.dotdotdot.min.js"; $jsFiles[] = "plugins/CoreHome/javascripts/popover.js"; } diff --git a/plugins/CorePluginsAdmin/angularjs/field/field.directive.js b/plugins/CorePluginsAdmin/angularjs/field/field.directive.js index 831dfe7906..28b5e98835 100644 --- a/plugins/CorePluginsAdmin/angularjs/field/field.directive.js +++ b/plugins/CorePluginsAdmin/angularjs/field/field.directive.js @@ -49,6 +49,7 @@ inlineHelp: '@', disabled: '=', uiControlAttributes: '=', + uiControlOptions: '=', autocomplete: '@', condition: '@', varType: '@', @@ -117,6 +118,7 @@ field.title = $scope.title; field.uiControlAttributes = $scope.uiControlAttributes || {}; field.fullWidth = !!$scope.fullWidth; + field.uiControlOptions = $scope.uiControlOptions || {}; if (field.type === 'array' && angular.isString(field.value) && field.value) { field.value = JSON.parse(field.value); diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox-array.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox-array.html index f50d98b507..eff2f55bad 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox-array.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox-array.html @@ -2,15 +2,17 @@ <label class="fieldRadioTitle" ng-show="formField.title">{{ formField.title }}</label> <p ng-repeat="checkboxModel in formField.availableOptions" class="checkbox"> - <input ng-model="formField.checkboxkeys[$index.toString()]" - value="{{ checkboxModel.key }}" - ng-change="formField.updateCheckboxArrayValue()" - piwik-attributes="{{formField.uiControlAttributes}}" - type="checkbox" - id="{{ formField.name + checkboxModel.key }}" - name="{{ checkboxModel.name }}"> + <label> + <input ng-model="formField.checkboxkeys[$index.toString()]" + value="{{ checkboxModel.key }}" + ng-change="formField.updateCheckboxArrayValue()" + piwik-attributes="{{formField.uiControlAttributes}}" + type="checkbox" + id="{{ formField.name + checkboxModel.key }}" + name="{{ checkboxModel.name }}"> + <span>{{ checkboxModel.value }}</span> - <label for="{{ formField.name + checkboxModel.key }}">{{ checkboxModel.value }} - <span class="form-description" ng-show="checkboxModel.description">{{ checkboxModel.description }}</span></label> + <span class="form-description" ng-show="checkboxModel.description">{{ checkboxModel.description }}</span> + </label> </p> </div>
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html index cc016afd67..9ea7d9904d 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-checkbox.html @@ -1,10 +1,13 @@ <div class="checkbox"> - <input ng-model="formField.value" - piwik-attributes="{{formField.uiControlAttributes}}" - ng-value="1" - type="checkbox" - id="{{ formField.name }}" - name="{{ formField.name }}"> + <label> + <input ng-model="formField.value" + piwik-attributes="{{formField.uiControlAttributes}}" + ng-value="1" + ng-checked="!!formField.value" + type="checkbox" + id="{{ formField.name }}" + name="{{ formField.name }}"> - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> + <span ng-bind-html="formField.title"></span> + </label> </div>
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-expandable-select.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-expandable-select.html index 2854e8b134..d9f07888a5 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-expandable-select.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-expandable-select.html @@ -1,6 +1,7 @@ <div class="expandableSelector" piwik-focus-anywhere-but-here="formField.showSelect = false"> - <div ng-click="formField.showSelect = !formField.showSelect" class="select-wrapper" - ><span class="caret">â–¼</span><input type="text" class="select-dropdown" + <div ng-click="formField.showSelect = !formField.showSelect" class="select-wrapper"> + <svg class="caret" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M7 10l5 5 5-5z"></path><path d="M0 0h24v24H0z" fill="none"></path></svg> + <input type="text" class="select-dropdown" readonly="true" value="{{ formField.title }}"> </div> diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-field-array.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-field-array.html index ba0b58ad10..8c0f0cf99b 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-field-array.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-field-array.html @@ -1,8 +1,8 @@ <div> + <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> <div matomo-field-array - name="{{ formField.name }}" + name="formField.name" ng-model="formField.value" field="formField.uiControlAttributes.field"> </div> - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> </div>
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html index 72a0379f28..4f3a173b73 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-multiselect.html @@ -1,9 +1,7 @@ -<div> - <select multiple - name="{{ formField.name }}" - ng-model="formField.value" - ng-options="t.key as t.value group by t.group for t in formField.availableOptions" - piwik-attributes="{{formField.uiControlAttributes}}"> - </select> - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> -</div>
\ No newline at end of file +<select multiple + name="{{ formField.name }}" + ng-model="formField.value" + ng-options="t.key as t.value group by t.group for t in formField.availableOptions" + piwik-attributes="{{formField.uiControlAttributes}}"> +</select> +<label for="{{ formField.name }}" ng-bind-html="formField.title"></label>
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-multituple.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-multituple.html index ad99e5ffba..479fe43e8d 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-multituple.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-multituple.html @@ -1,11 +1,11 @@ <div> + <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> <div matomo-multi-pair-field - name="{{ formField.name }}" + name="formField.name" ng-model="formField.value" field1="formField.uiControlAttributes.field1" field2="formField.uiControlAttributes.field2" field3="formField.uiControlAttributes.field3" field4="formField.uiControlAttributes.field4"> </div> - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> </div>
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-number.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-number.html index 35b837ba89..0b78edf002 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-number.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-number.html @@ -1,4 +1,5 @@ <div> + <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> <input class="control_{{ formField.uiControl }}" type="{{ formField.uiControl }}" @@ -9,5 +10,4 @@ ng-value="formField.value" piwik-attributes="{{formField.uiControlAttributes}}" > - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> </div>
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html index 1363f4192a..13f93090a6 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-radio.html @@ -3,15 +3,19 @@ <p ng-repeat="radioModel in formField.availableOptions" class="radio"> - <input ng-model="formField.value" - ng-value="radioModel.key" - type="radio" - id="{{ formField.name + radioModel.key }}" - name="{{ formField.name }}" - ng-disabled="radioModel.disabled || formField.disabled" - piwik-attributes="{{formField.uiControlAttributes}}" - > - <label for="{{ formField.name + radioModel.key }}">{{ radioModel.value }} - <span class="form-description" ng-show="radioModel.description">{{ radioModel.description }}</span></label> + <label> + <input ng-model="formField.value" + ng-value="radioModel.key" + type="radio" + id="{{ formField.name + radioModel.key }}" + name="{{ formField.name }}" + ng-disabled="radioModel.disabled || formField.disabled" + piwik-attributes="{{formField.uiControlAttributes}}" + > + + <span>{{ radioModel.value }} + <span class="form-description" ng-show="radioModel.description">{{ radioModel.description }}</span> + </span> + </label> </p> </div>
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-select.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-select.html index 36bedbdc25..41a9a34cfb 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-select.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-select.html @@ -1,10 +1,8 @@ -<div> - <select name="{{ formField.name }}" - ng-model="formField.value" - ng-options="t.key as t.value group by t.group disable when t.disabled for t in formField.availableOptions" - piwik-attributes="{{formField.uiControlAttributes}}" - ng-click="onShowSelect()" - > - </select> - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> -</div> +<select name="{{ formField.name }}" + ng-model="formField.value" + ng-options="t.key as t.value group by t.group disable when t.disabled for t in formField.availableOptions" + piwik-attributes="{{formField.uiControlAttributes}}" + ng-click="onShowSelect()" +> +</select> +<label for="{{ formField.name }}" ng-bind-html="formField.title"></label> diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-text-array.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-text-array.html index 1ce85a2fc6..2a127da5cf 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-text-array.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-text-array.html @@ -1,4 +1,5 @@ <div> + <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> <input class="control_{{ formField.uiControl }}" type="{{ formField.uiControl }}" name="{{ formField.name }}" @@ -6,5 +7,4 @@ ng-model="formField.value" piwik-attributes="{{formField.uiControlAttributes}}" > - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> </div>
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-text.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-text.html index abb5e70b5f..34076620d7 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-text.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-text.html @@ -1,13 +1,11 @@ -<div> - <input - class="control_{{ formField.uiControl }}" - type="{{ formField.uiControl }}" - id="{{ formField.name }}" - name="{{ formField.name }}" - ng-model="formField.value" - ng-value="formField.value" - ng-trim="false" - piwik-attributes="{{formField.uiControlAttributes}}" - > - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> -</div>
\ No newline at end of file +<input + class="control_{{ formField.uiControl }}" + type="{{ formField.uiControl }}" + id="{{ formField.name }}" + name="{{ formField.name }}" + ng-model="formField.value" + ng-value="formField.value" + ng-trim="false" + piwik-attributes="{{formField.uiControlAttributes}}" +> +<label for="{{ formField.name }}" ng-bind-html="formField.title"></label> diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea-array.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea-array.html index 85b1df3564..f65c49cc26 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea-array.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea-array.html @@ -1,9 +1,9 @@ <div> + <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> <textarea name="{{ formField.name }}" ng-list=" " ng-trim="false" piwik-attributes="{{formField.uiControlAttributes}}" ng-model="formField.value" class="materialize-textarea" ></textarea> - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> </div>
\ No newline at end of file diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea.html b/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea.html index a52d05cb72..97d0b27482 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea.html +++ b/plugins/CorePluginsAdmin/angularjs/form-field/field-textarea.html @@ -1,9 +1,7 @@ -<div> - <textarea name="{{ formField.name }}" - piwik-attributes="{{formField.uiControlAttributes}}" - id="{{ formField.name }}" - ng-model="formField.value" - class="materialize-textarea" - ></textarea> - <label for="{{ formField.name }}" ng-bind-html="formField.title"></label> -</div>
\ No newline at end of file +<textarea name="{{ formField.name }}" + piwik-attributes="{{formField.uiControlAttributes}}" + id="{{ formField.name }}" + ng-model="formField.value" + class="materialize-textarea" +></textarea> +<label for="{{ formField.name }}" ng-bind-html="formField.title"></label> diff --git a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js index baaef33793..53d2fdb5c1 100644 --- a/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js +++ b/plugins/CorePluginsAdmin/angularjs/form-field/form-field.directive.js @@ -16,8 +16,8 @@ function piwikFormField(piwik, $timeout){ - function initMaterialSelect($select, placeholder) { - $select.material_select(); + function initMaterialSelect($select, placeholder, uiControlOptions) { + $select.material_select(uiControlOptions || {}); // to prevent overlapping selects, when a select is opened, we set the z-index to a high value on focus & remove z-index for all others // NOTE: we can't remove it directly blur since the blur causes the select to overlap, aborting the select click. (a timeout is used @@ -97,12 +97,12 @@ if (isSelectControl(field)) { var $select = element.find('select'); - initMaterialSelect($select, field.uiControlAttributes.placeholder); + initMaterialSelect($select, field.uiControlAttributes.placeholder, field.uiControlOptions); scope.$watch('formField.value', function (val, oldVal) { if (val !== oldVal) { $timeout(function () { - initMaterialSelect($select, field.uiControlAttributes.placeholder); + initMaterialSelect($select, field.uiControlAttributes.placeholder, field.uiControlOptions); }); } }); @@ -110,7 +110,7 @@ scope.$watch('formField.uiControlAttributes.disabled', function (val, oldVal) { if (val !== oldVal) { $timeout(function () { - initMaterialSelect($select, field.uiControlAttributes.placeholder); + initMaterialSelect($select, field.uiControlAttributes.placeholder, field.uiControlOptions); }); } }); @@ -427,7 +427,7 @@ if (isSelectControl(scope.formField)) { $timeout(function () { - initMaterialSelect(element.find('select'), field.uiControlAttributes.placeholder); + initMaterialSelect(element.find('select'), field.uiControlAttributes.placeholder, field.uiControlOptions); }); } } diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index eb126d5c2a..a0f5b823f0 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -10,8 +10,10 @@ <tr> <th> <span class="checkbox-container"> - <input type="checkbox" id="select-plugin-all"/> - <label for="select-plugin-all"></label> + <label> + <input type="checkbox" id="select-plugin-all"/> + <span></span> + </label> </span> </th> <th>{{ 'General_Plugin'|translate }}</th> @@ -26,8 +28,10 @@ <tr {% if plugin.isActivated|default(false) %}class="active-plugin"{% else %}class="inactive-plugin"{% endif %}> <td class="select-cell"> <span class="checkbox-container"> - <input type="checkbox" id="select-plugin-{{ plugin.name|e('html_attr') }}" {% if plugin.isDownloadable is defined and not plugin.isDownloadable %}disabled="disabled"{% endif %} /> - <label for="select-plugin-{{ plugin.name|e('html_attr') }}"></label> + <label> + <input type="checkbox" id="select-plugin-{{ plugin.name|e('html_attr') }}" {% if plugin.isDownloadable is defined and not plugin.isDownloadable %}disabled="disabled"{% endif %} /> + <span></span> + </label> </span> </td> <td class="name"> diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page.png index 32e832f0bc..17f24b05a9 100644 --- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page.png +++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:568588e5e4da2a51a85748f5495f5be71ff712add0d124ee40e3e542d6365ed5 -size 147755 +oid sha256:1af12916176d3d4ec44a97b0448317886648dd6976f876349c4c57cd758562f0 +size 147407 diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_super_user_activate_plugin.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_super_user_activate_plugin.png index 09fb6d4139..4098ece3a8 100644 --- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_super_user_activate_plugin.png +++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_super_user_activate_plugin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:198c480032c825f2d452e850e1336c39eccf7177fa24d8a527e345459ac64155 -size 201819 +oid sha256:dc917144d507a45516c885dc33574d49a894512951cb5dc95a9265bdb7edd0b2 +size 200995 diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_superuser_page.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_superuser_page.png index e3ce69944e..3ac8e7f412 100644 --- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_superuser_page.png +++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_superuser_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bbaa38c298e5238c2b53a4f5734e71f995630cd1549c5743c213ca3b5f55e92 -size 193535 +oid sha256:c3161a60454e12c1d9af3f76ab42f31a0978b320fb537e7bb7831376a03289cc +size 193314 diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index f4fdfcaef2..c6bd5ddef9 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -70,8 +70,8 @@ class Controller extends \Piwik\Plugin\Controller $files = array( 'plugins/Morpheus/stylesheets/base/bootstrap.css', 'plugins/Morpheus/stylesheets/base/icons.css', - 'libs/jquery/themes/base/jquery-ui.min.css', - 'libs/bower_components/materialize/dist/css/materialize.min.css', + "node_modules/jquery-ui-dist/jquery-ui.theme.min.css", + 'node_modules/materialize-css/dist/css/materialize.min.css', 'plugins/Morpheus/stylesheets/base.less', 'plugins/Morpheus/stylesheets/general/_forms.less', 'plugins/Morpheus/stylesheets/simple_structure.css', @@ -93,17 +93,18 @@ class Controller extends \Piwik\Plugin\Controller Common::sendHeader('Cache-Control: max-age=' . (60 * 60)); $files = array( - 'libs/bower_components/jquery/dist/jquery.min.js', - 'libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js', - 'libs/bower_components/materialize/dist/js/materialize.min.js', + "node_modules/jquery/dist/jquery.min.js", + "node_modules/jquery-ui-dist/jquery-ui.min.js", + 'node_modules/materialize-css/dist/js/materialize.min.js', + "plugins/CoreHome/javascripts/materialize-bc.js", 'plugins/Morpheus/javascripts/piwikHelper.js', 'plugins/CoreHome/javascripts/donate.js', 'plugins/CoreUpdater/javascripts/updateLayout.js', - 'libs/bower_components/angular/angular.min.js', - 'libs/bower_components/angular-sanitize/angular-sanitize.min.js', - 'libs/bower_components/angular-animate/angular-animate.min.js', - 'libs/bower_components/angular-cookies/angular-cookies.min.js', - 'libs/bower_components/ngDialog/js/ngDialog.min.js', + 'node_modules/angular/angular.min.js', + 'node_modules/angular-sanitize/angular-sanitize.min.js', + 'node_modules/angular-animate/angular-animate.min.js', + 'node_modules/angular-cookies/angular-cookies.min.js', + 'node_modules/ng-dialog/js/ngDialog.min.js', 'plugins/CoreHome/angularjs/common/services/service.module.js', 'plugins/CoreHome/angularjs/common/filters/filter.module.js', 'plugins/CoreHome/angularjs/common/filters/translate.js', diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png index 1a5195812a..cc5af8189b 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4825a38dcfbf7063e7ee0cd08a99b65082326074b1ed65d8fdec5db0e163cc2b -size 318592 +oid sha256:e10b74ab626934273f88e7602bb748ff8793106b7eb55fd82eb752d5bd92a96a +size 318163 diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png index 8ec43f90b3..8a89cdf9fa 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f799ff416c2d32bf1a1b2e7018b9e71a18c4c6a4ddc7194317207db2f1215b55 -size 319999 +oid sha256:2ccbc587b85f918b20502831627d589b1476b128870c8942b0e54eec1857a509 +size 319558 diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png index c1caeb4d03..2817aef897 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea8e475d3ed0ddfb78b141f40cdb7c030aa4958592c26a242f38c5a1297d49b7 -size 77439 +oid sha256:06c5db4eb9bfad47b3c84f35100d542b4116a1dcf8cb81f2aef3afb704685fd9 +size 77361 diff --git a/plugins/CoreVisualizations/angularjs/series-picker/series-picker.component.html b/plugins/CoreVisualizations/angularjs/series-picker/series-picker.component.html index 103df58343..94c4ee3535 100644 --- a/plugins/CoreVisualizations/angularjs/series-picker/series-picker.component.html +++ b/plugins/CoreVisualizations/angularjs/series-picker/series-picker.component.html @@ -20,12 +20,14 @@ class="pickColumn" ng-click="$ctrl.optionSelected(columnConfig.column, $ctrl.columnStates)" > - <input - class="select" - ng-checked="$ctrl.columnStates[columnConfig.column]" - ng-attr-type="{{ $ctrl.multiselect ? 'checkbox' : 'radio' }}" - /> - <label>{{ columnConfig.translation }}</label> + <label> + <input + class="select" + ng-checked="$ctrl.columnStates[columnConfig.column]" + ng-attr-type="{{ $ctrl.multiselect ? 'checkbox' : 'radio' }}" + /> + <span>{{ columnConfig.translation }}</span> + </label> </p> <p ng-if="$ctrl.selectableRows.length" diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js index b9be02415b..797c334f0b 100644 --- a/plugins/CoreVisualizations/javascripts/jqplot.js +++ b/plugins/CoreVisualizations/javascripts/jqplot.js @@ -456,7 +456,6 @@ function rowEvolutionGetMetricNameFromRow(tr) title: lang.exportTitle, modal: true, width: 'auto', - position: ['center', 'center'], resizable: false, autoOpen: true, open: function (event, ui) { diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 94ca8cd37547df506f9f1cfb13d2e324b4c2c25 +Subproject 8343157a67dba1b3d888b11b54226c2428331af diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 58b758bc2dc5503207a784918b0167d37eafb08 +Subproject d36a3d533408e8d4a1ea749f68a6e805334fa26 diff --git a/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png b/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png index 703ef218f9..2250c7b1ad 100644 --- a/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png +++ b/plugins/CustomVariables/tests/UI/expected-screenshots/CustomVariables_manage.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:923750a53e04b306ca0cc391714a44cea66146c8839f88a95f1c953865a67d08 -size 104847 +oid sha256:5f40c52a586e6af95bdb5de5ef6270233550bfaccdcfc45a6866bb6cf53998f9 +size 104289 diff --git a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png index 728709e0bc..adaae79658 100644 --- a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png +++ b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ba1a11dba92cd190560f4c556f5dcc3de90588346db5c45a6e98d954b15b69e -size 228111 +oid sha256:1dbbc6859be74b79e5f02739a83a9225d17299b9062b9bdb1e0026930d33d35d +size 226754 diff --git a/plugins/Dashboard/javascripts/dashboardWidget.js b/plugins/Dashboard/javascripts/dashboardWidget.js index 44ae768aff..58de03cad8 100644 --- a/plugins/Dashboard/javascripts/dashboardWidget.js +++ b/plugins/Dashboard/javascripts/dashboardWidget.js @@ -336,7 +336,6 @@ dialogClass: 'widgetoverlay', modal: true, width: width, - position: ['center', 'center'], resizable: true, autoOpen: true, close: function (event, ui) { diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less index 80d1583f1a..eba7a02835 100644 --- a/plugins/Dashboard/stylesheets/dashboard.less +++ b/plugins/Dashboard/stylesheets/dashboard.less @@ -14,6 +14,11 @@ body#standalone { } #dashboard { + #dashboardWidgetsArea { + margin-left: auto; + margin-right: auto; + } + #dashboardWidgetsArea > .col { min-height: 100px; // Customize Bootstrap gutter between columns diff --git a/plugins/Dashboard/tests/UI/Dashboard_spec.js b/plugins/Dashboard/tests/UI/Dashboard_spec.js index 8adb962b45..1a59213095 100644 --- a/plugins/Dashboard/tests/UI/Dashboard_spec.js +++ b/plugins/Dashboard/tests/UI/Dashboard_spec.js @@ -77,6 +77,8 @@ describe("Dashboard", function () { await page.waitFor(100); await page.mouse.move(-10, -10); + await page.waitForNetworkIdle(); + expect(await page.screenshot({ fullPage: true })).to.matchImage('widget_move'); }); diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png index 2eee5a776a..9c181c8f05 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38d947c12e5e179ed608ae854d7e4328c38e03dbcd7b4ca166874bd994d1a6b3 -size 313153 +oid sha256:11fc208937a2f5749da9475858ebec3a61ef0cb80618c962665f7f5c35607382 +size 314844 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index bc5a77d86c..63f8f1b2b3 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3f5466eb4242f52bc02c661eec97d05d4ed04d4d4a7541fd7eb29a1bf0e0c5a -size 471018 +oid sha256:71bc670bb16dd52f5ebbc98193c812f1db3658cad5a78da3c640f46d689a3f41 +size 472641 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png index d8e26253c8..887edd9e19 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4f2e454a129e6e834c506b13a569789a9c430021c6b5d95a208e6a86717c1fc -size 70727 +oid sha256:0fadb0a32a0315c3e078d4792387ceb0f9b52dfb25d3fd6000148f8850353eb1 +size 70677 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png index d2e7b67237..9cace76e8b 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcb564225d8f61fe6593786f145ab0577ec8a7fa2d02594c4241124a130c4848 -size 32431 +oid sha256:9f5a85118fa48e68a0a794066b2a81e6226410a61c951ee62845332139044737 +size 32264 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png index 56a1788660..5c4d9568ec 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b906690bbb52e769dbcce603fd9b9984274b0ec0482bb34c1e70e73f597aeb92 -size 375084 +oid sha256:8c45e5703dc1e9d3fd34b60036ed1c5dfc1fc0d2a80bb5396bb067bbd3d93ebe +size 375632 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rowevolution.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rowevolution.png index 961c7bc562..0adff1b9a2 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rowevolution.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_rowevolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0fedf748f622a703b01e596991f42bc734903c8a14e2d445098ecd322684a35 -size 71530 +oid sha256:171c4b01ef9c363be024e122f5fb2a56200009564e932016ac8d136a7f05ca13 +size 70595 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png index cc62e1b618..296b02264e 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_maximise.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:331927b385522d3eef5fba9933ae0b767ec008997dd457ac3b48b676ad989a0c -size 31323 +oid sha256:98a579476b4aac45499beff3e5bdd4f48576a0ad0c2c71c745f5223977a75e1b +size 31414 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png index 89317166c0..0ac0485743 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_unmaximise.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a22f3cfaf968005a671e4f6440aec5cb024ac42d7e3c1b61cae13ee1781c805f -size 30462 +oid sha256:74256d5ad3e09a43c173a76c9156e65039fac38e6e84ca27b05549d2e3456889 +size 30412 diff --git a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png index 7e5cbb6d74..854c7ac05e 100644 --- a/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png +++ b/plugins/Diagnostics/tests/UI/expected-screenshots/Diagnostics_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:116075bbcf139586a8c65093f40e7f8859bb8971c024ef26e64f14e9a576c253 -size 206665 +oid sha256:f39cc0efb52bb7769d680d0381e448b4fd4ba6b839a763b42d60ab10f4949c39 +size 206494 diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex 13cc83b2f0..9923d7d34c 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png index 40e271ec71..58a868a37e 100644 --- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png +++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c207a6390dd7a8b61b2253e0864a58ea3e9d509ffbee2df15fef70c919f3b67 -size 271004 +oid sha256:4d72c5afc12410fdbf9cd7e6e77be2233766c0fbf862ed01721db7be88c12cdd +size 270202 diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png index 0bf28a6ac1..224c0a9792 100644 --- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png +++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackPopup_feedback_popup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e8e23bd86b18f8361b1edba4b5a740669e09920c3b4edf2645e4444ef83de38 -size 28414 +oid sha256:bba18053ccadb255222933df4b40ba94e6a2f1180c6e9b06dece35bcdb48cd10 +size 27630 diff --git a/plugins/GeoIp2/templates/_updaterManage.twig b/plugins/GeoIp2/templates/_updaterManage.twig index f9b1b239b2..07c1db992f 100644 --- a/plugins/GeoIp2/templates/_updaterManage.twig +++ b/plugins/GeoIp2/templates/_updaterManage.twig @@ -40,7 +40,7 @@ <div piwik-field uicontrol="radio" name="geoip-update-period" ng-model="locationUpdater.updatePeriod" introduction="{{ 'GeoIp2_DownloadNewDatabasesEvery'|translate|e('html_attr') }}" - value="{{ geoIPUpdatePeriod }}" + value="{{ geoIPUpdatePeriod|default('month') }}" options="{{ updatePeriodOptions|json_encode }}" inline-help="#locationProviderUpdatePeriodInlineHelp"> </div> diff --git a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png index c891ba2548..a89f590431 100644 --- a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png +++ b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:910550abc9b207455c410f158751c76e49b7a1f9a7e99da20c66e5234d58d988 -size 152215 +oid sha256:05fc4722bfc064956f213d147348eebc1c6c89f0a5c3468bb7d55f0b0b294e0a +size 152053 diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index b39e03c621..2640efc26d 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -522,8 +522,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $files = array( 'plugins/Morpheus/stylesheets/base/bootstrap.css', 'plugins/Morpheus/stylesheets/base/icons.css', - 'libs/jquery/themes/base/jquery-ui.min.css', - 'libs/bower_components/materialize/dist/css/materialize.min.css', + "node_modules/jquery-ui-dist/jquery-ui.theme.min.css", + 'node_modules/materialize-css/dist/css/materialize.min.css', 'plugins/Morpheus/stylesheets/base.less', 'plugins/Morpheus/stylesheets/general/_forms.less', 'plugins/Installation/stylesheets/installation.css' @@ -543,14 +543,15 @@ class Controller extends \Piwik\Plugin\ControllerAdmin Common::sendHeader('Cache-Control: max-age=' . (60 * 60)); $files = array( - 'libs/bower_components/jquery/dist/jquery.min.js', - 'libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js', - 'libs/bower_components/materialize/dist/js/materialize.min.js', - 'libs/bower_components/angular/angular.min.js', - 'libs/bower_components/angular-sanitize/angular-sanitize.min.js', - 'libs/bower_components/angular-animate/angular-animate.min.js', - 'libs/bower_components/angular-cookies/angular-cookies.min.js', - 'libs/bower_components/ngDialog/js/ngDialog.min.js', + "node_modules/jquery/dist/jquery.min.js", + "node_modules/jquery-ui-dist/jquery-ui.min.js", + 'node_modules/materialize-css/dist/js/materialize.min.js', + "plugins/CoreHome/javascripts/materialize-bc.js", + 'node_modules/angular/angular.min.js', + 'node_modules/angular-sanitize/angular-sanitize.min.js', + 'node_modules/angular-animate/angular-animate.min.js', + 'node_modules/angular-cookies/angular-cookies.min.js', + 'node_modules/ng-dialog/js/ngDialog.min.js', 'plugins/CoreHome/angularjs/common/services/service.module.js', 'plugins/CoreHome/angularjs/common/filters/filter.module.js', 'plugins/CoreHome/angularjs/common/filters/translate.js', diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png index 20ac43f39e..f7c080b3dd 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_congrats.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92bf44ce1f73faa4c47f15f2a93a474d31977bae3e316bdf93d4037d259d571a -size 197253 +oid sha256:2a4f17d196d9eac3a7b67b957ff164dfbc0290a7cbc7d3cac6021cbc751ad306 +size 197341 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png index 65a2015fce..970b4baa4f 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_created.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b17e4b346e715a0f59c2105cbe912606f76f3ee57ed902ea10fe47d25543c5e7 -size 44592 +oid sha256:a1d87b1483312d63ac5f18f2db086fd2a35eea2213cf2866122b9f8970c36149 +size 44306 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png index 9fa53364dc..dc5f5b5941 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d776ad01d08d5af97bf46b0ff1fef2296d23d3f70627f8d2b3fdce0aff83535e -size 56760 +oid sha256:d6614f18a029016b58b878f8c924a18035b184b37879bb4d0605773490604422 +size 55967 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png index a3420608fb..aa77762378 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_db_setup_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a71284f14725c8910de69e6131926b35fde74c2e5cefc294e6467a344ae24472 -size 65948 +oid sha256:17647c289e082f0e9e1250e7564c80acb7fa5c1a9e0097e724ef717688a74f16 +size 65215 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png index 5a2467f16a..bf3a20799c 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36333c400e55951cfb66bb79d4aa029799927c655b0af1ed46d6b90edfbdd161 -size 239861 +oid sha256:a6f5e6034ef4353021b67bee75de9d6ae942157d7216917bf8600602e35aa31f +size 239288 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png index ae50c0bb5d..1c300ec2d8 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05723d3b9fd0964b531d8521d82f38ddfae9e7858161965d4fdb3ab1c6822a4a -size 77528 +oid sha256:1b82b249df3d2fb3c36121766be477bfdf745840fcdcba459fc90fd434a42348 +size 76932 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png index d4b304ed10..3640679b90 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:289d3963995836f34f28a8d7267db5cf7cc7d7424b08bbd6da35625adf5a2156 -size 82430 +oid sha256:9488358df739b760e23250f478c1f0611f38e24de7264c9bd8fabcfe25fb4866 +size 81796 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png index b591da9fce..e7774f4d4c 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_start.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9015c11e20e853283b57108c7ef0a6a6b048ececbb17b15dc970d980ac85157 -size 50642 +oid sha256:fede79745ca8c90d989a556286416183272296f9b22f22d521857c5d44f09904 +size 50371 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png index c4e083a3ef..3a7c771556 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:861b47bd63e385dc821c17ea0d03b55fb2ccffb859f197af5394cf7e6ac7746b -size 89603 +oid sha256:a0a65aacf8fecb4c1272cecd037570ecc688a021acf1b482f8b5c25067987214 +size 89703 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png index 78cbbebdd5..e9567e89fa 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_de.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e35a01b13411e38a785b341f70eab32577b3b9140653f7877b2bfd65b3cdc8e -size 106065 +oid sha256:0f1f4176f46a9ff2d47c7320ec7ffd21fbc442be44e2bd82e5589be7c0f4fe0c +size 105242 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png index 172f5c8e97..5e60623769 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_superuser_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a705b0d1d45e8477d9c4c055584736717e0aba329b86d77909b5e0a58865813f -size 103334 +oid sha256:289aae615382b63f2d3e10598d080762b6e9b31a58000c63be0819c85daaaecf +size 103605 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png index aeee5034ca..47942de204 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9692e2019e911bd5194068ae0699a5b91c65761c6a87b4e1f8394f1c8907320 -size 188686 +oid sha256:df2b60e2a5758d6d4d4873cee2443ca2a2611d6b8ec67b73609ef84238408938 +size 188564 diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png index 1819b78fed..3509f3fceb 100644 --- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png +++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_add_new_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc754c1f3cb78223c254314d775f49ddb7393c89bec72b40c882ba45ed8befeb -size 8846 +oid sha256:0f51b2683c2e1ab32986beb154bc519ad9b605050d3d08bc213fcb5ceaa4708e +size 8851 diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png index 6ed0669ca6..86ecbf9ede 100644 --- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png +++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8608b130f668b68611f2f870002d084a9d91134281af2a1d9035b51537be8c3 -size 255304 +oid sha256:1abae63d40daf743aa195ed70d536bc560744e17079db2a7090366b010224b43 +size 252367 diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_created.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_created.png index 7e69712e3f..9dad89fa45 100644 --- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_created.png +++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_created.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bfe93cecb69ecc9a34bd8c6879a616206c973d9ddfcfff7c8a3a166ada8b0e3 -size 14283 +oid sha256:b6309f4927c39960cc8be8af19b1641e141912a7a904364a85ed29f5ed7f2233 +size 14280 diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php index f5f7cb1c4e..855ed752fa 100644 --- a/plugins/Live/Live.php +++ b/plugins/Live/Live.php @@ -60,7 +60,7 @@ class Live extends \Piwik\Plugin public function getJsFiles(&$jsFiles) { - $jsFiles[] = "libs/bower_components/visibilityjs/lib/visibility.core.js"; + $jsFiles[] = "node_modules/visibilityjs/lib/visibility.core.js"; $jsFiles[] = "plugins/Live/javascripts/live.js"; $jsFiles[] = "plugins/Live/javascripts/SegmentedVisitorLog.js"; $jsFiles[] = "plugins/Live/javascripts/visitorActions.js"; diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less index 9a0e4730a6..5f121dce8c 100644 --- a/plugins/Live/stylesheets/live.less +++ b/plugins/Live/stylesheets/live.less @@ -387,6 +387,11 @@ ol.visitorLog p { .dataTableVizVisitorLog { + .card.row { + margin-left: 0; + margin-right: 0; + } + .card { padding: 15px 0; font-size: 13px; diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less index b60ecbc885..d8e0ccbd12 100644 --- a/plugins/Live/stylesheets/visitor_profile.less +++ b/plugins/Live/stylesheets/visitor_profile.less @@ -342,6 +342,7 @@ color: @theme-color-text; cursor: pointer; background-color: @color-silver-l95; + margin-right: 2px; &:hover { background-color: #bfbfbf; diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png index bc80f60cfc..465c57a732 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6d9430573d5ccfa8bcbfa5c42118dac73d078904e2ff9bfed305e33659680c2 -size 418209 +oid sha256:0fd576f89fd7139b2b99cc3d74bb53a24a1eb504367345147e872eb3683e4d7d +size 420703 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png index 8029187c5b..2e6ba484f6 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a88a1bdfd0d14ae3b00c9627ff62e1b696daa7f2fade019e4f275daf6713a9d -size 294504 +oid sha256:4157f3c20d56c69196f6c26e238deec778af0c8deccab2789fb908a72ab60ccf +size 295467 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png index 219f74b164..14602039ba 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ce98d7c88cc0c96ad7705d0b6cfc6de61cb1d79985057fa609debd589c0991a -size 260536 +oid sha256:a86335642665ca83cc69bd8959ee4a008b49685fac4c27f395af3a881c06459b +size 261466 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png index af61c3cd70..aef56d4c49 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_limited.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79e1954b46ed0670a56a720cfef1f4d99b31ef51562ae61f0a4c67db8a03900e -size 310152 +oid sha256:634cf1607afff06b53f8271a396609f99007b6f232b3180737f18134f002c59d +size 311307 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png index 41a509e144..5b96cd2aab 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_more_visits.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a160b52491bcf67df211b8154811540a90dcc25ba563f5ee6fb53327594e0401 -size 443899 +oid sha256:9ad04b14e25cde7e7f652ed85062234c5262bb69ee5fdcac4db60ef73e480e00 +size 446995 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png index 0cb5fd0da0..784fa33af7 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0043c49ef3cda849ce7f9aade26f38339542f2d897647d9623ca35e9929747c -size 270115 +oid sha256:2f5dd1cac6c258501d45b1b453894d3c6c7cb2d99fd031b895ab48e3deb0c2dc +size 271129 diff --git a/plugins/LogViewer b/plugins/LogViewer -Subproject 033e68f4d76869597ebe9ffb8c4e0f1c5c26a3b +Subproject 4e2f78a89def2b092407eb3ac6b9d5966e088c4 diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index 51c6612024..e2e9ecf6f0 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -45,9 +45,11 @@ <div class="row actions"> <div class="col s12"> - <input name="form_rememberme" type="checkbox" id="login_form_rememberme" value="1" tabindex="90" - {% if form_data.form_rememberme.value %}checked="checked" {% endif %}/> - <label for="login_form_rememberme">{{ 'Login_RememberMe'|translate }}</label> + <label> + <input name="form_rememberme" type="checkbox" id="login_form_rememberme" value="1" tabindex="90" + {% if form_data.form_rememberme.value %}checked="checked" {% endif %}/> + <span>{{ 'Login_RememberMe'|translate }}</span> + </label> <input class="submit btn" id="login_form_submit" type="submit" value="{{ 'Login_LogIn'|translate }}" tabindex="100"/> </div> 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 fd76426ee7..2fdef7804e 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:5e08af9731f42d919d0c29ba9c82741e6fee7dd3f4356e4c3182edbb6a9b1299 -size 90439 +oid sha256:c30a56aaae4a21983a6dfc85e1c0a262ec07dd03ce517c6901c3d217aa05c2db +size 90243 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 45e929d637..00efad964b 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:138c22b97b45953241536b6dd7923fea59b6f21689d09f666c56b5e0981fef82 -size 108220 +oid sha256:bea984631435dc33f453d9f99174172652e330f88e6d5f05367f604c81996a44 +size 107958 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png b/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png index 46922f3c4d..99c26f4e99 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_forgot_password.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ea34be0961e303f26c0cf47371b772d1addfa70f2187c08a2779e8bbc5cac86 -size 30413 +oid sha256:fea5ee9852b785db6bf4807bc3097055383ceedb44f6d15cc55f26bceaf98956 +size 29934 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png index 5eda7a8939..983318fb64 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:600800bd2dc58ebd5fb2dfbe131052d4df6796c17aa180d9e7033ec616d1f2d0 -size 32131 +oid sha256:1b0f2591ce9a6bb387980941bf109f654f5ac79776fa253256ffbef6adcf0b71 +size 32034 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png index 4c9df88e3e..92b9b407b7 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd8cb30e4d747155d1f73da36b337dcfe72f79b806e381c01ceda5370abf9791 -size 24749 +oid sha256:747ed4268328512117426c37c653f0e812276f348ae72da7585c3dd9ca0e8278 +size 24643 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png b/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png index 4c9df88e3e..92b9b407b7 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_login_form_logout.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd8cb30e4d747155d1f73da36b337dcfe72f79b806e381c01ceda5370abf9791 -size 24749 +oid sha256:747ed4268328512117426c37c653f0e812276f348ae72da7585c3dd9ca0e8278 +size 24643 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png index 6b8d1766d2..d185c34b07 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e0a65c5c55f94da87c6c86ab3bab41fcc3df751b30cbfd1cb2dfce154bd559a6 -size 35131 +oid sha256:9fcc817e7ee5912d68b32cf776144b27dd98bc616f25b5c51c17728b1acb0e9e +size 35064 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png index 2c09ad2377..88301001ae 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_complete.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c720b16c64dd640f39ef30bd39d1744d8de93d83c8fe31d7fa62742e1929c34e -size 29425 +oid sha256:fb2d3b95fb139ca7f56c4f9a4895ef3902af26697661b75a83f078895c403807 +size 29296 diff --git a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png index 56bdb9097c..0f411b3ed9 100644 --- a/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png +++ b/plugins/Login/tests/UI/expected-screenshots/Login_password_reset_error.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2072644047b1119ffd9bd24b35e9ec56e0f46a41c101bfefebaf172ea6550174 -size 39293 +oid sha256:9fe053b046f9d701b8fddb21ba3e266c808fbd58af106fe5d3b4a789da0860ec +size 38912 diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject 4ad0e37240a6714376fd80a407e259b884802e3 +Subproject 0bbac4ead6a6ee2cad1e61f7a5e7c399cb60ff0 diff --git a/plugins/Marketplace/Marketplace.php b/plugins/Marketplace/Marketplace.php index f8363eb8e7..a07ef9b1d0 100644 --- a/plugins/Marketplace/Marketplace.php +++ b/plugins/Marketplace/Marketplace.php @@ -57,7 +57,7 @@ class Marketplace extends \Piwik\Plugin public function getJsFiles(&$jsFiles) { - $jsFiles[] = "libs/bower_components/iframe-resizer/js/iframeResizer.min.js"; + $jsFiles[] = "node_modules/iframe-resizer/js/iframeResizer.min.js"; $jsFiles[] = "plugins/Marketplace/angularjs/plugins/plugin-name.directive.js"; $jsFiles[] = "plugins/Marketplace/angularjs/licensekey/licensekey.controller.js"; diff --git a/plugins/Marketplace/stylesheets/marketplace.less b/plugins/Marketplace/stylesheets/marketplace.less index eedf9e7ec9..6b74a9c1af 100644 --- a/plugins/Marketplace/stylesheets/marketplace.less +++ b/plugins/Marketplace/stylesheets/marketplace.less @@ -26,8 +26,11 @@ } .licenseToolbar { - > a, > div:not(.licenseKeyText) { + > a, > div { margin-right: 16px; + } + + > a, > div:not(.licenseKeyText) { white-space: nowrap; } } diff --git a/plugins/Marketplace/templates/plugin-details.twig b/plugins/Marketplace/templates/plugin-details.twig index a24cbb3e86..43d7774c64 100644 --- a/plugins/Marketplace/templates/plugin-details.twig +++ b/plugins/Marketplace/templates/plugin-details.twig @@ -283,8 +283,10 @@ } {% endif %} + $('#pluginDetailsTabs select').material_select(); + $('#pluginDetailsTabs .tabs').tabs(); - $('#pluginDetailsTabs .tabs').tabs('select_tab', active >= 0 ? active : 0); + $('#pluginDetailsTabs .tabs').tabs('select', '#tabs-' + (active >= 0 ? active : 0)); $('.pluginDetails a').each(function (index, a) { var link = $(a).attr('href'); diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png index 7579f33a04..c577b0fafa 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bd5df60370e86007a0249876f6cc63cd75e94dd86be751d2c67f1817b55a9be -size 62736 +oid sha256:988793ced1e9a478872bd673acd607be8901d6951c322b31226e6424f6d4ae8f +size 64335 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png index cfe3d0f245..3e4b1a8bfa 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b21392f24a80cbf3c9353eeadd834e03f537850f202b5e89d03b75bdb8d2561 -size 46068 +oid sha256:71e854b225230373f15d4aa61017076ca9a3ba95bfd4fe2b26580cde993aa51e +size 47871 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png index f84cd72bb8..f6d2579c1c 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_free_plugin_details_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12d7628295074bf71962e82ee57f4bb6dac83b868feb8b3a36cf3abf2a4dff16 -size 44394 +oid sha256:01de68e6fb414ace23c96991d629b17f1d0702bdf930f6bcc8f5de2ccdb4dc98 +size 45796 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png index de43be2f80..cf97096475 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc6813734b77af09c9328118a5e1885de2010841bced08f9276b5a67f486f0b4 -size 106037 +oid sha256:0a53b44050672b5bc722a3ba897e1611b271d61fe8c5986ddf447af86af8f4fa +size 107029 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png index 5e533857e4..60519d6d20 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff01d33fd6c96db48de6e8c2d3fc30fa6b4f6f1068f8b0a855fd71a8dcc93743 -size 89083 +oid sha256:87795ec9b8e6856457db7206bf6fa88b4662540a93478e1384a5ed9dd5837ece +size 90193 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png index 2b3022fe09..631a11f55a 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_exceeded_license_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91bf0af7c2b74ce266db6b825234384293e4812e744b83fc20b1b4a424d308ef -size 75747 +oid sha256:dd90a3a991cf25eff7f6cbb888deaaac9f246086feb7e8e3e2275d73f04eadfd +size 76180 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png index 36c6f057cf..902bfd00e6 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c73cb54587eba915e8d398eaf6f15e304470b186f8a52aa29ce8876a8fcdaf1a -size 106258 +oid sha256:23ee17bc6882bdc8c154632207b1553d274758d955d35540861804b951d938bb +size 106455 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png index 92f342dfe6..43dbdecdf6 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42689934d561c6fd45b3c38ebd6b61038c55adeba11abb41607a6660e666a936 -size 89723 +oid sha256:8dfd6b2decc446b475a1eff2a93d937e546b520861ccbc65d3f0859cec4938fb +size 90142 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png index b4ab353431..6961ba62d4 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_no_license_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2f0491ba3bd45addae5482b365db38b1d86b0f6b38321941e72eb78673e7b82 -size 75371 +oid sha256:20a42aa2b08a30fe739e1b8e430025256c3c175cebd10703cda2738524e4883f +size 75797 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png index 87432f9d9b..67ad927c5b 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_multiUserEnvironment_installed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e8141d0c04d2f69eff85097098538aed720812c96bfec8a9cd7a6e4637ede24 -size 90389 +oid sha256:c7734014cfad92514f7a47bf58ffc4592d3a2b6e42e22376480de52230a7f017 +size 91176 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png index fb99167ee7..7b484f30ad 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_superuser_installed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b6ca44ac048a18cba1a2d12f7c01620b2e970e3d08c3a256db99aeacc4ac658 -size 72802 +oid sha256:2def3adebb908aea813d83008af801ab257e3a6f743e5de460f60540e7eee75e +size 73521 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png index 88ebf4312e..a9bc09f09f 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugin_details_valid_license_user_installed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff37ac7d254ad29cb1be0505a8c75c5a9cad3f4b6e5f8558458afc04de730a6f -size 72046 +oid sha256:12d3167941e272a6d749131262229eb53c6813f626dc7b1bd8ecd55751640e0e +size 72673 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png index 960b916dcf..b5d34a9324 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6122d2358736c49d9ef87d59d739527309aa8303dc1d6c73ba6744a98454a514 -size 56517 +oid sha256:f20f760fd2d925ddc88fcc7bb567bb0157747a66f6eb9fda35e424916ce44223 +size 56241 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png index 960b916dcf..b5d34a9324 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6122d2358736c49d9ef87d59d739527309aa8303dc1d6c73ba6744a98454a514 -size 56517 +oid sha256:f20f760fd2d925ddc88fcc7bb567bb0157747a66f6eb9fda35e424916ce44223 +size 56241 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png index 2f2f0a9543..cea76e6973 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_no_license_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7ee520dddf027138bcb0f39e5e6831bcef682624db3ac2cc7b8725ec3da77b8 -size 57157 +oid sha256:1a279a479b39c396e08efa6bfb3bb7eeda5912b62d8444272e32482cbd0f434e +size 57017 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png index 9e9c884303..7845a39027 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c540ec4628dfcc4524abeb4dd5b47f4c2836811fb3f05881de66e917192da6ae -size 65679 +oid sha256:88512c74a009c571a521727c2e8fc772f2b3a2dd9de3c15d7e41f42b3acb0cee +size 65473 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png index 9e9c884303..7845a39027 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c540ec4628dfcc4524abeb4dd5b47f4c2836811fb3f05881de66e917192da6ae -size 65679 +oid sha256:88512c74a009c571a521727c2e8fc772f2b3a2dd9de3c15d7e41f42b3acb0cee +size 65473 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png index 41fba79ff7..516aa0f712 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_exceeded_license_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ac3376eb4bc4a87a6eb71b12eb021be61bd9c0f83b84b9b4d63a3694a87ed66 -size 46234 +oid sha256:6413777ef0245c97889ca8d2fd93c66d7166e3f10740213993220278859e0e88 +size 46097 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png index 38c178a3aa..57ef576086 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:385b8b6028e9e9f97960cc47d79b1085ad4cd4bc68ea4e0475fd325246829907 -size 67001 +oid sha256:4611cd4efc8ce354eaec8cc76d1495e1884536b6f952f2ec589a419828eabe6a +size 66793 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png index 08c705af33..c9fd364467 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcabbcec0eaa523c1b7ad88e3a1a0ed74b05abcdd7837d12b88e017af84469a6 -size 67118 +oid sha256:6ec4fac2f476aa8cddbf89404e3303a9f7296db48c13e0fad8f6ad1ff37e63f4 +size 66886 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png index afcd3de497..5a6a3f8234 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_paid_plugins_with_license_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1363e6fe0177c6cd7997a23fbf666e4d0f00c3a7d55989437eae1cc18955d0d -size 48701 +oid sha256:0b73c389693004fafa3f51f5c216daada8ab081f9bb3d586c597cd50e7120079 +size 48567 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png index 5dbded552a..9b42fce88f 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_exceededLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ad448fbd6f2cee688cc29e5281fb195a52cd6a43476b35c2ee611858782651d -size 74516 +oid sha256:d2ee97122303e5b239be255f0fd42f4459cec2a0ae320a95f159e7920d5f667d +size 74328 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png index b89be0e23a..4225878d21 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_expiredLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94525dedfe95d84a11a24d9f750f49a75eb199ada1325931c714e2a1e43a1440 -size 80896 +oid sha256:feaf4c4cdfca77795e6c3327a599be889ec4181a54362f1823e8deb092d779ed +size 80720 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png index bd9be0147b..fac412e14a 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_noLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d128611911d917cf931a0a79f90d491e80dea2001f1dfd041dec0e0a7cdf9c54 -size 17557 +oid sha256:089e579604cc4eec966dfcd9c2c591b29c0ae6e3016aa7776404a69d2dfa9eec +size 17428 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png index 9892dc2b47..f15b515e40 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_subscription_overview_validLicense.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f1127f3e932cf5f79226d3f24c0aacf93a7662b789c6e980f5f6d3197483942 -size 53807 +oid sha256:0492a19d58e8a94dad2e81dd885af338f6b81c294274c9aba8a20068ac055163 +size 53588 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png index f752d822fa..78a8305f4d 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6836b2e285eca7d37569be247694a55760b07f9af8a628eeb262790db942aeb4 -size 824077 +oid sha256:3cc756c501bb3b1f03722ae3f0feb29b4883cb95a2f5fd6f1a676fd9b680cb9f +size 821752 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png index b81f9c61ad..d66b8cfb0c 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ceaca148b283b0e26cf2e5f167a267696b8750c42212b41a173d49cf1effd0b -size 850516 +oid sha256:083d400cf94feb03571dc87d8bddf6c54da5e3e4e03d50d2f434568fdb1dcc9a +size 848215 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png index 2a688348f3..a97ede757c 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_install_all_paid_plugins_at_once.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3875a88ebbb05bbc85360104df643855d02d6f3edffd0fb6c69c770dd6386d0a -size 16483 +oid sha256:1812491e5f56cd36c5a37ee7c1c09690352a2bcdc96df2666b8983c2c666aa0c +size 15498 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png index 735b288c62..61ef3ff1f5 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ec59bafe93601c798de859666219cc4968566d16f804c5450bc15f9a9d593f6 -size 841530 +oid sha256:34925a1fea456c1030edf370c2f249551a44ed8c1a7c02e42fc5ff07e0a40488 +size 839685 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png index d89c591ca9..ffa6066394 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8df23b519e18b5e0fab17464e962d878dc664de202c935ece00ede48b6559ec9 -size 13574 +oid sha256:ba88c0b667ba89d571d4b7d76c7ec3e132aba47dddf11e7f7ac9cea3869b4c4a +size 13233 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png index d41d44e590..3bd676466c 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af0b24e96ed09a45506453aba2c5d2ad49d2cf8777f07c0f697b320ff0809a2e -size 837096 +oid sha256:32ecc3c78b5952bfeb8900bec12a54934e95c32c38abf1ac92fb5c946e6f8fb1 +size 834309 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png index 72ad13179c..9669c9364d 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c50bdf911e20232c8ff8c20e57e25a2909f935ee16d0e0cc1b38c3586d84aad -size 845919 +oid sha256:86bca5a499a238696371c0ba8b5031fe28f3a5acdecc18be801990d66929c98f +size 843442 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png index 55a8ceb04d..27728202a6 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8100c2a4030a145d46c1396b0db5b57644150e042e2477705cf715264cd8b826 -size 165095 +oid sha256:f81df66dbe5ac0a178a0d7c619cbe8a2c86d76d1e19ea858067eeb59db94724e +size 164467 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png index a3a6923688..69c3af4990 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c1d95074aa86a8d33c0b583a3ce4cc10e0eb831c11dbba3651a3b6edef52c53 -size 162141 +oid sha256:babb545e93278d12e0d0899a46b4e9e8b42d285f3c9f9a67417b27eb5468f3af +size 161527 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png index a2167ae96e..520daa0d7d 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_themes_with_valid_license_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d35925b43643543741838d9c13858f783d633aad043ca055168b07069afed4a -size 140327 +oid sha256:eaf80749b8df625ee0072a18d44c7cc53c702fb0e0f89fe2ff032fddf4d046a0 +size 139906 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png index 471467cb03..23a4d2155d 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1087d60fce3295147b6e6a0cbbb2ffcb25114f6205b2bb1029da1f8997fe06b7 -size 34392 +oid sha256:1f2c89ade13fac9d0b808900ac20466815079ca14b8bcf1ac9abaed59ac79db4 +size 34054 diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png index 690a783807..841400a5bd 100644 --- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png +++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da6fedb5623359bb700804f00e1aa63ec869fa8d4e636fb4b1c2fcf02b402163 -size 34006 +oid sha256:3b7901e6a6d9ebcab717915d729858fd926132f53ff624ef827b948e5392c408 +size 33694 diff --git a/plugins/Morpheus/javascripts/piwikHelper.js b/plugins/Morpheus/javascripts/piwikHelper.js index 7d7dd42b48..93ecbff3a5 100644 --- a/plugins/Morpheus/javascripts/piwikHelper.js +++ b/plugins/Morpheus/javascripts/piwikHelper.js @@ -321,7 +321,7 @@ var piwikHelper = { } domElem.show(); - $content.openModal(options); + $content.modal(options).modal('open'); }, getQueryStringWithParametersModified: function (queryString, newParameters) { diff --git a/plugins/Morpheus/stylesheets/base.less b/plugins/Morpheus/stylesheets/base.less index 65663b34c6..d4ab2c11e9 100644 --- a/plugins/Morpheus/stylesheets/base.less +++ b/plugins/Morpheus/stylesheets/base.less @@ -3,6 +3,7 @@ @import "base/colors"; @import "base/mixins"; + /* General styles */ @import "general/_default.less"; @import "general/_utils.less"; diff --git a/plugins/Morpheus/stylesheets/general/_forms.less b/plugins/Morpheus/stylesheets/general/_forms.less index 51875dd025..1da74a266e 100644 --- a/plugins/Morpheus/stylesheets/general/_forms.less +++ b/plugins/Morpheus/stylesheets/general/_forms.less @@ -72,6 +72,7 @@ input.browser-default { background-color: @theme-color-brand !important; } +[type="checkbox"]:checked + span:not(.lever):before, [type="checkbox"]:checked + label::before { border-right-color: @theme-color-brand; border-bottom-color: @theme-color-brand; @@ -82,7 +83,8 @@ nav.blue-grey.darken-3 { } [type="radio"]:checked + label::after, - [type="radio"].with-gap:checked + label::after { +[type="radio"].with-gap:checked + label::after, +[type="radio"]:checked + span::after { background-color: @theme-color-brand; border-color: @theme-color-brand; } @@ -99,6 +101,20 @@ input:not([type]):focus:not([readonly]), input[type=tel]:focus:not([readonly]), input[type=number]:focus:not([readonly]), input[type=search]:focus:not([readonly]), + textarea.materialize-textarea:focus:not([readonly]), + + input:not([type]):focus:not([readonly]), + input[type=text]:not(.browser-default):focus:not([readonly]), + input[type=password]:not(.browser-default):focus:not([readonly]), + input[type=email]:not(.browser-default):focus:not([readonly]), + input[type=url]:not(.browser-default):focus:not([readonly]), + input[type=time]:not(.browser-default):focus:not([readonly]), + input[type=date]:not(.browser-default):focus:not([readonly]), + input[type=datetime]:not(.browser-default):focus:not([readonly]), + input[type=datetime-local]:not(.browser-default):focus:not([readonly]), + input[type=tel]:not(.browser-default):focus:not([readonly]), + input[type=number]:not(.browser-default):focus:not([readonly]), + input[type=search]:not(.browser-default):focus:not([readonly]), textarea.materialize-textarea:focus:not([readonly]) { border-bottom-color: @theme-color-brand; box-shadow: 0 1px 0 0 @theme-color-brand; @@ -119,3 +135,8 @@ input:not([type]):focus:not([readonly]) + label, textarea.materialize-textarea:focus:not([readonly]) + label { color: @theme-color-brand; } + +abbr[title] { + border-bottom: 1px dotted; + text-decoration: none; +}
\ No newline at end of file diff --git a/plugins/Morpheus/stylesheets/general/_jqueryUI.less b/plugins/Morpheus/stylesheets/general/_jqueryUI.less index a1985a8174..744605f6bf 100644 --- a/plugins/Morpheus/stylesheets/general/_jqueryUI.less +++ b/plugins/Morpheus/stylesheets/general/_jqueryUI.less @@ -135,6 +135,11 @@ div.ui-state-highlight { border-color: #f1f0eb !important; } +.ui-datepicker-month, +.ui-datepicker-year { + font-weight: bold; +} + .ui-datepicker table { font-size: 11px !important; margin: 0 !important; diff --git a/plugins/Morpheus/stylesheets/general/_misc.less b/plugins/Morpheus/stylesheets/general/_misc.less index e3d53d0eef..4e52afacf4 100644 --- a/plugins/Morpheus/stylesheets/general/_misc.less +++ b/plugins/Morpheus/stylesheets/general/_misc.less @@ -45,3 +45,7 @@ padding: 0 !important; } } + +.card .card-content { + padding: 20px; +} diff --git a/plugins/Morpheus/stylesheets/main.less b/plugins/Morpheus/stylesheets/main.less index 659a5af4ac..9d83d20418 100644 --- a/plugins/Morpheus/stylesheets/main.less +++ b/plugins/Morpheus/stylesheets/main.less @@ -699,4 +699,4 @@ tr:hover #token_auth { .ui-tooltip { z-index: 9999; -} +}
\ No newline at end of file diff --git a/plugins/Morpheus/stylesheets/ui/_buttons.less b/plugins/Morpheus/stylesheets/ui/_buttons.less index 3da64f2b0f..360da2620a 100644 --- a/plugins/Morpheus/stylesheets/ui/_buttons.less +++ b/plugins/Morpheus/stylesheets/ui/_buttons.less @@ -60,6 +60,7 @@ input[type="submit"].btn, cursor: not-allowed; filter: alpha(opacity=65); opacity: 0.65; + color: white !important; } // See http://getbootstrap.com/css/#buttons-options .btn.btn-noop { @@ -69,3 +70,7 @@ input[type="submit"].btn, cursor: not-allowed; box-shadow: none; } + +.btn, .btn-large, .btn-small, .btn-flat { + padding: 0 2rem; +}
\ No newline at end of file diff --git a/plugins/Morpheus/stylesheets/ui/_components.less b/plugins/Morpheus/stylesheets/ui/_components.less index 87b8aa10df..d0aadea058 100644 --- a/plugins/Morpheus/stylesheets/ui/_components.less +++ b/plugins/Morpheus/stylesheets/ui/_components.less @@ -29,8 +29,9 @@ } } + .ui-datepicker-title select { - font-size: 10px; + font-size: 11px; } } @@ -192,11 +193,11 @@ .ui-menu { .ui-menu-item { - a { + > .ui-menu-item-wrapper { color: @color-silver-l20; text-transform: uppercase; .font-default(10px, 18px); - + margin: 0; padding: 2px; } } diff --git a/plugins/Morpheus/stylesheets/ui/_navs.less b/plugins/Morpheus/stylesheets/ui/_navs.less index 644ad7f22e..4848263e8b 100644 --- a/plugins/Morpheus/stylesheets/ui/_navs.less +++ b/plugins/Morpheus/stylesheets/ui/_navs.less @@ -60,3 +60,7 @@ } } } + +nav .sidenav-trigger { + margin: 0; +}
\ No newline at end of file diff --git a/plugins/Morpheus/stylesheets/ui/_popups.less b/plugins/Morpheus/stylesheets/ui/_popups.less index 93d9a00499..2144a2940a 100644 --- a/plugins/Morpheus/stylesheets/ui/_popups.less +++ b/plugins/Morpheus/stylesheets/ui/_popups.less @@ -1,3 +1,8 @@ +.ui-dialog { + left: 50%; + transform: translateX(-50%); +} + .ui-dialog-title { color: @theme-color-text; font-weight: normal; @@ -49,10 +54,13 @@ button.ui-state-default, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, - .ui-widget-header .ui-state-focus { + .ui-widget-header .ui-state-focus, + .ui-menu .ui-menu-item a.ui-state-active, + .ui-widget-content .ui-state-active { border: 0 !important; } -.ui-menu .ui-menu-item a.ui-state-focus { +.ui-menu .ui-menu-item a.ui-state-active, +.ui-widget-content .ui-state-active { background: @color-silver-l90; } diff --git a/plugins/Morpheus/stylesheets/uibase/_periodSelect.less b/plugins/Morpheus/stylesheets/uibase/_periodSelect.less index f14fc64fd2..8b0f909ba2 100644 --- a/plugins/Morpheus/stylesheets/uibase/_periodSelect.less +++ b/plugins/Morpheus/stylesheets/uibase/_periodSelect.less @@ -66,8 +66,10 @@ } #periodString .period-type label { - font-size: 13px; - white-space: nowrap; + &, span { + font-size: 13px; + white-space: nowrap; + } } #periodString label.selected-period-label { diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig index c0a881c6d6..bf5ffe1843 100644 --- a/plugins/Morpheus/templates/demo.twig +++ b/plugins/Morpheus/templates/demo.twig @@ -335,7 +335,7 @@ </div> <div piwik-field uicontrol="multiselect" name="phonenumbers" data-title="Phone numbers" - value="1" + value="["1"]" inline-help="Multi select" options='{1: "0123456789",2:"9876543210",3:"5432109876"}'> </div> diff --git a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png index fe75a07154..d6d2759dc6 100644 --- a/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png +++ b/plugins/Morpheus/tests/UI/expected-screenshots/Morpheus_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:549423219ddc1a7e675f6ef2b988469e32f719dfcbb193cbc12c50555f261826 -size 1662885 +oid sha256:7c35dd1236c2a696d42c21337259008a217c99b86f2c70e6d048913416445052 +size 1665459 diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html index 5a8eac3aa1..ee973caa50 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html @@ -111,15 +111,18 @@ </td> </tr> <tr row_id="last"> - <td colspan="8" class="input-field site_search"> - <input type="text" - ng-model="searchTerm" - class="browser-default" - piwik-onenter="model.searchSite(searchTerm)" - placeholder="{{ 'Actions_SubmenuSitesearch' | translate }}"> - <span title="{{ 'General_ClickToSearch' | translate }}" - ng-click="model.searchSite(searchTerm)" - class="icon-search search_ico"></span> + <td colspan="8" class="site_search"> + <div class="row"> + <div class="input-field col s12"> + <input type="text" + ng-model="searchTerm" + piwik-onenter="model.searchSite(searchTerm)" + placeholder="{{ 'Actions_SubmenuSitesearch' | translate }}"> + <span title="{{ 'General_ClickToSearch' | translate }}" + ng-click="model.searchSite(searchTerm)" + class="icon-search search_ico"></span> + </div> + </div> </td> </tr> diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less index 8173e4cdc8..4594c84bba 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less @@ -134,11 +134,21 @@ padding-right: 25px; width: 250px; height: 3rem; + padding-left: 5px; + } + + .site_search { + label { + position: static; + } + .row,.input-field { + margin-bottom: 0; + } } .search_ico { position: relative; - left: -20px; + left: -30px; top: 1px; cursor: pointer; font-size: 16px; diff --git a/plugins/MultiSites/tests/UI/MultiSites_spec.js b/plugins/MultiSites/tests/UI/MultiSites_spec.js index 1283e0fd36..d043ec0fda 100644 --- a/plugins/MultiSites/tests/UI/MultiSites_spec.js +++ b/plugins/MultiSites/tests/UI/MultiSites_spec.js @@ -35,9 +35,11 @@ describe("MultiSitesTest", function () { }); after(async function() { - await createdSiteIds.forEach(async function(createdSiteId) { - await testEnvironment.callApi("SitesManager.deleteSite", {idSite: createdSiteId}); + const promises = createdSiteIds.map(async function(createdSiteId) { + return testEnvironment.callApi("SitesManager.deleteSite", {idSite: createdSiteId}); }); + + await Promise.all(promises); }); it('should load the all websites dashboard correctly', async function() { diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png index 117c1c487e..0b98291389 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1de998641f2c9250d94cb4459109e3ec09b06b332aad4b9c44d5b2a2196c0f80 -size 276492 +oid sha256:22c9f21dfffd0e9e8cf0efbcea24b3919bc4c96fd033f2e43a713f870094fba9 +size 276451 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png index 7375cfcf2d..f6a7ff601b 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2474afdb12676e178ae8e7a600786dadb1b2f269f56cfc37ad57fad34ce7eda1 -size 55382 +oid sha256:bba9d7cdf5d42a3b80e577b8aa3ac0ea96175601272f1db90b7b3af33a9e7801 +size 55323 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png index 5e02f0f65f..e5433cd71e 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80ab2295dbcccfa8c8b15d6bbdeca5cc12f6cfb88ef8a28ac8a427185e1455d6 -size 72053 +oid sha256:336f7e12aaacab87d8582a57d08d88160d52289a805d7eebdac69c9a2dffac42 +size 72089 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png index d6aa88e8fd..c34c364736 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75335a68479b5fd8088a5e4cc6ed41eac19e192938254b7270e01a4991d4b69b -size 240838 +oid sha256:d5027ee6e55f8008f9e5a82dcd83df66fb0c91a4baae61db42101fca6fceb99b +size 240792 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png index f06efe2f82..3837a67212 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ea0d0dbb35a4f9cf3bf4cb6c6b1d4d315a3fe7349d1fe9e141fb631b4a7afbf -size 55347 +oid sha256:100c0d1ae1eec57443042e6fc15cde206298e7e51aa942623c73d797a1dac2c2 +size 55292 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png index e19f8379e6..b07604fecf 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_framed_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39badf326a52a7a21c7c1169a6b114891b20e92047c3a84cab03a75c9201c75f -size 109007 +oid sha256:aa5f59d0b9e6ca222148413cf8647016f8840edf8f9180f9233de637f98891e9 +size 108969 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png index e19f8379e6..b07604fecf 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39badf326a52a7a21c7c1169a6b114891b20e92047c3a84cab03a75c9201c75f -size 109007 +oid sha256:aa5f59d0b9e6ca222148413cf8647016f8840edf8f9180f9233de637f98891e9 +size 108969 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png index ed1f271099..34db32a0c5 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1827820f21e95af1d45544c051639e0eccd4be8ac4d3a230abd31ff94dde7cd -size 106585 +oid sha256:ed8909cef4da65cf3af9975477aed5421235b8ba18defebbce984b2a1e0e6db3 +size 106521 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png index b3741efbe5..18e5a99055 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3be33b1792563f18c953a0fd29c8f73bf8e9c7f83ae24169c1e6d0abed3fc5b2 -size 212103 +oid sha256:e996efb094b52cf781973974ad22d1f061f2b7dc8968465043b41cf0b705c2ec +size 212050 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png index 873d904f24..3ed2a041ae 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_link_clicks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16753fb3052e6b9d826bc45ab196993ea62f9c88f7cd4dcf35e634a64d86fcdb -size 115498 +oid sha256:b305150543e118e99b56e60b63e529b01dae7615bd0737585ec1ffe331d7c36f +size 115467 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png index bf5aaf2ad0..7e6e3d6bd9 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_page_new_links.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:978b20a31e3f77517e5073e9faf319fc1c6190684c3681697bed2247c89e6ec3 -size 112808 +oid sha256:6a1e05f90d245d8e7ee21303e98291bd1b8bb90437503dcf46493570d632bca9 +size 112758 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png index c52ec754dc..514df79bbb 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_period_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:731d66c1f07dc6481597d6d2317997cff1d25775b4c5ecfea6373930790998c2 -size 214192 +oid sha256:2bda524410463aafb93c42a58c9baa9429bf52246a41eb1eecd43558c90c4d30 +size 214146 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png index 292584b4e7..61056f45ca 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_row_evolution.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5048287e9d0b0dee2563da88f06130a53f6a2e33297d4afdfaafeec2e0582665 -size 102771 +oid sha256:f7e21f20280a489e1ca636ffe8ff2aa09825c11b6972ee03b92de5b8b7a07241 +size 101287 diff --git a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png index 9ef6a8511a..ccc6cad0a9 100644 --- a/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png +++ b/plugins/Overlay/tests/UI/expected-screenshots/Overlay_transitions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b2366fb0a39fe4e6ad89207c4e746edede430c2758063a0f96ebb09e02a8857 -size 150482 +oid sha256:7c8e1bfd4fdd879789a6dc19431bd14352947c75aedb338e6c5a846efebdd084 +size 150938 diff --git a/plugins/PagePerformance/tests/UI/PagePerformance_spec.js b/plugins/PagePerformance/tests/UI/PagePerformance_spec.js index 4e5ef521d7..fbba8e5fd0 100644 --- a/plugins/PagePerformance/tests/UI/PagePerformance_spec.js +++ b/plugins/PagePerformance/tests/UI/PagePerformance_spec.js @@ -15,6 +15,13 @@ describe("PagePerformance", function () { const generalParams = 'idSite=1&period=day&date=2010-03-12', urlBase = 'module=CoreHome&action=index&' + generalParams; + async function ensureTooltipIsVisibleInScreenshot() { + await page.evaluate(() => { + var html = $('.ui-tooltip').attr('id', 'test-tooltip-permanent')[0].outerHTML; + $('.ui-dialog').append(html); + }); + } + it("should load page performance overview", async function () { await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=General_Overview"); pageWrap = await page.$('.pageWrap'); @@ -34,17 +41,19 @@ describe("PagePerformance", function () { }); it("should load page performance overlay", async function () { - // click page performance icon const icon = await page.waitForSelector('.dataTable tbody tr:first-child a.actionPagePerformance'); await icon.click(); await page.waitForNetworkIdle(); - pageWrap = await page.waitForSelector('.ui-dialog'); + const pageWrap = await page.waitForSelector('.ui-dialog'); await page.hover('.piwik-graph'); - await page.waitFor(50); + await page.waitFor('.ui-tooltip', { visible: true }); + + await ensureTooltipIsVisibleInScreenshot(); + await page.waitFor(100); expect(await pageWrap.screenshot()).to.matchImage('pageurl_overlay'); }); @@ -55,6 +64,7 @@ describe("PagePerformance", function () { // hover visualization selection const icon = await page.jQuery('.activateVisualizationSelection'); await icon.click(); + await page.waitFor(250); // animation pageWrap = await page.$('.pageWrap'); expect(await pageWrap.screenshot()).to.matchImage('visualizations'); @@ -104,7 +114,10 @@ describe("PagePerformance", function () { pageWrap = await page.waitForSelector('.ui-dialog'); await page.hover('.piwik-graph'); - await page.waitFor(50); + await page.waitFor('.ui-tooltip', { visible: true }); + + await ensureTooltipIsVisibleInScreenshot(); + await page.waitFor(250); expect(await pageWrap.screenshot()).to.matchImage('pagetitle_overlay'); }); diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png index bb5f68553b..1770987ac3 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7ba0c0ca454c7bb4c00a2ae6e966e9fb9637fac38294128412b0942f6b59323 -size 121408 +oid sha256:8c5215962bfcde00fce46e52b4fe3c7ceda56b0672bb31b2598f1b3314c10655 +size 120741 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png index 5188f0121b..f0d3b5ff53 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pagetitle_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef1dc8a36e65969bc20985ed2c30d14f6336cabe3d354fb80b51bc1c09cbe918 -size 144756 +oid sha256:8d9f2f661bd766a377e9486d63784d207d200575a47446f5bfd3ba562d54ec5c +size 153019 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png index f4989d4fb0..ec0f987803 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_pageurl_overlay.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36d601ddebcf92df4e366bf063f8f98220a133f9b3bf70f0da6a43420f3bd3e2 -size 144400 +oid sha256:2cf3f51765c1f8fbe8892f2076b848938f4d27f4c1160b4758ed35aca0f796b6 +size 152197 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png index b589d99e5e..acae10a62a 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_performance_visualization.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:877862d041ba055d937047623743ffc37470241c0264de3f38d623f408ebf106 -size 31577 +oid sha256:7ede313169aa0de9d6b1dd7fa343ecbb604ac4f3f2bfe607cbbb73805f9a1465 +size 31476 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png index d29e0932fb..7f8a3d0656 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a798e897f7009355c7466f570c8dc30bf33a0aac2f506c6e392f4bccb5b56b86 -size 32214 +oid sha256:2a31d10536768bb507c44211bda56228c40d19f7d532b399cf38ef079b8a5280 +size 32119 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png index 1589b404a7..f1327c175d 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_rowactions_subtable.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:789dda219d0921b01c6cb27e86b7adec6319382e707285a12c6009bcad3c931f -size 38917 +oid sha256:d8cad80d7199379f440001c7620173eb880b29699f1088eab20d6a0093b0daae +size 38819 diff --git a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png index 34627bb38e..9edd6ce932 100644 --- a/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png +++ b/plugins/PagePerformance/tests/UI/expected-screenshots/PagePerformance_visualizations.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfcbe8cf8634bc9e41920c5148b7b376b28d97cc2c9d14589b57ba29b4d013b1 -size 41428 +oid sha256:3bcfe4d57238c68e1cede32e761ab1467979777e4605c4d4a7b407d21d6e8edc +size 40312 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png index a2b46c444a..2a733502b0 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_cancelled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c83f4138b5a11acb5808c2c8b2cc494ff2e45ff1bd553018ed4a884ac55965c -size 215018 +oid sha256:955a5c35636f3f70431b59938387cfa968540e88dceda3cc89e39cf8b4eb8c6c +size 215966 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png index 3f1c636f41..b57c07b5e8 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78f503862d19741ed0626b424c68f3063c844646c21a989e62883d4b49ab2b14 -size 17210 +oid sha256:aa8a4d2066940fa54c83c4797aa42316dcac42a54862ffff940701a7d8071336 +size 16863 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png index ff8f5437d2..527e87d3e6 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a447d197f76d3ad80427a5982871c280881bc3c9c447b50da4950cd38f6e783 -size 218765 +oid sha256:4b426466ee070d0fd02306617343ab61ea98ab6a778cea28432e7f5f80290f1a +size 219332 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png index a2b46c444a..2a733502b0 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_prefilled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c83f4138b5a11acb5808c2c8b2cc494ff2e45ff1bd553018ed4a884ac55965c -size 215018 +oid sha256:955a5c35636f3f70431b59938387cfa968540e88dceda3cc89e39cf8b4eb8c6c +size 215966 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png index 76c6142acf..3ba2b8b5b6 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d15978a6ced8b82154ee2d365c8b07cced76166270cba14e661dd381c33adc65 -size 231333 +oid sha256:d96c01eabcee611b916292525c7656a426c4d6f166cd555d7961ee6345f42dbf +size 231979 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png index 72c1b69f6b..83c16ff82a 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizelocation_anduserid_and_action_column_prefilled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11872ee33f50c16bd114a3964940f83864fa2b2f8bd3843d6258b3e493595062 -size 227972 +oid sha256:e578921ac9da901a299077ef55c9a99201ecc96223912d18efda4ca861b23b9f +size 228619 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png index 8a862f2911..a882c9a832 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f36c3caa3705959c242ccb133a93f5e397776592d2feaffcd93509672742b102 -size 239952 +oid sha256:ce0b972bae27b789467196a74d1311987e97de3a53d45f4bcd02da3865dcb4fc +size 240513 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png index b56ceecedb..30f41c3473 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_one_site_and_custom_date_prefilled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:591493ad56d0174a6012376c97f77af5b5675f966e7fd418c85b93bb8622cb1f -size 231217 +oid sha256:bcbe5429259d3fdd0b26e3bdc78e826600d79bcd0f4e07babf201cb231126688 +size 231567 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 74f87951d8..102df13b87 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:e41bd3ae654368c9cba7f094b79d44244920245f6c524494f1b0d2cfffc88123 -size 358670 +oid sha256:17b817d406f2ce4545f00448e5e21e9fddd360e6deb3a676882ea1bd572af8b3 +size 358470 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 2186947f36..d983f413a0 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:d3d77eaf29e6b7264403ce0a36f19b6d72026fea6752213e2da7d3727ce6c218 -size 245156 +oid sha256:140b8a900620d40721a8988e974ada2ce7d2b5c610bd80a81e09b628ae91b6db +size 244201 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 d6f7efdca1..518d998263 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:e9465a8607095716145f60817d786b9634e4e8ccaec925255c0744e3a380961f -size 242277 +oid sha256:2f47dc98b5510b79a29cd1103cd47bf7eb0391ecd624c799be5cd1a6e01ef91b +size 241441 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 a71aac2095..da7af17b3f 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:17a32503542f29a1185e3cac9610617ccdde9afee9b10c1814b1304b1bcda83f -size 62387 +oid sha256:11f9098ab032aedf4b7f8bf9d2e574585e27e7e840e655d1e13878b0f900a45d +size 62588 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 03ce32dbaa..a2d5d478b9 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:3d9b98c011f5740a532b69d86b72adbd1c8166a3eb2d0f79753237a824ac012b -size 579769 +oid sha256:0c0f5bf37ba5ccd861f358f4e69834ff4f6a12afb8ff4f40ecb742e28bb5d731 +size 580444 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 3e3e83d178..3123e01bc6 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:dc4759a6017cbda0ae00d62ae6a1f857b09861a7c54e1d84645857c6fec900e4 -size 574173 +oid sha256:9bda094bb12a10eaf099770868be00519807512fbd58d999785dbef15d72545d +size 574489 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 1da5e36b03..c389efaf65 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:1e154a2e8d70da9dc279e6b60a84004c094670567f13173fcdd5892d7ad7340b -size 129251 +oid sha256:84185212c701a70626528538d61e888e49f4d1f56fdb285739568cc77e4a56bf +size 129430 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_unconfirmed.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_unconfirmed.png index 5b85d54883..e5db7bf517 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_unconfirmed.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_delete_visit_unconfirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93c289ea5b8d6cb2769a86b38ad5054e371f1f472c6cd500860f1b0ab1278b63 -size 9188 +oid sha256:bb12579e2c456cd89439a36a60074e83fff4864fe19875ef2362fd04c3565fba +size 8833 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 cae083f79a..5a66d47609 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:0d685ea5f621a5063aa76221e1a01d9208c55f721d6dbb1366f3bf07385126f8 -size 580159 +oid sha256:7c6aac7ed1ba48274d118df58b6f71a3ebe2954a0f25c6e7500189faa0338a03 +size 580773 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 4d53698a4d..06c0c12808 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:99fa12710e05594ecf85b761f322235e934c69df7f12b27b1e3898be69d9c22d -size 68196 +oid sha256:6ddcb3e4508756d5a21f9c421543882cc2b903bbd7c65a71164a9559832b3bb6 +size 68329 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 03ce32dbaa..a2d5d478b9 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:3d9b98c011f5740a532b69d86b72adbd1c8166a3eb2d0f79753237a824ac012b -size 579769 +oid sha256:0c0f5bf37ba5ccd861f358f4e69834ff4f6a12afb8ff4f40ecb742e28bb5d731 +size 580444 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 f44d788dc6..cdeb9c918f 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:5f4791aefe1d4275ed9c644ea73aa7e4a992554ff425e48aa595c7f8e8d9d9c9 -size 574607 +oid sha256:a67a797a4bbb8dc9be47e7463fee4649a0053f7302a8d12a09f716d6a23a2d7e +size 574895 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png index c948051a36..4f6a0cbbd2 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65d262acaa3484c3693ddc7e6653d4d93948bcdb0d4ba0159a7ad8e45e825ae8 -size 331696 +oid sha256:c558ed994d6c2d30ab91bbb986676b387ec9e5da13f71d925641ea661461618a +size 332802 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 4701975b84..b1019001a3 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:4e6fba7a5a628f480ceb5fd5b400487b5a3822339d460cc5237e4c0940fcf29a -size 455212 +oid sha256:e0a7292297880778ad3775085d06b2843fb543daa3f27cb6507e6a13731242c4 +size 455483 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 f8de6e8868..6abca7dbcf 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:e581a52617b731c831316674325f6023a22c1d10ec321a930f5cd1d2ec2e1103 -size 154679 +oid sha256:14ae07033c8f9b195caa2bd72929ecfc92a099592ba95ea080f6dda6a7fa0077 +size 154164 diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject 154a0ca633c139408146dfa9a9996a3cb309d18 +Subproject 80aa290a950abdf230db68a832b6de01ecf8e6e diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png index 26ab977f11..efcf879510 100644 --- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png +++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_nokeyword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:319ed5405d9b7a0f851b1ee9d466ce17341d835521e516c4d498e8a794626ad6 -size 81248 +oid sha256:fc4811e512d190c8074d2791904e3274017d182100961967383adb496b778cc3 +size 80715 diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png index 04ce35b45c..31e48709c6 100644 --- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png +++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b204fcb491d4fd542350f8e76c95b80101016711096a09f0034bab4701a9c57 -size 55987 +oid sha256:3ead716ad603eff5de3c0dc930b281da67aa4192228e612041207ad81d1d982c +size 55083 diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png index 84a5513fb2..d8f70c3b65 100644 --- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png +++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_generate_url_withkeyword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4753654e8071c84d6381b100289a41e94dca08ca3ca277a78525a9782f0eda54 -size 81445 +oid sha256:b958e5ccc79ae78e8839a2cc7b85d0cd304fc1a35387257ad88c3093ee2608dc +size 81175 diff --git a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png index 013aad7eb8..7f9915afa7 100644 --- a/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png +++ b/plugins/Referrers/tests/UI/expected-screenshots/CampaignBuilder_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a84a910c524c98c798b5d8324197af0fab070572565d6436d5062fb7bb887ca1 -size 71444 +oid sha256:1b7e052ce139948ae037eebe9df462b54b5591f6e47913556f5dc195e6f639cf +size 70788 diff --git a/plugins/ScheduledReports/templates/_addReport.twig b/plugins/ScheduledReports/templates/_addReport.twig index 11f960619f..41e06bfd96 100644 --- a/plugins/ScheduledReports/templates/_addReport.twig +++ b/plugins/ScheduledReports/templates/_addReport.twig @@ -157,10 +157,10 @@ <ul class='listReports'> {% for report in reports %} <li> - <input type='{{ reportInputType }}' id="{{ reportType }}{{ report.uniqueId }}" report-unique-id='{{ report.uniqueId }}' - name='{{ reportType }}Reports'/> - <label for="{{ reportType }}{{ report.uniqueId }}"> - {{ report.name|rawSafeDecoded }} + <label> + <input type='{{ reportInputType }}' id="{{ reportType }}{{ report.uniqueId }}" report-unique-id='{{ report.uniqueId }}' + name='{{ reportType }}Reports'/> + <span>{{ report.name|rawSafeDecoded }}</span> {% if report.uniqueId=='MultiSites_getAll' %} <div class="entityInlineHelp">{{ 'ScheduledReports_ReportIncludeNWebsites'|translate(countWebsites) }}</div> diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png index 2a91e265fb..d7b67c1df2 100644 --- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png +++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_invalid_token.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9055cc616cda86a587016bf9d527cfb0cc8fa2039c9f8429116cae91c308df3 -size 26206 +oid sha256:72b8f441235e5f423c93f306c97e688f40209d143a9dd36d5f62dd38cf989045 +size 26135 diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png index 6c66c76237..eb059ba213 100644 --- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png +++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_no_token.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:959f34a8bde890bb76ceac735ff66598aa63a8d97277965397510b308a0c37e0 -size 20489 +oid sha256:851d5640bd655170b1bbaa1b968a45e68a61f9948ba15104f77c97c8b6f03df9 +size 20465 diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png index 65836a775c..f4a0a6b357 100644 --- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png +++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bccc29b24847811b89b91cd76f1ecc59089c2caa00684253d669b1b580fad07 -size 25364 +oid sha256:aab0e3b7032be2d225a45ca1348a088a8ca05d03f64da01189be15cd9403081f +size 25354 diff --git a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png index 884a0c64ae..e6ca75d1b3 100644 --- a/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png +++ b/plugins/ScheduledReports/tests/UI/expected-screenshots/ScheduledReports_unsubscribe_success.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0f7aa6faea6d17ddc2c6230dc4bd567ba8837c361483d82c383071f425bcf37 -size 23646 +oid sha256:4e72e498d08109eab2b1bf112faca40fb2122bd5834d36104e74318821061717 +size 23606 diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject e7c730627948a1b7035309c65cecbee34732d42 +Subproject 87face9057072ff479a26af475bf5600d4e9ff4 diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js index 401922a981..a3d4c042cb 100644 --- a/plugins/SegmentEditor/javascripts/Segmentation.js +++ b/plugins/SegmentEditor/javascripts/Segmentation.js @@ -762,7 +762,8 @@ Segmentation = (function($) { }; var makeDropList = function(spanId, selectId){ - var select = $(self.form).find(selectId).hide(); + var select = $(self.form).find(selectId); + select.hide().closest('.select-wrapper').children().hide(); var dropList = $( '<a class="dropList dropdown">' ) .insertAfter( select ) .text( select.children(':selected').text() ) @@ -1094,6 +1095,7 @@ $(document).ready(function() { this.onMouseUp = function(e) { if ($(e.target).closest('.segment-element').length === 0 + && !$(e.target).is('.ui-menu-item-wrapper') && !$(e.target).is('.segment-element') && $(e.target).hasClass("ui-corner-all") == false && $(e.target).hasClass("ddmetric") == false diff --git a/plugins/SegmentEditor/stylesheets/segmentation.less b/plugins/SegmentEditor/stylesheets/segmentation.less index 15f890bde2..c46d245d05 100644 --- a/plugins/SegmentEditor/stylesheets/segmentation.less +++ b/plugins/SegmentEditor/stylesheets/segmentation.less @@ -116,16 +116,19 @@ div.scrollable { margin: -1px 0 0 0; } -.segment-element .edit_segment_name { +.segment-element input.edit_segment_name[type=text]:not(.browser-default) { width: 200px; } - .segment-element .segment-top { font-size: 11px; color: #505050; text-align: right; padding: 3px 7px 0 0; + + > * { + vertical-align: top; + } } .segment-element .segment-top a { @@ -436,6 +439,7 @@ a.metric_category { .ui-autocomplete.ui-menu.ui-widget { box-shadow: 0 1px 2px 0 rgba(0,0,0,0.14), 0 3px 1px -2px rgba(0,0,0,0.2), 0 1px 5px 0 rgba(0,0,0,0.12); + padding: 6px !important; } @media all and (max-width: 749px) { @@ -551,3 +555,16 @@ a.metric_category { .segment-element .segment-footer a { color: @theme-color-link !important; } + +.enable_all_users, .visible_to_website, .auto_archive { + display: inline-block; + margin-left: 4px; +} + +.auto_archive { + max-width: 190px; + a.dropList { + display: inline-block; + width: calc(100% - 15px); + } +}
\ No newline at end of file diff --git a/plugins/SegmentEditor/templates/_segmentSelector.twig b/plugins/SegmentEditor/templates/_segmentSelector.twig index 9e458c6940..962162fa5d 100644 --- a/plugins/SegmentEditor/templates/_segmentSelector.twig +++ b/plugins/SegmentEditor/templates/_segmentSelector.twig @@ -41,27 +41,27 @@ <select class="available_segments_select browser-default"></select> </strong></span> - {{ 'SegmentEditor_ThisSegmentIsVisibleTo'|translate }} <span class="enable_all_users"><strong> + {{ 'SegmentEditor_ThisSegmentIsVisibleTo'|translate }} <div class="enable_all_users"><strong> <select class="enable_all_users_select"> <option value="0">{{ 'SegmentEditor_VisibleToMe'|translate }}</option> <option selected="1" value="1">{{ 'SegmentEditor_VisibleToAllUsers'|translate }}</option> </select> - </strong></span> + </strong></div> - {{ 'SegmentEditor_SegmentIsDisplayedForWebsite'|translate }}<span class="visible_to_website"><strong> + {{ 'SegmentEditor_SegmentIsDisplayedForWebsite'|translate }}<div class="visible_to_website"><strong> <select class="visible_to_website_select"> <option selected="" value="{{ idSite }}">{{ 'SegmentEditor_SegmentDisplayedThisWebsiteOnly'|translate }}</option> {% if isAddingSegmentsForAllWebsitesEnabled %}<option value="0">{{ 'SegmentEditor_SegmentDisplayedAllWebsites'|translate }}</option>{% endif %} </select> - </strong></span> - {{ 'General_And'|translate }} <span class="auto_archive"><strong> + </strong></div> + {{ 'General_And'|translate }} <div class="auto_archive"><strong> <select class="auto_archive_select"> {% if createRealTimeSegmentsIsEnabled %} <option selected="1" value="0">{{ 'SegmentEditor_AutoArchiveRealTime'|translate }} {{ 'General_DefaultAppended'|translate }}</option> {% endif %} <option {% if not createRealTimeSegmentsIsEnabled %}selected="1"{% endif %} value="1">{{ 'SegmentEditor_AutoArchivePreProcessed'|translate }} </option> </select> - </strong></span> + </strong></div> </div> <h3 style="margin: 12px 6px;">{{ 'General_Name'|translate }}: <span class="segmentName"></span> <a class="editSegmentName" href="#">{{ 'General_Edit'|translate|lower }}</a></h3> @@ -92,8 +92,10 @@ </h2> <p class="description"> <span> - <input type="checkbox" id="hideSegmentMessage" name="hideSegmentMessage" /> - <label for="hideSegmentMessage">{{ 'SegmentEditor_HideMessageInFuture'|translate }}</label> + <label> + <input type="checkbox" id="hideSegmentMessage" name="hideSegmentMessage" /> + <span>{{ 'SegmentEditor_HideMessageInFuture'|translate }}</span> + </label> </span> </p> <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/> diff --git a/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js b/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js index 0b06f7d47d..c0663b8ce1 100644 --- a/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js +++ b/plugins/SegmentEditor/tests/UI/SegmentSelectorEditor_spec.js @@ -65,7 +65,7 @@ describe("SegmentSelectorEditorTest", function () { }); it("should change segment when another available segment clicked in segment editor's available segments dropdown", async function() { - await (await page.jQuery('.ui-menu-item a:contains(Add new segment)')).click(); + await (await page.jQuery('.segmentationContainer a.add_new_segment')).click(); await page.waitForNetworkIdle(); expect(await page.screenshotSelector(selectorsToCapture)).to.matchImage('6_segment_editor_different'); }); diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png index 19f6c1ccb3..c8f1c53f70 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_2_segment_editor_update.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87e0f139d7328ca1c2f7758b058f72dd23bd73c8293f0f28ccf3f3a251e5f310 -size 38143 +oid sha256:b6dbd23e6d202c5c64c254505c3e13662642a166d6313b1d5c59085dce92cc6b +size 38357 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png index fb3b099d99..f878b52336 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_3_segment_editor_edit_name.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f0cc45b204bd3791af11b50d00b78f558e80cf01f1f47a44c34d46ce5a6a77d -size 38775 +oid sha256:0149934cf9533489ee580d06abb994585fba0e353a842759d8d395303d4376a9 +size 38921 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png index b58a27b116..66955ddf55 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_6_segment_editor_droplist.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bff52b56035efaff9bd8ee400453057bc811183d30ae8bfa037f33ca0646a3d6 -size 44760 +oid sha256:f61a9b54beeeb80b5fb0d3e8fc4ddb3d6a95105832b10aab8af395b047af9248 +size 44183 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png index 4abc9bba81..6cc1f6f045 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_8_segment_editor_create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17ff13a112db03b10033968831310fd9d225580733fa71d67e4004eb2b583cf9 -size 33770 +oid sha256:6a5fa4c865ec79d50ba214af6c89a80a6332da5feae310d97b0947602b3218da +size 34213 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png index 8ea321d67f..ab63aa9bd5 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_and_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0d88b156d1c8f6e5b97d36cc41b72ac6e6389a78692b392ee9569f34a60debe -size 47974 +oid sha256:3444f8533ff408b548c6dd032b95656b7261461deff19bcd2517c5007e7d832b +size 48420 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png index 2d215af18a..812102e214 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_add_new_or_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b405312ca9f4b1a8328fc398c22caa110ab830ebb33289c75cb04611fa67d78d -size 38157 +oid sha256:dd8377c0f058b87f5e83219ca4959794763dd327bd2cd58bfac96747629c0282 +size 38618 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png index d5efb73063..5e3953bea4 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2586806653276401d49a6088498a1d3dd8f226d62fa76258041faba62c7a82e2 -size 136127 +oid sha256:9c8378a992e19088bfe3ebd53b9bd9382f6016989356d074ea1d73fcf19fceec +size 136626 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png index 7cbc07a521..3f5ff3a5ac 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_deleted_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebd734c886f72544bc3eabbe3e5774a6a8f4383e800c7a3ed2990391589bfc34 -size 7138 +oid sha256:da4531dda0dbba75b67210e98778265269b8056aa7a9a4312dca800bde4124b3 +size 6781 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png index 4a818a3dcb..6c899e0f67 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_dimension_drag_drop.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2fc676d8e6d865098c84c37db7487f5ada7c2afc775075bad0f94a2181b195a -size 33053 +oid sha256:bd969b4c6361e9d79ae82aa79272c5d89bc3443fcd952598977975b0e76c12e0 +size 33551 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png index 6af3f80e93..994d8debce 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_and_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ecd288c2235588de62e28a486df75f5ceb41dda9dc908d975e8487fb11e8fe5 -size 47630 +oid sha256:72e40eb4aef516b3500c085ebecfa426973f1488f6af1b4082dbc012302782f3 +size 48081 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png index a7e31992bd..74809924da 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_drag_or_condition.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:deea04f979c4838485fa9e8298179b757c26f07431109f2953f98fc04e35e3c2 -size 37790 +oid sha256:79f9a1afaf09715366f1703e094d418c152fffee868846cd80ce87ef0ffa8df4 +size 38281 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png index a0212dd976..e5b359cdd8 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_saved_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:420af24598a69af3e8b222828199e623d96870f103d574932d51a6ecfa5e24be -size 49230 +oid sha256:c62f99a6f9a27ab680ca9ae3633116eb326fde6dd5552d625d090149152278d9 +size 49973 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png index e3aacc63dc..c2a2aaf1e4 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_suggested_values.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d440c2793c0a0a3a1b0cef38244aee662ae7e8d018e836d3f792fd1e0ee7531e -size 55642 +oid sha256:c8074a4cab064e157e2a52b3b9d9537746558f32c2cb5bdd8b199b6e194e4cf6 +size 60209 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png index ea67128df7..7c9b3bfa28 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_update_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eaf8668871e120e2464dbe7bc275c5b78582e126ae216c96b6f60eb3791225a7 -size 24877 +oid sha256:c7c1c7f65b86770bf91265edd7be6a8bc08804d2c8c1eceae37057a8a068306e +size 24508 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png index 11898156c1..bfdf3774b4 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15d5a62f1f47b789486b5d70da0579cd785aa72a4a048fdeea432e31a102695e -size 17275 +oid sha256:e1002209a0ba75c6fa20dce796274e18ba41413049f40ebf344c6c11eb5db99d +size 17272 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png index 4629aa50c6..fc5244c124 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_updated_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:903a9c8563553edeee00a37ed7339c1b5eb506d8d81ef737ce6bb625ac985801 -size 51311 +oid sha256:39e30532ef843547cd4603b8825c1eb642c9d610d710aeff113ec572a51f51c5 +size 51325 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png index 9d1f9d6005..021e244003 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_custom_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d56c7667035d7218c78f473c8b52c3e76a8ccda669d493eb56f2ad52e08c9d8 -size 103466 +oid sha256:5a2d1e16c4c28464d4d3ec20ac9d2eeb97345763dd17f07ca70499cc616656e8 +size 102920 diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png index e2f89f7338..b0cd5f7a2a 100644 --- a/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png +++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/UnprocessedSegmentTest_unprocessed_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:206f4f64041460066694a8350fe34199b67f02fcc5cba49dd16a06aa9aef7600 -size 144118 +oid sha256:479866c36d9cc765270cd0f6b6d61c74c854b0863522f277ecd044c77a90dc15 +size 143828 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png index c29c62143a..f73873493d 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_global_settings.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcbb2458594e0e42c01bf6820cb29096a1bb7e0b49568845fcb0ced77f6ac27e -size 253769 +oid sha256:26e52349540afe03371f1a3ea2b8f53eeb6c11e0b5900a25898447688f320f41 +size 246171 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png index 8f7766830e..6d4ba0d044 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2774325e53824ba9b13252ee6b5ee1143cebbc89cfa705eb3cfe1953b28e30e9 -size 178137 +oid sha256:faad7ccddbf271d2bd235eaff487f9b0cdc26e092dcc0d91c1ef31392e7ace3f +size 177118 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png index 22496f9dfb..3e676e3d44 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d4bbe9dba18e7cd368b8a6ce658b2d8d487da273331153a0073c0f3a8fe78b2 -size 182595 +oid sha256:177f4e90b1d78baf6373e8062b4daefba33df9510ef8e57feaef92b81287c39f +size 181538 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png index 1325d856cc..8dfe074481 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca277bd6b70fb615bb9a8712ddbf8d05eb024c35895fa6aaf381a1dc912a2a5c -size 182582 +oid sha256:aaf35ed2b9ae40fc928a3c40745575f0607b4db4153cc35672777e223f29659a +size 181539 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png index 9733a4608b..2b500ea2cf 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3736f1ea176b3f25b7c71609e1c650281daf778960a21562e633a0a98feb92c3 -size 185079 +oid sha256:d6acb7d862cf1d4ca17101eec65c6ccbd9a6ea9444ddc7b8440336e1a0c2d37d +size 184002 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png index 75afdfc2d7..7644ace273 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fb349803d83753f9361f40229bd5179bdfdc81c84a833a72cd4f351efdcf819 -size 177049 +oid sha256:3225bb06a235956222aa0c752b892a5b014547440632a4aa2439a798cec24743 +size 176197 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png index 93d36fc328..be7dde71ec 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4efca72e42d2872cc80c43a7e4eae4fc05f19c5b8fb143e7617417220cd8ea4a -size 181458 +oid sha256:1d3901b4c2477df7a077619703f20845000570d496d712a073182f48cbf3e622 +size 180341 diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject a9d484cad81469471cae0ce28606e5e269d8abf +Subproject 511c48549fdec176811ae87efd5aab2e85424a3 diff --git a/plugins/Transitions/stylesheets/transitions.less b/plugins/Transitions/stylesheets/transitions.less index dd4652185a..cec09f230a 100644 --- a/plugins/Transitions/stylesheets/transitions.less +++ b/plugins/Transitions/stylesheets/transitions.less @@ -248,3 +248,13 @@ body .ui-tooltip.Transitions_Tooltip_Small { } } } + +#transitions_report > .row { + margin-left: 0; + margin-right: 0; + + body.widgetized & { + margin-left: 0.75rem; + margin-right: 0.75rem; + } +}
\ No newline at end of file diff --git a/plugins/Transitions/tests/UI/Transitions_spec.js b/plugins/Transitions/tests/UI/Transitions_spec.js index 0738a0f35c..2261967734 100644 --- a/plugins/Transitions/tests/UI/Transitions_spec.js +++ b/plugins/Transitions/tests/UI/Transitions_spec.js @@ -21,7 +21,7 @@ describe("Transitions", function () { }, field); await page.waitFor(500); await page.webpage.evaluate((field, title) => { - $(field + ' .dropdown-content.active li:contains("' + title + '"):first').click() + $(field + ' .dropdown-content li:contains("' + title + '"):first').click() }, field, title); } diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png index c5d0926cbe..7a6889f312 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_titles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d032ff7d2d7364508bde073397bda857fd75a4d2779ab5e3e3dcc0402ec99a8 -size 68909 +oid sha256:2cff3452a9e684ac44fc8339bfe13ae4a958c118fe8aa898670b0049c616d12d +size 68986 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png index 78b032c5b8..a4ed3ec4d3 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_popup_urls.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39ac15a5e0145a9c814f0638111905a473557dfd17949bc32d9c081c8344a0c7 -size 79049 +oid sha256:094206c9db59ca1a7936dacf6252f491222688d92e135078b125b7e10d1fe6df +size 79642 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png index 2e4bba3d6d..db2abe1cc7 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_no_data_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:082e88a4b9d38aee3e920e8a946dba872e40f1dde33d311b84705d170a297912 -size 27266 +oid sha256:34a52191fa08e0c1f5121032036137539949513698d5c74e9f5ffee38ab95684 +size 27385 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png index 12c7f6d06d..72f8d81339 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_type_title.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6b31574475121e71de56c846d24ab714a8d3d3568d5fe9f7402cf4930d40f4d -size 182720 +oid sha256:21d2e71ee82dbb88885b0868b1bbb58081da879fbbbd51909bc6ca0888dd8847 +size 182640 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png index 5e71b0c52d..42657cf6c7 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_switch_url.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90122e7c6b416be6bec8988d9cd05f28830fd25bc7a586cb64c8f3d56a33fddb -size 112814 +oid sha256:bab8fe246763bfa8fa6d65ad7a85903d9627fd3bacccd5de0d11e34d5a73f07d +size 112738 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png index aab6a088a3..4d111f6943 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_report.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ec956ceb714308075616c3e69bf05c7e655457a9bc8ecb7cc22db221ed9e882 -size 112693 +oid sha256:adc3f2fe34e466cd89159c6342a6a373808bd4277bf9a5e5b147f1a7dec37745 +size 112635 diff --git a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png index 35f2eb3fcd..607a27a8a5 100644 --- a/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png +++ b/plugins/Transitions/tests/UI/expected-screenshots/Transitions_transitions_report_with_data_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6be01887158481243cb7dae8151d4281b0234bcb7481a16c776d4ba934928781 -size 106638 +oid sha256:f602413f4da1a499ce1eb9ea5da6a0a193e32aa3a6951f3764b7337762986f49 +size 106635 diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject bab240efc2fa89b7ce516dd3308dcd2d1d94d73 +Subproject 02792a02d98185baa8a93a24cfe586ef516edd0 diff --git a/plugins/TwoFactorAuth/TwoFactorAuth.php b/plugins/TwoFactorAuth/TwoFactorAuth.php index f5d17aff94..60f354ed23 100644 --- a/plugins/TwoFactorAuth/TwoFactorAuth.php +++ b/plugins/TwoFactorAuth/TwoFactorAuth.php @@ -48,7 +48,7 @@ class TwoFactorAuth extends \Piwik\Plugin { $jsFiles[] = "plugins/TwoFactorAuth/javascripts/twofactorauth.js"; $jsFiles[] = "plugins/TwoFactorAuth/angularjs/setuptwofactor/setuptwofactor.controller.js"; - $jsFiles[] = "libs/bower_components/qrcode.js/qrcode.js"; + $jsFiles[] = "node_modules/qrcodejs2/qrcode.min.js"; } public function deleteRecoveryCodes($returnedValue, $params) diff --git a/plugins/TwoFactorAuth/templates/_showRecoveryCodes.twig b/plugins/TwoFactorAuth/templates/_showRecoveryCodes.twig index 0d819fe804..0583089ba8 100644 --- a/plugins/TwoFactorAuth/templates/_showRecoveryCodes.twig +++ b/plugins/TwoFactorAuth/templates/_showRecoveryCodes.twig @@ -22,7 +22,7 @@ <div class="alert alert-warning">{{ 'TwoFactorAuth_RecoveryCodesSecurity'|translate }}</div> {% if codes|length > 0 %} - <ul piwik-select-on-focus class="twoFactorRecoveryCodes">{% for code in codes %} + <ul piwik-select-on-focus class="twoFactorRecoveryCodes browser-default">{% for code in codes %} <li>{{ code|upper|split('', 4)|join('-') }}</li> {% endfor %} </ul> diff --git a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js index 8e84e3d0e1..dc5a7f2c43 100644 --- a/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js +++ b/plugins/TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js @@ -149,6 +149,7 @@ describe("TwoFactorAuth", function () { await page.click('.disable2FaLink'); const modal = await page.$('.modal.open'); + await page.waitFor(250); // animation expect(await modal.screenshot()).to.matchImage('usersettings_twofa_disable_step1'); }); diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png index 87d4f56583..a930d48542 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3035c2bb58a3004899a34148530e54d445d5be5b5b5fc2be4a9cd65f4ba1ea1 -size 27327 +oid sha256:ca138f0e64f0bcec8fee55f32f63ed71848c9289286baae53a2be8738d49d930 +size 27148 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirm.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirm.png index 71a3c61f88..22d055d45b 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirm.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f7613ecf829f6b0c783922747e062dcc6dc3bc165246574d2803a55d360296a -size 6117 +oid sha256:c258506e4b5a92ef47e7340c33a6eabe97c31dbeffcfc65206b23366db05a2e5 +size 6116 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png index dcf438bf56..cbb1dcae9e 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_edit_with_2fa_reset_confirmed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:672200026bfd5fe40d390d5ba0620627781cfb25147284de797bee3432a1609a -size 30138 +oid sha256:05866360158d97ec36006e96c5fdab019e7838f00448e4c371c3e748960c6546 +size 30501 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png index ac67dae61d..4069abe3be 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuthUsersManager_list.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7aba8ca9afd7df19b2213ebdb61fb72a5d39ec8986669d4e792c13dd9382a189 -size 58008 +oid sha256:9bc7de13104011db418c85b03266bcf58cfec88e0886270f1d13f28c9e4aefe0 +size 58099 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png index fab5d0a896..bc4afb1125 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ad5a59b463bcd14f9c548e32848fd26249d210b79c525d5859791a7fdd83229 -size 41278 +oid sha256:f4ebd0adb3db6a78ae9c19d245ddfad26e5ec4c5fccc144e108ee9d80daf3285 +size 41138 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png index eb0549ccb9..c023a067ea 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_not_verified_wrong_code.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ef79f86e491b21001766e067d3a82738436e01d61241ec007010117a6772806 -size 48963 +oid sha256:0d04a4016ff18ab65eedcf03146141df80c816d26f0fbdbb345895c94872b855 +size 48784 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step1.png index 0581634e95..eb006a0549 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b860cae046ea99abf3e3471030d26ecf622a381848ca89c9840d3ec7543535ac -size 13336 +oid sha256:c27c0aefcd2fbac6d777a62704c1938ce0a8cd4e8ad08f785558eaf868d83578 +size 13257 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png index 925bd10c37..db073a39d4 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_show_recovery_codes_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1098f24975dbee4f47cd9b7e996cf8dcf5c5e1ccc31ce9a6203b34382dd0b58f -size 60708 +oid sha256:317088e10aab29f589041e3b7c70c03f8f95f7fd03d16f3be012318d45e3831d +size 60515 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png index 6f4be6e603..a94980cb40 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b21fe2166ef12de7c99e319b31da47a0d2b74961dc8e37669767c7e0be13662 -size 93374 +oid sha256:a08a4516addbfa086231fec5e44f7a79a3f00e7c308a176e2475cd3efad99238 +size 92541 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png index d415a510d7..29d76b2fdf 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c03937b28682e4188f43084567f6017212dc0a3df6289ccbe9a16eb247fed4ff -size 126164 +oid sha256:8617fad5da65d7bf308722f3002371f587418318ad4a41c7c9e0b854c18177a4 +size 125538 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png index d7b0149b5a..d9b6b2d11f 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f742e4e4b8bea16678329299f6b1821782c56600c1f702e009bc4968121abfb -size 164353 +oid sha256:1d5ac43111252e3f119176bc4bc2e542fadf3134fba705b931d7d79b7e62ea6a +size 162365 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png index b12d1e6504..40698c6f2b 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:579f2db21f279425075b161e114d4be7813c19105cc9a66fbc6a04b26164c5fa -size 67692 +oid sha256:c2ac087bfb9043b707de3d5d37ff50a09039d2b3f6c70732bda97a6afd2304e1 +size 67133 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png index 4556bd7ab4..2ee348fca1 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b65c1f58e462889b0d3fcf04d198455d05800ad76bcce573ed533a6eab73b35 -size 86684 +oid sha256:2792376e2b566f4bc16e271042538b1c878200f89b3ae53192a72bd9dc0908c6 +size 86462 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png index 5f5fe236ed..903a041bc9 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_setup_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5f2f01e298a9f49f983546c588700d5b220b91146c67ac99d7a2e576e049a6e -size 114990 +oid sha256:f890cdf67f6afc830a0a1705be2341d17a7130a9d83b0b16bf1a31825cbf27ed +size 114325 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png index 8a34137877..a07bd341c1 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8db391ffc5e5fa5f5984e7dd13c638d66216eda4afada9ddd76367dde76bfdfc -size 14224 +oid sha256:efc9565bedd4e027f1776525a0f71a926d319b952b31aa5cee1f4a5e1f9c351d +size 13877 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step2.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step2.png index 0581634e95..eb006a0549 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step2.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b860cae046ea99abf3e3471030d26ecf622a381848ca89c9840d3ec7543535ac -size 13336 +oid sha256:c27c0aefcd2fbac6d777a62704c1938ce0a8cd4e8ad08f785558eaf868d83578 +size 13257 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png index 85f9670a0a..27987bf12b 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_disable_step3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01724498bc0e7b18f163b9974fc169a861130c608767acf9138118fbc4373ad0 -size 44273 +oid sha256:7c8af4bce2cbfb44c6c4ad37057c4986423c615f829f93608226a224a663289a +size 44042 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png index 5464dee647..d1df1b1827 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4826c9ba4c539050b454358d627d618307eeafd34bbe4fb0fe3f74a3453404ac -size 47536 +oid sha256:9d7cdec9f2212374664e5e79f63e3e687e2c645c7a1c65f48661cd40ef2bdf40 +size 47304 diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png index 5a5ad98d53..896ab6d587 100644 --- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png +++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_usersettings_twofa_enabled_required.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2b3e2b9059763864e3ccfa8c85af22cc4ed72b070d3292e87cc2d088ae8b109 -size 52051 +oid sha256:b86748ca1940df1abd0fce75648d9ee2702dd5b4a0aa4e008f660f3425472e0f +size 51823 diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig index 3cd2093cb8..b83aa07333 100644 --- a/plugins/UserCountry/templates/adminIndex.twig +++ b/plugins/UserCountry/templates/adminIndex.twig @@ -26,13 +26,16 @@ <div class="row form-group provider{{ id|e('html_attr') }}"> <div class="col s12 m4 l2"> <p> - <input class="location-provider" - name="location-provider" - value="{{ id }}" - type="radio" - ng-model="locationSelector.selectedProvider" - id="provider_input_{{ id }}" {% if provider.status != 1 %}disabled="disabled"{% endif %}/> - <label for="provider_input_{{ id }}">{{ provider.title|translate }}</label> + <label> + <input class="location-provider" + name="location-provider" + value="{{ id }}" + type="radio" + ng-model="locationSelector.selectedProvider" + id="provider_input_{{ id }}" {% if provider.status != 1 %}disabled="disabled"{% endif %}/> + + <span>{{ provider.title|translate }}</span> + </label> </p> <p class="loc-provider-status"> {% if provider.status == 0 %} diff --git a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png index ba1c0a1819..b3626a974c 100644 --- a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png +++ b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_geoip2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99523d8e678ec43742479bf9b9acde632540cd3819d87932b16b1c29cdf6d808 -size 247194 +oid sha256:64cc7b555c783a0365eb8249701cabf6d1650fc0eeebac8f562dfcf9bd70fba9 +size 247298 diff --git a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_no_providers.png b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_no_providers.png index 775a61d021..04e05d4a2b 100644 --- a/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_no_providers.png +++ b/plugins/UserCountry/tests/UI/expected-screenshots/UserCountry_admin_no_providers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bff083ab601f7a05b42f1730801208666ba752d601353e4a2bdf14f0ad707aa0 -size 67524 +oid sha256:b9bfdbf2b4fa503fefb46fffbe75d641dcff47d6597079f6fba34ba0f102a13a +size 67371 diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php index 7579c20738..3946e69bc8 100644 --- a/plugins/UserCountryMap/UserCountryMap.php +++ b/plugins/UserCountryMap/UserCountryMap.php @@ -44,11 +44,11 @@ class UserCountryMap extends \Piwik\Plugin public function getJsFiles(&$jsFiles) { - $jsFiles[] = "libs/bower_components/visibilityjs/lib/visibility.core.js"; + $jsFiles[] = "node_modules/visibilityjs/lib/visibility.core.js"; $jsFiles[] = "plugins/UserCountryMap/javascripts/vendor/raphael.min.js"; $jsFiles[] = "plugins/UserCountryMap/javascripts/vendor/jquery.qtip.min.js"; $jsFiles[] = "plugins/UserCountryMap/javascripts/vendor/kartograph.min.js"; - $jsFiles[] = "libs/bower_components/chroma-js/chroma.min.js"; + $jsFiles[] = "node_modules/chroma-js/chroma.min.js"; $jsFiles[] = "plugins/UserCountryMap/javascripts/visitor-map.js"; $jsFiles[] = "plugins/UserCountryMap/javascripts/realtime-map.js"; } diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png index 82b59c80a5..b6bd0e6187 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8fa287087f6e90df90f91566013e868fb4fb8ed7e1a95d474fbae6efcc09552 -size 114508 +oid sha256:1e6eab272abfcfe11e07d8418a4ae36b6be24940c7e24b14bd66daca7e039971 +size 116131 diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png index 5159225887..8e2afb3e08 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1bb4c48dabc5e484d7e3d93db825f25590805c582016112178af4355fada02c -size 113953 +oid sha256:60331f813404c415e2fd3262c24844cfa2de8fce0a9fc980c8051493737c26ec +size 115647 diff --git a/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.js b/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.js index 621b2b9d4d..6efe3129a0 100644 --- a/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.js +++ b/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.js @@ -138,11 +138,11 @@ } }); - $element.find('.confirmCapabilityToggle').openModal({ + $element.find('.confirmCapabilityToggle').modal({ dismissible: false, yes: function () { }, - }); + }).modal('open'); } function toggleCapability() { diff --git a/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.less b/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.less index a77d388a99..8a0305bfcd 100644 --- a/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.less +++ b/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.less @@ -68,7 +68,7 @@ .confirmCapabilityToggle { .modal-no { - float: right; + margin-left: 1em; margin-right: 1em; margin-top: 1em; } diff --git a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html index 20971d90d7..8e115df75b 100644 --- a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html +++ b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html @@ -5,7 +5,7 @@ <a class='dropdown-trigger btn bulk-actions' href='' - data-activates='user-list-bulk-actions' + data-target='user-list-bulk-actions' piwik-dropdown-menu ng-class="{ disabled: $ctrl.isBulkActionsDisabled }" > @@ -15,7 +15,7 @@ <li> <a class='dropdown-trigger' - data-activates="bulk-set-access" + data-target="bulk-set-access" piwik-dropdown-menu > {{:: 'UsersManager_SetPermission'|translate }} @@ -100,8 +100,10 @@ <tr> <th class="select-cell"> <span class="checkbox-container"> - <input type="checkbox" id="paged_users_select_all" checked="checked" ng-model="$ctrl.isAllCheckboxSelected" ng-change="$ctrl.onAllCheckboxChange()" /> - <label for="paged_users_select_all"></label> + <label> + <input type="checkbox" id="paged_users_select_all" checked="checked" ng-model="$ctrl.isAllCheckboxSelected" ng-change="$ctrl.onAllCheckboxChange()" /> + <span></span> + </label> </span> </th> <th class='first'>{{:: 'UsersManager_Username'|translate }}</th> @@ -145,8 +147,10 @@ <tr ng-repeat="user in $ctrl.users" ng-attr-id="row{{ $index }}"> <td class="select-cell"> <span class="checkbox-container"> - <input type="checkbox" ng-attr-id="paged_users_select_row{{ $index }}" checked="checked" ng-model="$ctrl.selectedRows[$index]" ng-click="$ctrl.onRowSelected()" /> - <label ng-attr-for="paged_users_select_row{{ $index }}"></label> + <label> + <input type="checkbox" ng-attr-id="paged_users_select_row{{ $index }}" checked="checked" ng-model="$ctrl.selectedRows[$index]" ng-click="$ctrl.onRowSelected()" /> + <span></span> + </label> </span> </td> <td id="userLogin">{{ user.login }}</td> diff --git a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js index 36c372906c..af00ee1c28 100644 --- a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js +++ b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js @@ -142,7 +142,7 @@ } function showAccessChangeConfirm() { - $element.find('.change-user-role-confirm-modal').openModal({ dismissible: false }); + $element.find('.change-user-role-confirm-modal').modal({ dismissible: false }).modal('open'); } function getAffectedUsersCount() { @@ -190,7 +190,7 @@ } function showDeleteConfirm() { - $element.find('.delete-user-confirm-modal').openModal({ dismissible: false }); + $element.find('.delete-user-confirm-modal').modal({ dismissible: false }).modal('open'); } function getRoleDisplay(role) { diff --git a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.less b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.less index 4be91c2266..a32bab5fc8 100644 --- a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.less +++ b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.less @@ -47,6 +47,7 @@ piwik-paged-users-list { } .input-field { margin-top: 0; + margin-bottom: 0; padding: 0; } } @@ -153,7 +154,7 @@ piwik-paged-users-list { .delete-user-confirm-modal,.change-user-role-confirm-modal { .modal-no { - float: right; + margin-left: 1em; margin-right: 1em; margin-top: 1em; } diff --git a/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js b/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js index 66291c5ca2..99904fee81 100644 --- a/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js +++ b/plugins/UsersManager/angularjs/personal-settings/personal-settings.controller.js @@ -81,13 +81,13 @@ this.save = function () { if (this.doesRequirePasswordConfirmation && !this.passwordCurrent) { - angular.element('#confirmChangesWithPassword').openModal({ dismissible: false, ready: function () { + angular.element('#confirmChangesWithPassword').modal({ dismissible: false, ready: function () { $('.modal.open #currentPassword').focus(); - }}); + }}).modal('open'); return; } - angular.element('#confirmChangesWithPassword').closeModal(); + angular.element('#confirmChangesWithPassword').modal("close"); var postParams = { email: this.email, diff --git a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.js b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.js index 79933e0bea..16b63741af 100644 --- a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.js +++ b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.js @@ -80,11 +80,11 @@ } function confirmSuperUserChange() { - $element.find('.superuser-confirm-modal').openModal({ dismissible: false }); + $element.find('.superuser-confirm-modal').modal({ dismissible: false }).modal('open'); } function confirmReset2FA() { - $element.find('.twofa-confirm-modal').openModal({ dismissible: false }); + $element.find('.twofa-confirm-modal').modal({ dismissible: false }).modal('open'); } function confirmUserChange() { @@ -92,15 +92,15 @@ function onEnter(event){ var keycode = (event.keyCode ? event.keyCode : event.which); if (keycode == '13'){ - $element.find('.change-password-modal').closeModal(); + $element.find('.change-password-modal').modal('close'); vm.updateUser(); } } - $element.find('.change-password-modal').openModal({ dismissible: false, ready: function () { + $element.find('.change-password-modal').modal({ dismissible: false, ready: function () { $('.modal.open #currentUserPassword').focus(); $('.modal.open #currentUserPassword').off('keypress').keypress(onEnter); - }}); + }}).modal('open'); } function toggleSuperuserAccess() { diff --git a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.less b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.less index 3e64e1d296..f08a3079c5 100644 --- a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.less +++ b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.less @@ -22,7 +22,7 @@ .twofa-confirm-modal, .superuser-confirm-modal,.change-password-modal { .modal-no { - float: right; + margin-left: 1em; margin-right: 1em; margin-top: 1em; } diff --git a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html index c50105247b..ce2ad658d2 100644 --- a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html +++ b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html @@ -34,7 +34,7 @@ <a class='dropdown-trigger btn' href='' - data-activates='user-permissions-edit-bulk-actions' + data-target='user-permissions-edit-bulk-actions' piwik-dropdown-menu ng-class="{ disabled: $ctrl.isBulkActionsDisabled }" > @@ -42,7 +42,7 @@ </a> <ul id='user-permissions-edit-bulk-actions' class='dropdown-content'> <li> - <a class='dropdown-trigger' data-activates="user-permissions-bulk-set-access" piwik-dropdown-menu>{{:: 'UsersManager_SetPermission'|translate }}</a> + <a class='dropdown-trigger' data-target="user-permissions-bulk-set-access" piwik-dropdown-menu>{{:: 'UsersManager_SetPermission'|translate }}</a> <ul id="user-permissions-bulk-set-access" class="dropdown-content"> <li ng-repeat="access in $ctrl.accessLevels"> <a href="" ng-click="$ctrl.siteAccessToChange = null; $ctrl.roleToChangeTo = access.key; $ctrl.showChangeAccessConfirm();">{{ access.value }}</a> @@ -114,8 +114,10 @@ <tr> <th class="select-cell"> <span class="checkbox-container"> - <input type="checkbox" id="perm_edit_select_all" ng-model="$ctrl.isAllCheckboxSelected" ng-change="$ctrl.onAllCheckboxChange()" /> - <label for="perm_edit_select_all"></label> + <label> + <input type="checkbox" id="perm_edit_select_all" ng-model="$ctrl.isAllCheckboxSelected" ng-change="$ctrl.onAllCheckboxChange()" /> + <span></span> + </label> </span> </th> <th>{{:: 'General_Name'|translate }}</th> @@ -150,8 +152,10 @@ <tr ng-repeat="entry in $ctrl.siteAccess"> <td class="select-cell"> <span class="checkbox-container"> - <input type="checkbox" ng-attr-id="perm_edit_select_row{{ $index }}" ng-model="$ctrl.selectedRows[$index]" ng-click="$ctrl.onRowSelected()" /> - <label ng-attr-for="perm_edit_select_row{{ $index }}"></label> + <label> + <input type="checkbox" ng-attr-id="perm_edit_select_row{{ $index }}" ng-model="$ctrl.selectedRows[$index]" ng-click="$ctrl.onRowSelected()" /> + <span></span> + </label> </span> </td> <td> diff --git a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js index 0ba4aa4a87..6da6187bcc 100644 --- a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js +++ b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js @@ -94,7 +94,7 @@ } function showChangeAccessAllSitesModal() { - $element.find('.confirm-give-access-all-sites').openModal({ dismissible: false }); + $element.find('.confirm-give-access-all-sites').modal({ dismissible: false }).modal('open'); } function $onInit() { @@ -255,15 +255,15 @@ } function showRemoveAccessConfirm() { - $element.find('.delete-access-confirm-modal').openModal({ dismissible: false }); + $element.find('.delete-access-confirm-modal').modal({ dismissible: false }).modal('open'); } function showChangeAccessConfirm() { - $element.find('.change-access-confirm-modal').openModal({ dismissible: false }); + $element.find('.change-access-confirm-modal').modal({ dismissible: false }).modal('open'); } function showAddExistingUserModal() { - $element.find('.add-existing-user-modal').openModal({ dismissible: false }); + $element.find('.add-existing-user-modal').modal({ dismissible: false }).modal('open'); } function getSelectedRowsCount() { diff --git a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.less b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.less index 03dba97201..11b950303a 100644 --- a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.less +++ b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.less @@ -147,6 +147,7 @@ tr .input-field { margin-top: 0; + margin-bottom: 0; } } @@ -185,7 +186,7 @@ .delete-access-confirm-modal, .change-access-confirm-modal, .confirm-give-access-all-sites { .modal-no { - float: right; + margin-left: 1em; margin-right: 1em; margin-top: 1em; } @@ -217,6 +218,7 @@ } .input-field { margin-top: 0; + margin-bottom: 0; } .select-dropdown { margin-bottom: 0; diff --git a/plugins/UsersManager/angularjs/users-manager/users-manager.component.js b/plugins/UsersManager/angularjs/users-manager/users-manager.component.js index 4b8b33e6ed..9cdf402e83 100644 --- a/plugins/UsersManager/angularjs/users-manager/users-manager.component.js +++ b/plugins/UsersManager/angularjs/users-manager/users-manager.component.js @@ -185,7 +185,7 @@ } function showAddExistingUserModal() { - $element.find('.add-existing-user-modal').openModal({ dismissible: false }); + $element.find('.add-existing-user-modal').modal({ dismissible: false }).modal('open'); } function addExistingUser() { diff --git a/plugins/UsersManager/angularjs/users-manager/users-manager.component.less b/plugins/UsersManager/angularjs/users-manager/users-manager.component.less index ea01698d6c..ebbf146898 100644 --- a/plugins/UsersManager/angularjs/users-manager/users-manager.component.less +++ b/plugins/UsersManager/angularjs/users-manager/users-manager.component.less @@ -20,7 +20,7 @@ } .modal-no { - float: right; + margin-left: 1em; margin-right: 1em; margin-top: 1em; } diff --git a/plugins/UsersManager/stylesheets/usersManager.less b/plugins/UsersManager/stylesheets/usersManager.less index c3a47dd7bf..9c43a54a29 100644 --- a/plugins/UsersManager/stylesheets/usersManager.less +++ b/plugins/UsersManager/stylesheets/usersManager.less @@ -93,7 +93,7 @@ #confirmChangesWithPassword { .modal-no { - float: right; + margin-left: 1em; margin-right: 1em; margin-top: 1em; } diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index ca7b2e7ef2..237f6c21af 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -97,7 +97,7 @@ ng-show="personalSettings.showNewsletterSignup" content-title="{{ 'UsersManager_NewsletterSignupTitle'|translate|e('html_attr') }}"> - <div piwik-field uicontrol="checkbox" name="newsletterSignupCheckbox" + <div piwik-field uicontrol="checkbox" name="newsletterSignupCheckbox" id="newsletterSignupCheckbox" ng-model="personalSettings.newsletterSignupCheckbox" full-width="true" data-title="{{ 'UsersManager_NewsletterSignupMessage'|translate('<a href="https://matomo.org/privacy-policy/" target="_blank">', '</a>')|e('html_attr') }}" diff --git a/plugins/UsersManager/tests/UI/UserSettings_spec.js b/plugins/UsersManager/tests/UI/UserSettings_spec.js index c2a1d0d0cc..20a1ac61c2 100644 --- a/plugins/UsersManager/tests/UI/UserSettings_spec.js +++ b/plugins/UsersManager/tests/UI/UserSettings_spec.js @@ -59,7 +59,7 @@ describe("UserSettings", function () { }); it('should allow user to subscribe to newsletter', async function () { - await page.click('#newsletterSignup label'); + await page.click('#newsletterSignupCheckbox input'); await page.click('#newsletterSignupBtn input'); await page.waitForNetworkIdle(); expect(await page.screenshotSelector('.pageWrap')).to.matchImage('signup_success'); diff --git a/plugins/UsersManager/tests/UI/UsersManager_spec.js b/plugins/UsersManager/tests/UI/UsersManager_spec.js index 6b4018ef15..d5f9930193 100644 --- a/plugins/UsersManager/tests/UI/UsersManager_spec.js +++ b/plugins/UsersManager/tests/UI/UsersManager_spec.js @@ -74,9 +74,9 @@ describe("UsersManager", function () { }); it('should select rows when individual row select is clicked', async function () { - await (await page.jQuery('td.select-cell label:eq(0)', { waitFor: true })).click(); - await (await page.jQuery('td.select-cell label:eq(3)', { waitFor: true })).click(); - await (await page.jQuery('td.select-cell label:eq(8)', { waitFor: true })).click(); + await (await page.jQuery('td.select-cell input:eq(0) + span', { waitFor: true })).click(); + await (await page.jQuery('td.select-cell input:eq(3) + span', { waitFor: true })).click(); + await (await page.jQuery('td.select-cell input:eq(8) + span', { waitFor: true })).click(); await page.mouse.move(0, 0); await page.waitFor(500); // for checkbox animations @@ -84,7 +84,7 @@ describe("UsersManager", function () { }); it('should select all rows when all row select is clicked', async function () { - await page.click('th.select-cell label'); + await page.click('th.select-cell input + span'); await page.mouse.move(0, 0); await page.waitFor(500); // for checkbox animations @@ -116,7 +116,7 @@ describe("UsersManager", function () { await page.click('.toggle-select-all-in-search'); // reselect all in search await page.click('.bulk-actions.btn'); - await (await page.jQuery('#user-list-bulk-actions>li:first > a')).hover(); + await (await page.jQuery('a[data-target=user-list-bulk-actions]')).hover(); await (await page.jQuery('#bulk-set-access a:contains(Admin)')).click(); await page.waitFor(350); // wait for animation @@ -131,7 +131,7 @@ describe("UsersManager", function () { }); it('should remove access to the currently selected site when the bulk remove access option is clicked', async function () { - await page.click('th.select-cell label'); // select displayed rows + await page.click('th.select-cell input + span'); // select displayed rows await page.click('.bulk-actions.btn'); await (await page.jQuery('#user-list-bulk-actions a:contains(Remove Permissions)')).click(); @@ -172,7 +172,7 @@ describe("UsersManager", function () { }); it('should delete selected users when delete users bulk action is used', async function () { - await page.click('th.select-cell label'); // select displayed rows + await page.click('th.select-cell input + span'); // select displayed rows await page.click('.bulk-actions.btn'); await (await page.jQuery('#user-list-bulk-actions a:contains(Delete Users)')).click(); @@ -224,7 +224,7 @@ describe("UsersManager", function () { }); await page.waitForNetworkIdle(); - await page.click('.userPermissionsEdit th.select-cell label'); + await page.click('.userPermissionsEdit th.select-cell input + span'); await page.waitFor(500); // for angular to re-render await page.evaluate(() => $('.userPermissionsEdit tr.select-all-row a').click()); await page.waitFor(500); // for angular to re-render @@ -240,8 +240,12 @@ describe("UsersManager", function () { await (await page.jQuery('#user-permissions-edit-bulk-actions>li:first>a')).hover(); await (await page.jQuery('#user-permissions-edit-bulk-actions a:contains(Write)')).click(); + await page.waitFor(250); // animation await page.waitFor('.change-access-confirm-modal', { visible: true }); - await page.evaluate(() => $('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible').click()); + + const yes = await page.jQuery('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible'); + await yes.click(); + await page.waitForNetworkIdle(); await page.waitFor(250); // animation @@ -266,7 +270,7 @@ describe("UsersManager", function () { await page.waitFor('.change-access-confirm-modal', { visible: true }); await page.waitFor(250); // animation - await page.evaluate(() => $('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible').click()); + await (await page.jQuery('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); await page.waitFor(250); // animation @@ -277,9 +281,9 @@ describe("UsersManager", function () { }); it('should select multiple rows when individual row selects are clicked', async function () { - await (await page.jQuery('#sitesForPermission td.select-cell label:eq(0)')).click(); - await (await page.jQuery('#sitesForPermission td.select-cell label:eq(3)')).click(); - await (await page.jQuery('#sitesForPermission td.select-cell label:eq(8)')).click(); + await (await page.jQuery('#sitesForPermission td.select-cell input:eq(0) + span')).click(); + await (await page.jQuery('#sitesForPermission td.select-cell input:eq(3) + span')).click(); + await (await page.jQuery('#sitesForPermission td.select-cell input:eq(8) + span')).click(); await page.mouse.move(-10, -10); await page.waitFor(1000); // for checkbox animations @@ -298,7 +302,7 @@ describe("UsersManager", function () { await page.waitFor('.change-access-confirm-modal'); - await page.evaluate(() => $('.change-access-confirm-modal .modal-close:not(.modal-no):visible').click()); + await (await page.jQuery('.change-access-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.mouse.move(-10, -10); await page.waitForNetworkIdle(); await page.waitFor(100); @@ -326,7 +330,7 @@ describe("UsersManager", function () { }); it('should select all displayed rows when the select all checkbox is clicked', async function () { - await page.click('.userPermissionsEdit th.select-cell label'); + await page.click('.userPermissionsEdit th.select-cell input + span'); await page.waitFor(250); // for checkbox animations expect(await page.screenshotSelector('.usersManager')).to.matchImage({ @@ -343,7 +347,7 @@ describe("UsersManager", function () { await (await page.jQuery('#user-permissions-edit-bulk-actions a:contains(View)', { waitFor: true })).click(); await page.waitFor(250); // animation - await page.evaluate(() => $('.change-access-confirm-modal .modal-close:not(.modal-no):visible').click()); + await (await page.jQuery('.change-access-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); await page.evaluate(function () { // remove filter @@ -365,7 +369,7 @@ describe("UsersManager", function () { await page.waitFor('.userPermissionsEdit .change-access-confirm-modal', { visible: true }); await page.waitFor(100); // animation - await page.evaluate(() => $('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible').click()); + await (await page.jQuery('.userPermissionsEdit .change-access-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); expect(await page.screenshotSelector('.usersManager')).to.matchImage({ @@ -381,7 +385,7 @@ describe("UsersManager", function () { await page.waitFor(250); // animation - await page.evaluate(() => $('.userPermissionsEdit .confirmCapabilityToggle .modal-close:not(.modal-no):visible').click()); + await (await page.jQuery('.userPermissionsEdit .confirmCapabilityToggle .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); await page.waitFor(250); // animation @@ -400,7 +404,7 @@ describe("UsersManager", function () { }); await page.waitForNetworkIdle(); - await page.click('label[for=perm_edit_select_all]'); + await page.click('input#perm_edit_select_all + span'); await page.waitFor('.userPermissionsEdit tr.select-all-row a'); await page.click('.userPermissionsEdit tr.select-all-row a'); @@ -410,7 +414,7 @@ describe("UsersManager", function () { await page.click('.userPermissionsEdit .bulk-actions > .dropdown-trigger.btn'); await (await page.jQuery('.userPermissionsEdit a:contains(Remove Permissions)')).click(); - await page.evaluate(() => $('.delete-access-confirm-modal .modal-close:not(.modal-no):visible').click()); + await (await page.jQuery('.delete-access-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); expect(await page.screenshotSelector('.usersManager')).to.matchImage('permissions_remove_access'); @@ -424,7 +428,7 @@ describe("UsersManager", function () { }); it('should show superuser confirm modal when the superuser toggle is clicked', async function () { - await page.click('.userEditForm #superuser_access+label'); + await page.click('.userEditForm #superuser_access+span'); await page.waitFor(500); const elem = await page.$('.superuser-confirm-modal'); @@ -433,7 +437,7 @@ describe("UsersManager", function () { it('should fail to set superuser access if password is wrong', async function () { await page.type('input#currentUserPasswordForSuperUser', 'wrongpassword'); - await page.evaluate(() => $('.superuser-confirm-modal .modal-close:not(.modal-no):visible').click()); + await (await page.jQuery('.superuser-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); await page.waitFor('.notification-error', { visible: true }); @@ -443,11 +447,11 @@ describe("UsersManager", function () { }); it('should give the user superuser access when the superuser modal is confirmed', async function () { - await page.click('.userEditForm #superuser_access+label'); + await page.click('.userEditForm #superuser_access+span'); await page.waitFor(500); await page.type('input#currentUserPasswordForSuperUser', 'superUserPass'); - await page.evaluate(() => $('.superuser-confirm-modal .modal-close:not(.modal-no):visible').click()); + await (await page.jQuery('.superuser-confirm-modal .modal-close:not(.modal-no):visible')).click(); await page.waitForNetworkIdle(); await page.waitFor(500); diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png index beb187099b..44fce9e99e 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08d9863e3106a42828557019b489b18c3f59b8fe73c3e7461bc22e73a5192cc8 -size 30168 +oid sha256:aea956af521d99b9a8e186642cf7cd6cd9e2dce9878a0bfead6aa357e7c91841 +size 30043 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token_check_password.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token_check_password.png index 0581634e95..eb006a0549 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token_check_password.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token_check_password.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b860cae046ea99abf3e3471030d26ecf622a381848ca89c9840d3ec7543535ac -size 13336 +oid sha256:c27c0aefcd2fbac6d777a62704c1938ce0a8cd4e8ad08f785558eaf868d83578 +size 13257 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token_success.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token_success.png index a1b366a63c..c0a6fd1530 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token_success.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_add_token_success.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcdd1be4d484f5a91595eeca45f74125f1f25cd337c0690b6a8d2099ee11e286 -size 19880 +oid sha256:dde7c360b43d39356b88884089ea59cc053905126a47cc3aa714c97f8bbf5638 +size 19740 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png index 289637aced..1fda56a20d 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_already_signed_up.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d474c57ac0a5e65022b37532e222e601a813dfc57f2f2769a0249761073041dd -size 179676 +oid sha256:81763af0c3f251daf9d70af413873b98e9b4eeae5789303a4a7739ce1c78f2f5 +size 179439 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_asks_confirmation.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_asks_confirmation.png index f3bb22fbdb..4fbb807a72 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_asks_confirmation.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_asks_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b8a848947c95c8c9c2f9d02b5e3da2e08e1e804e40842db50fc716e8d18c57e -size 15690 +oid sha256:ed7c2aaa7a060410004f1b8d22eca038465a1c72254b2615fbeb7bb27687e168 +size 16213 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png index cda9ad918c..5fd6e9d287 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7b99331512ce8bb8ea834ebee3c2c50dfe63edbe1cfde8611ffe5ccf3ba932a -size 204096 +oid sha256:4ba4f964c60dbfda47d0a5c1453e4ef08a405cf7650fd722e5b1f2e0f8a055a2 +size 203131 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png index 10b507d043..bab2699ebe 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UserSettings_load_security.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fde47fe66f7ecc38eaebaa3b8f99364b89790fc6d53d176b516bf252aed19e6 -size 115625 +oid sha256:8f185b259e545cac59097437e44398a3c640a5e4a1042b27cf93439bac49d7e7 +size 115392 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 4b9586dabf..bd1c7bf213 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:e68a6659f6b107aee13e4471862733524698801c09fd28426d114dec75af17e6 -size 191062 +oid sha256:bc867d9b7bbb7d5965817c6b2f617cdb9553bc0a5acd0ce71689ae357450c746 +size 190594 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_add_new_user_form.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_add_new_user_form.png index b0c9a7932d..b35bd860f5 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_add_new_user_form.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_add_new_user_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be50f2ae25128fb46a5234ff200de8afe012b2493752c103249f9e2b44511431 -size 39718 +oid sha256:1bc81bd99c081c6061fea162189726cef978377958ebb702050f0cbf0ff2a1b6 +size 39738 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user.png index b0c9a7932d..b35bd860f5 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be50f2ae25128fb46a5234ff200de8afe012b2493752c103249f9e2b44511431 -size 39718 +oid sha256:1bc81bd99c081c6061fea162189726cef978377958ebb702050f0cbf0ff2a1b6 +size 39738 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png index 78f0131958..f979d791a8 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:881b8cf491c246281b7f5bd6591998814e523adff65f3ffcd9a949a22527bf46 -size 31287 +oid sha256:897d1b83f1362c782ac571981a887aae2f5c845c2a75decf8a3c599b40c21bc2 +size 31354 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png index 46741225b0..18f9e7e624 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cea8e03a372a08bfdd881f180a991ca2c5f3331e82375a04f4231814508b6070 -size 29346 +oid sha256:6c7c0794abf1f3fd77efd505f14035b8ce1a433d676761f1c9ab4511492d63d8 +size 29391 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png index 2fbd18ed4f..980c87333d 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:680be5a74aa9e68571c3857e54d7dcc2b14c3402085c5c920b0274ae45e7bf70 -size 26934 +oid sha256:bc7811697c4f45718f8345de63919ae44f9c8ed95512ae5e902acdf1580f9942 +size 27039 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png index 76528b4c3b..5cf7d9c578 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf9fdff9433feae6029d1aad6c9bc83a41e83934b5b358c1e7a7883dd40bf717 -size 81733 +oid sha256:ed8b282fa6aee9b4430393eca9cb01125f5166ae929b9c9d4e22aa1e89d5a177 +size 81179 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_existing_user_modal.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_existing_user_modal.png index 6f31f50971..244275bc14 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_existing_user_modal.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_existing_user_modal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f653958c2a8fcfca425766152fc714239253668e0915a9f720d95685f414999 -size 9078 +oid sha256:9fa76ca9a9d819b5a95cd787831165498117f3d2be1cb368fad779c771a30f68 +size 9166 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png index 8fde7c6bd8..4835386916 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:efc117075e61966b34739dbe20920078e719c22c7e8035ecf703ee956c90aab2 -size 95413 +oid sha256:5e01078268a089314f9ce962b334ba4461cd394d61306c09d7dd7797fccfcfd1 +size 95580 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png index c9a7f11a6c..26c2ee4e6f 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e39fdcc54246fcf2ba49dac1e637f4eed79891666eb56236cb78eea49adc5b5 -size 12441 +oid sha256:78d0dbec317156bd8697c9665783fb6d3d8273fb8dbb222136cafd146485db8f +size 12793 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png index d16642de7f..7e9c65bc0f 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_deselected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5017f9b512fe2b4c659d13f0489083d58a6bd40bb5ed1524427af6b8995a5875 -size 152987 +oid sha256:f59d6a44be0a3d2fe34b1b9d5a6bf78c90cf91bca95654a118d60e4983615a9b +size 155605 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png index d832faa04c..a25983bf79 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14e394a4e19ea65f2319950c9e023de7f063a57fc14b1b508b7067112fcfb6f3 -size 153560 +oid sha256:279462fcc7fa55c6dcbb435c17b7cd5bbbe3adb496c917487787cdbe9269f230 +size 156207 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png index 9a57bc1005..6b7d8bf1ff 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23decc9b27aed280b7cfed70ea0c9e29dc2016693de8eff03336ce472f73b4ea -size 152970 +oid sha256:c7bb1ee8892d135c5fe3a6fb53c39d097d6e1bda6140834d1dcb5cc1801ab29b +size 155587 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png index 11a197b893..f9ccbcd3d4 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5be0d911fb41602b03bc757fc0586caadbe294d0f9fe0b9c9f81f930fec49ac5 -size 147015 +oid sha256:dc36a941fa50167096f7050e293a5819bd61f01640a9754fac22c6f6c55bb5aa +size 147517 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png index 3f04d80c48..e2d5eb57ab 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d807cf25ada34ca0d4b1f56bf6eafba98e39c254f7583f993d6a4409693ebdb8 -size 138040 +oid sha256:79db4b4419c26579a232f02182aeb685abb67896ab3189db9ea5a4ee950a4240 +size 138410 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access_confirm.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access_confirm.png index f97dd022d7..12d610f69d 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access_confirm.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access_confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:437953b4f27dce988f1f5eab0b3348b5ade6dd36f13d57cacde419df55896182 -size 9507 +oid sha256:a304bb1bf2f8986559bf838d0c62fd360e714d1cb7cbb74cc3734423ae768d39 +size 9498 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png index 7916a71653..2423f09791 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ce6c956e5e9733a5cac0f3260a21daa9da4596438a28ad75f54b0703d931246 -size 137091 +oid sha256:2a172d23ef09aeec425adc98c5f9bd295fa2f03f9013f77cae398912c058ced1 +size 137786 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png index e1c7d76d90..0035767d77 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71c75081c7ff5128332b089982d4eb938221c8aadd207becf82657bacfcd0b4a -size 137829 +oid sha256:bbd5916f4b4778f328671d7dc1c58af5c25d3e84d36153005c7601943be883ad +size 138349 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_asks_confirmation.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_asks_confirmation.png index 8b137101e1..76143a2279 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_asks_confirmation.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_asks_confirmation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22e41bb7a4b24101df93abca863fcd1ccfee6097678212f9d013162ed64b4ef1 -size 21769 +oid sha256:f2ce73a9225be72d455b4518c70ca315c48f1c4c4e5281aa854dd6128b4d5a14 +size 21832 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png index 53c1e01831..896f137279 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_basic_confirmed_wrong_password.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7cb850c6e85bec89f795deb0f831cb899b1fcc1ecc54f0f0e681f63a0a3144b -size 29157 +oid sha256:9decfbba214d8684958217547550f6ff9a713f530f479a55df8a966de9d0b6de +size 29462 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_form.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_form.png index 6df43534c7..54445f27e9 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_form.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_edit_user_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c8452acecd6e414160f08520b7f263ec102c05499bb1a4315c35374af4218f3 -size 22252 +oid sha256:3cc0e4c61197107b903c755fe902b80005a2c370518918833b3d7e3a85131beb +size 22557 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png index 4de371c3d7..fdfe2c4bea 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f90aca41a71ee06d57e8ae970857910435c7b9e174cc0fce7cac839cc56aedb -size 136359 +oid sha256:bc62387993032b9d401e0bc8359390135b8d6a0d2550aef37c54677ef6c5757b +size 135909 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png index cdb91f4a84..da262b1978 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:962aca04a8a83d1a39eb2fe983432c870bfd957074cf4ec7c03025455ba75d7a -size 145454 +oid sha256:d6db7ed875c7e5184044b33e2a0615a1054412c65a757427aa995c981da2540b +size 146072 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png index 67bead171c..3c44c3f6fc 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de72722487199d26a4bd4b628b0054ee13343f77773276fe5b78954a1980436c -size 147151 +oid sha256:2438afbb2c0f9086c405bc0285be1666ac5c64954975d2c011ac9356a94b8575 +size 147680 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png index 7ca391c271..ea738e3896 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b18b5cead542979bd83284a0287be5d7cbd9f9a312caae3a9ed3bf650410cfbe -size 145698 +oid sha256:fc65dd5be0aec3a825f258dd6740f30704e7c0c7df43208e6cc0bce44d18f0ff +size 145912 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png index 3ca349f2f6..3905af7a73 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15e4a73ae1fe61351aa2c1a52fef467e257690f28a070493c1ee2180cff160a7 -size 92401 +oid sha256:8e715e9c4e7f2fe36d89bc2e70ff8ecae5f034aafa5db68d837c779cf619b223 +size 92053 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png index be00a51be5..7db1015366 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f639ddbfaf01a379202da01ddecb685c871025e3531f0e8dd15fa27a13d8000e -size 99912 +oid sha256:259271d4cf385f8d1e985fd6ce01d9f2fae48a32d7fdad3a5100b190a6803143 +size 99773 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png index 1424e259f6..e6fb916fbc 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3121775301b233a88ceefc0b3d7f50ee80365d01bc4f43a6665ff46f58ccb1f4 -size 108812 +oid sha256:1adc0aefc0706ecf254950a24e77bc6af1fe8368b029d815f86767aab21d26aa +size 108545 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png index 04f44331bc..e96e5e6d06 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e0d99db810fade932be9aeb0b4c762018fe0aacb89fd9231441533d6280c66c -size 78340 +oid sha256:8ee471b1f4b031a72e361ac63b54f7d8f4ae37dacecfe25c8a1fade52a8d26b1 +size 77859 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png index 20198c410e..20dfbf0d39 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_capability_single_site.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cca7b42ef7f78092ecc7c6adedc99a9bc693f8e5bbe38fbe94a3f9c6b029f694 -size 91269 +oid sha256:4c80479abbe7f25ae43bb0a9db024cef7ba5726f34aaf692007080f6d0e3f36c +size 90856 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png index 502e9c30f6..87362d351c 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e15ceb1e3fa99a6150c439e315cc80c4b9d324e2ce81afe2498abe84009e22fb -size 80992 +oid sha256:ff401f75f24de08fff0e68b2ad7fcee80809b5d23ae8390112f910fd92338a9e +size 80806 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png index fbcc6799a4..3371f9d678 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01a2c8e6aeffbbe5db6d5e593129528c83d94b9167bf0ee2bab80d51d2308d58 -size 65047 +oid sha256:cd09e3615fc601700ac31f87393a07fbf8e5b9fc918ad43d5d7efeddcd40b82f +size 64744 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png index 67b6b14e63..cbfd6ba54c 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea087e35aad3dc2e8f55f95345130853954d2b14299903ea191a85014167b896 -size 89226 +oid sha256:dbcbf7e65213f590992bcefb0e93f298aaed887616e15f5ec672eb72aa1c4507 +size 88752 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png index ae5d557a41..e854ec7af8 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73d62e84fc3d1e9e062a7c77c34ede6afc5d75d7c37162ac6f8884c76cca7a66 -size 45504 +oid sha256:4a67d407c56d0a9740435a6925297ba7bd8b048723ccba6f8eb509fd6b1c4f8d +size 44888 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png index 402c357644..7c39730899 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd0670020caf112da41856f09b060c81a20c05ed7804f1c3795210f856cc36ba -size 87508 +oid sha256:166f8b1bcbae315fe9587ffd4080471da912353e0d7565c43bb87ed7a45064a5 +size 87040 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png index a794f9e2d9..3346d2c291 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82706ad71b4d3e51ce36ce44a28ada83bee296305f2c7ac82636a3682d14a637 -size 66689 +oid sha256:4292b24535577c46a68376fec4ddbba23ddd62066fee28a9796a3f46f3ea7e65 +size 66431 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png index f773f0034d..5ee56d481d 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:522441f9833afcbc71478df460cafa594ff9646568118152a6074691c3a0dae6 -size 89131 +oid sha256:e17d447afa702a8d3e85b2773116db6396a98c55732ef9fb35e107f996f8292a +size 88866 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png index 91f88cbc03..08d501d630 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f7a42ab1f998e1dabd4f1ddfc3dd8e6deca5f5cc99f086dbd50711818e41189 -size 87675 +oid sha256:2ee7153dd5024e828f8d40a9e1990e44d78b60648bef1e573dcfabe07f9cd078 +size 87198 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png index 15e0a55b11..efe424be15 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53bffbb399a991c179d4fcf3646f6d3649504c165cfac3fb19a6fe3057291c5f -size 138002 +oid sha256:f52a90c3bb935c689836d1f3d5e5339d1e1ccfeb8e7229691265cde834082bbe +size 138476 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png index 704025d531..f0d0574c75 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:000dbc56ab1f5f331adbb0e78cba67448367f72a2d38d2ac94a7bd80cd36ffdc -size 141373 +oid sha256:5d05115b6debde0f7980d7331674de4f8d903092a11b91a9468c34a1d8f988f9 +size 141835 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png index 066bc38941..ce64a92db8 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c73274fd0a6c0a0870d67c395e8f63a6f5f50555d982b28d12af89f7dbeae66 -size 142628 +oid sha256:3bbca0bd6fc883cd9ecaab66a880a16064e8360e7fa8eb5e556aa11ba8764951 +size 143531 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png index 610fb21c0d..184f42ec6e 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_confirm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fd0492e27b5fa7f3ff39573d4a00de9acdb846f0eccec12cf4df5062328ccd1 -size 19813 +oid sha256:c6172543c4caac30c3108272e4a987659bc34f83ce29dd1c2d0dfe3ef6706830 +size 19850 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png index 3836957b92..7bb0f35cb0 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6048de72d919a423500ee5dd956f54e60f9f26b9a27d307d5bcae60ab676e2ba -size 36200 +oid sha256:6e88d0a2492beed0a30e8cf352694c767efb0785a8aaf5e3d95e9e4163b4172f +size 35940 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png index 094ce72e4f..4e47bd2877 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6035d3b1671db3ff0f684c778b2ffe517ae5fd5d2d776ef109669c6945d27902 -size 36103 +oid sha256:a31ad2554c1efceaf1960e884a5b250379531fd004daf88c34267cf8f873461b +size 35862 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_user_created.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_user_created.png index 8e9e31a626..53e40e3e24 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_user_created.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_user_created.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2064f2c35577b73bf020dcebcb34645514e1ddc6a19a960fe0e6469a3a803c21 -size 21883 +oid sha256:c843dc52375738b8bad2f9fdc1c30ecca98681a3c2085e11df25533e5ac1dc73 +size 22225 diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php index 0e1054b188..5bdb57df09 100644 --- a/plugins/Widgetize/Widgetize.php +++ b/plugins/Widgetize/Widgetize.php @@ -26,8 +26,7 @@ class Widgetize extends \Piwik\Plugin public function getJsFiles(&$jsFiles) { - $jsFiles[] = "libs/jquery/jquery.truncate.js"; - $jsFiles[] = "libs/bower_components/jquery.scrollTo/jquery.scrollTo.min.js"; + $jsFiles[] = "node_modules/jquery.scrollto/jquery.scrollTo.min.js"; $jsFiles[] = "plugins/Morpheus/javascripts/piwikHelper.js"; $jsFiles[] = "plugins/CoreHome/javascripts/dataTable.js"; $jsFiles[] = "plugins/Dashboard/javascripts/widgetMenu.js"; |
