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/MultiSites | |
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/MultiSites')
8 files changed, 37 insertions, 22 deletions
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 |