diff options
126 files changed, 256 insertions, 244 deletions
diff --git a/lang/en.json b/lang/en.json index 01354cd542..f1e0e44f40 100644 --- a/lang/en.json +++ b/lang/en.json @@ -327,8 +327,8 @@ "OverlayRowActionTooltipTitle": "Open Page Overlay", "Overview": "Overview", "Pages": "Pages", - "Pagination": "%1$s - %2$s of %3$s", - "PaginationWithoutTotal": "%1$s - %2$s", + "Pagination": "%1$s–%2$s of %3$s", + "PaginationWithoutTotal": "%1$s–%2$s", "ParameterMustIntegerBetween": "Parameter %1$s must be an integer value between %2$s and %3$s.", "Password": "Password", "Period": "Period", diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png index da5c3676a6..a063604c49 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e43a51c5063e88fc56c49d5f4a7357ffef238ca9d0d40e182c90db19cc50a1b -size 378815 +oid sha256:82cefcaa768d7009ddfb3a1fa8f3492d2798737e7b979f0cfcc1e750c4923af8 +size 378821 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 e1ed542cc1..1a2c412d0f 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:32eae9bb7a068bef58a28cc8b1f4437fb2445a55695fa5ecbf6c8bba8a893f66 -size 353618 +oid sha256:15d7a5df9a692335f7a68daa65842fc730e34ac40ad3539076acacc2ca889b43 +size 353624 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 9b3fff4133..714efeac64 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:6794bc960ba114cdeffd4e2b408dddf98e86a023d7682f45ce006d0bb1ece52a -size 80938 +oid sha256:43148b5c8d4b70cb4f47b190d0293af6baa357136e0f57701eb9c38723e474f6 +size 80941 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png index 0723231dc0..548a9a0731 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:931cf07c23e2a960f01838c2848ac497cbd1bb8e93d6934ca927ee78359ead42 -size 484339 +oid sha256:8c033fb1ed5b621c6019a5fce9a1e65219ec6366a1bc047b06c7dfdfe3ec1aef +size 484413 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png index c0ae311a53..7c0bff066e 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:348e275b404dc8d16f0ecd6f5654e6cebf645d76aec116a856b0d91fd5c36541 -size 353524 +oid sha256:f4f5d22d3279248e264bfb4c59702be2dcbed8ef7c945c5e3fecab5b72d202a8 +size 353530 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 04656d3dd3..bd3db806c3 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:7ae0431ecfae984f0f2be35b5adece38a58199f3f8111ed76e7a378300cf162f -size 72821 +oid sha256:db569203cbc5f9fccca60d7fe20050e1e370b13db270aa173f76f38032818fa6 +size 72822 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png index 545999a153..754c984574 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:571acab976f8815a511c3002f7566d2e97b27d2d7facf3db75a5b2b90660d7c9 -size 88948 +oid sha256:6b1be8a4126612707a1a8c9380893ba162a80ae414a2b7b6ab9548b9a1b3dcb3 +size 88955 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 8ebf91905a..5380d7f84e 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:373d959b10fcd5cf26909d7bb3273d35c8d9caa3a61def53cd2397f946c1d72b -size 64097 +oid sha256:13b7ecde8260edea084251c2b79afe01c2ce26bb4b281e9546061925a416cef0 +size 64099 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 c78956a0c7..6d0551e558 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:c4d3a01b6e4efe4c47dfbf5dd39cb7853c5ecb9a062f572406a5c3f4bd043e3d +oid sha256:41620f57d099a01107196fb4915c946604857386236035e942b539eb5cfb532e size 64523 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 256c7241db..de30e34175 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:6698dc11d1e82ffd0d285bf5a924df1b0f43a6864857d32bb09ba19ca8f29f79 -size 71025 +oid sha256:071f8104a21b1a72167bb51e9eb05a89ba9aa3449451fca9b3c01bf25ae3f01b +size 71024 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png index f665ae1d4c..2a5718b168 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d14ac9db64a10cb29e4ed6e2d0e696f3ec4bd28dd681fee7bffe0e6ad3e740ac -size 377593 +oid sha256:509685c0a6015074568d0b0f8bb63cb163aad296a667f502f19c0c9236dd5c1c +size 377599 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png index 8ebf91905a..5380d7f84e 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:373d959b10fcd5cf26909d7bb3273d35c8d9caa3a61def53cd2397f946c1d72b -size 64097 +oid sha256:13b7ecde8260edea084251c2b79afe01c2ce26bb4b281e9546061925a416cef0 +size 64099 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 68f5b116de..d913b448b8 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:9d366013d8b53e44f187914d36e4c8c9b39e46f15cd3374fd9f194b71118df10 -size 73092 +oid sha256:b401f91fa287964a9d219d8e4c186b93e16585cc445d953d4675406cef6dfb5a +size 73094 diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index f952b8508b..79fac09408 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -315,6 +315,7 @@ class CoreHome extends \Piwik\Plugin $translationKeys[] = 'General_Hide'; $translationKeys[] = 'General_Save'; $translationKeys[] = 'General_Website'; + $translationKeys[] = 'General_Pagination'; $translationKeys[] = 'General_RowsToDisplay'; $translationKeys[] = 'Intl_Year_Short'; $translationKeys[] = 'General_MultiSitesSummary'; @@ -327,7 +328,6 @@ class CoreHome extends \Piwik\Plugin $translationKeys[] = 'CoreHome_DataTableIncludeAggregateRows'; $translationKeys[] = 'CoreHome_DataTableExcludeAggregateRows'; $translationKeys[] = 'CoreHome_Default'; - $translationKeys[] = 'CoreHome_PageOf'; $translationKeys[] = 'CoreHome_FormatMetrics'; $translationKeys[] = 'CoreHome_ShowExportUrl'; $translationKeys[] = 'CoreHome_HideExportUrl'; diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 31d30dbae5..a657c853fc 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -941,7 +941,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { // only show this string if there is some rows in the datatable if (totalRows != 0) { - var str = sprintf(_pk_translate('CoreHome_PageOf'), offset + '-' + offsetEndDisp, totalRows); + var str = sprintf(_pk_translate('General_Pagination'), offset, offsetEndDisp, totalRows); $(this).text(str); } else { $(this).hide(); diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index d1e6613199..cd302097eb 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -47,7 +47,6 @@ "Menu": "Menu", "NoPrivilegesAskPiwikAdmin": "You are logged in as '%1$s' but it seems you don't have any permission set in Matomo. %2$s Ask your Matomo administrator (click to email)%3$s to give you 'view' access to a website.", "OnlyForSuperUserAccess": "This widget is displayed in the default dashboard only to users having Super User access.", - "PageOf": "%1$s of %2$s", "PeriodRange": "Range", "ReportGeneratedOn": "Report generated on %s", "ReportGeneratedXAgo": "Report generated %s ago", 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 e98f6db10a..8206489358 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:d7364ea09c23f1ca0387e9983c18cf402b2046fbbad46019d8197ac1074fffde -size 233735 +oid sha256:df2c045ece25d4892202f685cffe5831b98e4c37474e92ff3243521a4030f30f +size 233737 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index d345027ea4..0904afb99a 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:54a0117ba2d5d12255c16adcb36f606e981e19f634e66ff346c2592da3dde2a0 -size 451345 +oid sha256:8eef795ccd2928d1ece55fd5d1efe543107249bfae928fd1fdd4a53d19790fd9 +size 451403 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index b5f2b4c597..8562db968b 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acccf6a691df336135548824d794645f238a9e9fc302dd80479dc874e76e88e6 -size 653760 +oid sha256:98b2d43a636e15844d02456adb19416cc66f7c0c92e5361e41bda95ceca0d33e +size 653810 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index e8fbd442c9..1c29d0f30d 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7bb8d40cf49ee4b77cef496f437003fc7d6de182798f335088b4f86cc887768 -size 653328 +oid sha256:2388da5bc654b90aa6c072a4309c5e5e9123a12a333de3be089884ec49229b45 +size 653374 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png index 93b17ad722..a06e635bf3 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18f27154250ee9e45dea15fc4175f7f2cefcc5950a04eb4d7680c4e4089ebdfc -size 200236 +oid sha256:a5d00ab29adb7a0f29fe6cd5931128c8f5a413f3bf66f37978d3ae1fa7ceee26 +size 200238 diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js b/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js index 0cc399c464..0254a15a08 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js +++ b/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js @@ -28,8 +28,8 @@ updateWebsitesList: updateWebsitesList, getNumberOfFilteredSites: getNumberOfFilteredSites, getNumberOfPages: getNumberOfPages, - getCurrentPagingOffsetStart: getCurrentPagingOffsetStart, - getCurrentPagingOffsetEnd: getCurrentPagingOffsetEnd, + getPaginationLowerBound: getPaginationLowerBound, + getPaginationUpperBound: getPaginationUpperBound, previousPage: previousPage, nextPage: nextPage, searchSite: searchSite, @@ -86,12 +86,16 @@ return Math.ceil(getNumberOfFilteredSites() / model.pageSize - 1); } - function getCurrentPagingOffsetStart() { + function getCurrentPagingOffset() { return Math.ceil(model.currentPage * model.pageSize); } - function getCurrentPagingOffsetEnd() { - var end = getCurrentPagingOffsetStart() + parseInt(model.pageSize, 10); + function getPaginationLowerBound() { + return getCurrentPagingOffset() + 1; + } + + function getPaginationUpperBound() { + var end = getCurrentPagingOffset() + parseInt(model.pageSize, 10); var max = getNumberOfFilteredSites(); if (end > max) { end = max; @@ -145,7 +149,7 @@ hideMetricsDoc: '1', filter_sort_order: 'asc', filter_limit: model.pageSize, - filter_offset: getCurrentPagingOffsetStart(), + filter_offset: getCurrentPagingOffset(), showColumns: 'label,nb_visits,nb_pageviews,visits_evolution,pageviews_evolution,revenue_evolution,nb_actions,revenue' }; diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html index c479798550..2be78996d0 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html @@ -99,7 +99,7 @@ </span> <span class="dataTablePages"> <span id="counter"> - {{ 'General_Pagination'|translate:model.getCurrentPagingOffsetStart():model.getCurrentPagingOffsetEnd():model.getNumberOfFilteredSites() }} + {{ 'General_Pagination'|translate:model.getPaginationLowerBound():model.getPaginationUpperBound():model.getNumberOfFilteredSites() }} </span> </span> <span id="next" class="next dataTableNext" ng-hide="model.currentPage >= model.getNumberOfPages()" ng-click="model.nextPage()"> 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 c39b39ebb1..8ebf77051f 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:b111c55510c661bf8be2e293d18fda7360c5a80166c6d17539a00b39860be3fa -size 73257 +oid sha256:5d217c10905d35d772c83d89129896e08a05a899e95bfc6ec53672229d09957e +size 73126 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 a799c92ab4..04a4a5cfff 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:8d0b745ef8bcacd034893dcdee574c29e3071abeceb1aaa5c201581aed21213a -size 54967 +oid sha256:a51477dd72b89b98fb9906da608416bbbe857fc5af00b4094f0fbf004f07c859 +size 55078 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 c39b39ebb1..8ebf77051f 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:b111c55510c661bf8be2e293d18fda7360c5a80166c6d17539a00b39860be3fa -size 73257 +oid sha256:5d217c10905d35d772c83d89129896e08a05a899e95bfc6ec53672229d09957e +size 73126 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 1601487c7b..3861316bec 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:28aa076f0a9adf1c7169ede698318182088503811486eadb984750dff0235c59 -size 63526 +oid sha256:b49b59a09c20b070e2d9de66c0e6bc78b3e39bb8aefde61c9d9e60b8c87a011d +size 63396 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 d88b6a3395..7c06652bf5 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:eb7f304ab8b22767693ad9107852ea51e85d49da4cdf9edabd319bef4ca63fc0 -size 54935 +oid sha256:0a25c546768a6c95ec1a4aa2507e2a52d40f390f591a02245de3b56e8cc63e20 +size 55046 diff --git a/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js b/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js index 628de72e73..ce2c4aa24f 100644 --- a/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js +++ b/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js @@ -36,8 +36,8 @@ model.sites = sites; var numSites = sites.length; - model.offsetStart = model.currentPage * model.pageSize; - model.offsetEnd = model.offsetStart + numSites; + model.offsetStart = model.currentPage * model.pageSize + 1; + model.offsetEnd = model.offsetStart + numSites - 1; model.hasPrev = model.currentPage >= 1; model.hasNext = numSites === model.pageSize; } diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png index 54053b2caa..4ebca6449a 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:6579c30c31a28357fc4d69f1bf3b5284fc5f9a9ba7d4c57e3df310a1b4954655 -size 180919 +oid sha256:b3497758d0c7c1284f1ae67f85c30c25af6d5208b73b4b27f98e1d4d811810f6 +size 180718 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 06378779f4..aad7c74fb2 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:dd57742a3a94d3ab4f5c47d78959ae84e34cb7e1e741fd968aa54210e908795b -size 186022 +oid sha256:36a8a43b3542fdeef8d4c238b9b28192b5fc1130fd979c05f5d7f91daa1a36af +size 185832 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 5f8482ff74..4ff88edcfc 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:7d6eb4a27612289f11bb30d323e4cd7b21db78ae5d1762377aea42e7aacd61c0 -size 186041 +oid sha256:b83a016f0f4d53242f02d0b077dbbda663780b460ae5d79c8cbe3639bb58c088 +size 185845 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 bd3ce81138..ed4963a612 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:c6b0c8468378d8261840ec6c7c2cf0438527529ddffd8cc50d8a57ddbdc8dcbc -size 188002 +oid sha256:b8805c0ee7c9c33b5ba5856e2fc2e960a365232965880e463af94214240d1afa +size 187799 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png index 9dee4412a4..e6d1804357 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:b294fdd184afee8fca634a9dd84cf5a533ca49ec2b52bff8c726f234001f8cd2 -size 178927 +oid sha256:e2d1cd3d110f616ec24900389d083ddaa00031769670d3455aa5626fbc6a57f2 +size 178750 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 d9085aa12c..8507dadcf4 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:61ad98f703804d44388847ef0acc631df1a8379167d9d1071196b9e114cfcba1 -size 184175 +oid sha256:1e00aee6453a3740e301c6aaee9b5ad5e2782dfc569d3de8b79813ab12fef397 +size 183881 diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php index 2d2d938251..c1d7405f1f 100644 --- a/plugins/UsersManager/UsersManager.php +++ b/plugins/UsersManager/UsersManager.php @@ -221,6 +221,7 @@ class UsersManager extends \Piwik\Plugin $translationKeys[] = "General_OrCancel"; $translationKeys[] = "General_Save"; $translationKeys[] = "General_Done"; + $translationKeys[] = "General_Pagination"; $translationKeys[] = "UsersManager_DeleteConfirm"; $translationKeys[] = "UsersManager_ConfirmGrantSuperUserAccess"; $translationKeys[] = "UsersManager_ConfirmProhibitOtherUsersSuperUserAccess"; @@ -272,7 +273,6 @@ class UsersManager extends \Piwik\Plugin $translationKeys[] = 'UsersManager_UserSearch'; $translationKeys[] = 'UsersManager_DeleteUsers'; $translationKeys[] = 'UsersManager_FilterByAccess'; - $translationKeys[] = 'UsersManager_XtoYofN'; $translationKeys[] = 'UsersManager_Username'; $translationKeys[] = 'UsersManager_RoleFor'; $translationKeys[] = 'UsersManager_TheDisplayedUsersAreSelected'; 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 e35cfac6f6..3657a63d62 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 @@ -78,7 +78,7 @@ <div class="counter"> <span> - {{ 'UsersManager_XtoYofN'|translate:$ctrl.searchParams.offset:$ctrl.getPaginationUpperBound():$ctrl.totalEntries }} + {{ 'General_Pagination'|translate:$ctrl.getPaginationLowerBound():$ctrl.getPaginationUpperBound():$ctrl.totalEntries }} </span> <div piwik-activity-indicator ng-if="$ctrl.isLoadingUsers" loading="$ctrl.isLoadingUsers"></div> </div> @@ -203,4 +203,4 @@ <a href="" class="modal-action modal-close modal-no" ng-click="$ctrl.userToChange.role = $ctrl.previousRole; $ctrl.userToChange = null; $ctrl.roleToChangeTo = null;">{{:: 'General_No'|translate }}</a> </div> </div> -</div>
\ No newline at end of file +</div> 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 c60b01ec6f..02c5c3425d 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 @@ -59,6 +59,7 @@ vm.changeUserRole = changeUserRole; vm.onRowSelected = onRowSelected; vm.deleteRequestedUsers = deleteRequestedUsers; + vm.getPaginationLowerBound = getPaginationLowerBound; vm.getPaginationUpperBound = getPaginationUpperBound; vm.showDeleteConfirm = showDeleteConfirm; vm.getAffectedUsersCount = getAffectedUsersCount; @@ -180,6 +181,10 @@ return result; } + function getPaginationLowerBound() { + return vm.searchParams.offset + 1; + } + function getPaginationUpperBound() { return Math.min(vm.searchParams.offset + vm.searchParams.limit, vm.totalEntries); } 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 5295e4e18f..c50105247b 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 @@ -86,7 +86,7 @@ <span class="counter"> <span> - {{ 'UsersManager_XtoYofN'|translate:$ctrl.offset:$ctrl.getPaginationUpperBound():$ctrl.totalEntries }} + {{ 'General_Pagination'|translate:$ctrl.getPaginationLowerBound():$ctrl.getPaginationUpperBound():$ctrl.totalEntries }} </span> </span> @@ -215,4 +215,4 @@ <a href="" class="modal-action modal-close modal-no">{{:: 'General_No'|translate }}</a> </div> </div> -</div>
\ No newline at end of file +</div> 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 66065d0728..e1e4958c17 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 @@ -58,6 +58,7 @@ vm.$onChanges = $onChanges; vm.onAllCheckboxChange = onAllCheckboxChange; vm.onRowSelected = onRowSelected; + vm.getPaginationLowerBound = getPaginationLowerBound; vm.getPaginationUpperBound = getPaginationUpperBound; vm.fetchAccess = fetchAccess; vm.gotoPreviousPage = gotoPreviousPage; @@ -180,6 +181,10 @@ vm.isAllCheckboxSelected = selectedRowKeyCount === vm.siteAccess.length; } + function getPaginationLowerBound() { + return vm.offset + 1; + } + function getPaginationUpperBound() { return Math.min(vm.offset + vm.limit, vm.totalEntries); } diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json index 5c54a7d238..99d585aed1 100644 --- a/plugins/UsersManager/lang/en.json +++ b/plugins/UsersManager/lang/en.json @@ -114,7 +114,6 @@ "ClickToSelectAll": "Click to select all %1$s.", "AllWebsitesAreSelected": "All %1$s websites are selected.", "ClickToSelectDisplayedWebsites": "Click to select the %1$s displayed websites.", - "XtoYofN": "%1$s - %2$s of %3$s", "DeletePermConfirmSingle": "Are you sure you want to remove %1$s's access to %2$s?", "DeletePermConfirmMultiple": "Are you sure you want to remove %1$s's access the %2$s selected websites?", "ChangePermToSiteConfirmSingle": "Are you sure you want to change %1$s's role to %2$s to %3$s?", 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 da32d8a10f..fe64f5cf60 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:e53d73a510f1c7479aa0a61bc9a4401f3ada6412d4c5936a4f39f01fec0d6938 -size 80549 +oid sha256:1a992036679293e4a70c5a0f977a1324052b53b649d353fd65bfa25c3b8d1e53 +size 80540 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 b6a0770cb0..ca3ab57fc2 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:446b4027bd42df96d170c568852063182fe21a853cc7f877a94b8f8dcf920182 -size 108447 +oid sha256:4aeb9086df4521c6bde46f4f344620a544404e13c41e23f9087138e842dbd52a +size 108344 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 abc2f48332..05972ae1be 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:c29133fe81c8ccce8086de231c6d3fbf96589d6c30d340e00cc997ca47d313b1 -size 161819 +oid sha256:b666c634e642ac44c50f4ea411f2124dc265bd747bb907ddd478726ea4260323 +size 161895 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png index d46bdcfadb..69234ea5d1 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:939e66b5c4cb95890a2dee58b0e55745af574cd904ae54d94f5241ca98d0634f -size 161818 +oid sha256:8a6cd5db35ac81eb7ecdb85f4336cac2608e01244c1caf01cf68a60cf628ab23 +size 161895 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 d46bdcfadb..69234ea5d1 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:939e66b5c4cb95890a2dee58b0e55745af574cd904ae54d94f5241ca98d0634f -size 161818 +oid sha256:8a6cd5db35ac81eb7ecdb85f4336cac2608e01244c1caf01cf68a60cf628ab23 +size 161895 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 ec032e499f..8d5883c35b 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:1ba88f9ed89a81b943a70da4ca19473fc20d898a5a18c9c4d1fc3a8e8fecfb80 -size 156814 +oid sha256:7b06a999abc1d82f7f05504982a2b98a3848a95e3a9477704a45d89629ba07ec +size 156863 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 4c23537ad7..6573a7aa54 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:b590350831bf72fa4085ab9754433dc69ee35a86231b17104da9b3b9ee328351 -size 142796 +oid sha256:ca7b1018f351cb40d46df3b622768c5bed3e1538fe99bd9e5a6497b49b9b8061 +size 142861 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 bbb6a1d124..458a341bbf 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:3ae28122fef76c910c64a13cab3ecab46cd823bbc7a2b0e8c857831fbe5aba65 -size 155379 +oid sha256:b9cec4b754e5849c8f9e1f19c78c5d0ae040aa043692d0a27a41ed0c745f0f9e +size 155289 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 7ca8d9763c..54f19d2678 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:2cbabd2e695a24daeb9d00d74755c5b7270ef5b40507b32d033284d2db3e4557 -size 142902 +oid sha256:d0ca416b08a3694ddefe3536e1d40eb0264bd77e214457023a9205719899dfae +size 142806 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png index 34d59aa733..ae9354135f 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:1f4c0ec9766420ffa29e42a0585f3c23a69f8b57672ca9f1875a8e8ccbc1d700 -size 141469 +oid sha256:63bab18bcbecc3bf3dfddada93a6eb459f178bf0fdce4cf0c5e87e66af9b4c58 +size 141355 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png index e0a90d3452..a42f2cd5c2 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:1001a998713681241d9163f0f59371acdae0269b647106b79e7c98453d8f6ee1 -size 152550 +oid sha256:a93fe86c57e2fda781c1a643b06513a73e2c445d57746c072ef6200eca92eb35 +size 152489 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 5c5f293f35..66f8fae3ff 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:eda2d1c1092176cb3afb178d9e52b887b769a2b89b7df6fe45f8982f29b6f325 -size 149690 +oid sha256:e651f3c3ca488e4c7a2cb21c2967ec5cefe203b53854594cdd9a044b51b04a86 +size 149611 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 ecbe5cc1d2..e8bddcfbdd 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:e07b964a068d778560d0cc468e00101e59fa159303d3cb4fa9ee16ec451faab1 -size 154848 +oid sha256:73842631d4e8364fd12ed690456dcd5e5aa3f59bb6be0cf949b74fc0171d9483 +size 154849 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 30b933ad74..db504e90f4 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:22b3a53cd7fec71d57faa1b335efbdc4a56c80bc0b01ff3897c2e83afd0a42b9 -size 99635 +oid sha256:9bf2b6803c3f8f854904525bb6b732ebb10c12337ebb4429a9dd443a1bea8d06 +size 99676 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 f844af5c8f..f7ebb1e16d 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:74b8da48bf60b49101242bf8f0568847a63cafc1327b162348c6569962815a79 -size 110156 +oid sha256:0f0178ad819f50c522695f6ee26f49f3d234e69d45c03926e53bc6ba931f5319 +size 110189 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 c372f70560..7bd52d8da7 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:873ab7849c3ad5cf11702b7f09204e3e2a1a4e9350c0546e4c5ef8375ce7c47a -size 106499 +oid sha256:c3de312697133d2bd8f9ce29af03036d9a3fe232b8107a00801197c14c949595 +size 106504 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 406b3c94c5..663c9724db 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:4879cc4a520db1072e5cc8665c0513d6e559dc961256550c2078ddac96da8eae -size 87826 +oid sha256:a60334be90dd50374bbff65d7ca85baf93d57b74e79d323dfaf3389705dd74b8 +size 87863 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 2f1deb0437..44f7cb3811 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:d47601f5098fd7c909af44a5ae0e118afc4402e1d916b85ffbacbd58ffc0cdbb -size 90338 +oid sha256:63a85148040533f91e587ae827c16a83275dec92a938de1bddf0cedced2d002f +size 90296 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 ae50dd4d78..bd062772c5 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:46e7da989ac5e931445d4b5a305c123e2f820af08a7db0352e84724c4fb545d9 -size 104403 +oid sha256:f522c3fbd71c9818978d0443f06ef28b5a588ed9236471a11adf36784dbeb46f +size 104422 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 cc38a01a3c..531ba20bce 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:e20620c5f62d652fd392d797c73ca24aa885cd65e1852443b1f0b533bdb3a328 -size 89862 +oid sha256:e151f66a3a927c11fd61b08b7b85edc8c9b1aec3c4d690509dfd3132ba64278a +size 89869 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 c08db9fab7..3c29fc51c2 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:bd6fcc234e579981a293655cd9dd32af5a4959725268dd2e24da89ad3f07ae20 -size 91907 +oid sha256:ec7d718ae1e01251c2f5560d1f024dad3d9df6ad911bfd54a4dc38fefa616eac +size 91915 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png index 66e7a5bdf7..b9b8a52fdb 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:015387b5883db92467c2556a4594172aef37e7d4cce879923487e6857553b4aa -size 142213 +oid sha256:757455c8b741db255bf771567455715bf62de8a05312dd12e58de807828aad5d +size 142269 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 543f209d92..6eb94b86a5 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:268b8153adda52f709c91b9a494dacca4157b80a85bfdbf8f60d46b1bb1c796e -size 148372 +oid sha256:1f0ebed17464c2b5d95e76d539081f392bb3bda69fabc8839263b2f731f82a63 +size 148433 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 cac10d7a7c..9c302af207 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:77c1f32f5b2644f11b53b31c5cafa123655f4f75caa6cd26fb0b1582af4dfaab -size 149559 +oid sha256:7733b9179ceb89ded9320dc1b1308272bb6484566e7b16b3ac9ea05ad931dfdb +size 149628 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png index da9c3ded48..38244f4757 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:587f258e4c53b324b67cf14f7313854151124aa756a23ae5d4f28425a49ffcf2 -size 39433 +oid sha256:2f37c9c50388313cf36d815cff32edca2b21aa3ff96ace57c719cd9b4bf34ad2 +size 39431 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png index e0d300c6dc..a3f1eefcb2 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d1cfdf492372c7508e95af3210fec6e3ebd563b60179a6b7c0ec110c214ee47 -size 57964 +oid sha256:61351315158c71e769d5f9717b60278010bf6f659dfcf12098d47f247dc02c92 +size 57944 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png index 4bf670532a..08da6bf361 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0218985dd598a814b5f5a66c497a0485050524932a60bd0bbe079080d43c9538 -size 37580 +oid sha256:a2aa58855612edb89f48fbb6e456530666a5ebffa681979cf8c3816c22abb981 +size 37577 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png index c331b23265..16b8dc6fc0 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b3ac8678d209fc6566b39c65eab67b47817b04b0b3c21122478fa958dd505df -size 92191 +oid sha256:2d04a2ce950821acae5e0c0997fbead2c2d04c1c0c848408d89ebe4d6cfcdca1 +size 92223 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png index 8c3e5d4081..10e8af33e2 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:861d6bfa71bdb9a53ea3f48fdc009aa0170317e16f2b740635cd0c5014d2ed3d -size 65091 +oid sha256:482a1f33268af4ca6fda675cbd2dc978dc458408f6bcd995896ee3634b8affa6 +size 65069 diff --git a/tests/UI/expected-screenshots/GoalsTable_initial.png b/tests/UI/expected-screenshots/GoalsTable_initial.png index 4b29f448c2..ccf9eae6ad 100644 --- a/tests/UI/expected-screenshots/GoalsTable_initial.png +++ b/tests/UI/expected-screenshots/GoalsTable_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d6ec374311f2865309dda614786ab8b0691cbb4942786cb123799b5d7bbbbc9 -size 63501 +oid sha256:b4dafefd623904a1cfad1de27e313a51a49a673f7196ae7f3e89d21c1c86d9b6 +size 63477 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index 1e39df4db6..e28b04c6f8 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1056cfe72fa290cfa131242c66b15de97b3cb7900fd67791647ff844b242e459 -size 448364 +oid sha256:0edcf26b7e1c39b29fa26874a7ff989f3765343b7923327fd4dbd346b61c97cb +size 448201 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png index 3a200adcee..e8b6148bd6 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:687cfbf1450d8ed0ca9ecb47e722b7344419b23953803d52327a2b77584e2fc5 -size 164928 +oid sha256:8857d42ec3cf82be7214ea4e781fde024e6bc1f3daf49e053639b809e923a6d0 +size 164839 diff --git a/tests/UI/expected-screenshots/MeasurableManager_loaded.png b/tests/UI/expected-screenshots/MeasurableManager_loaded.png index e0676aff9d..da192b82f5 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_loaded.png +++ b/tests/UI/expected-screenshots/MeasurableManager_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79b03f6eb5df9bb6165cef582f27dd14cb5d6f9904221800265045bafdf120c5 -size 183484 +oid sha256:2300d2fed5cbfd6be8abc17863cdacf46e66b231a071a82da027d6b75889c48b +size 183328 diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png index b789fd22b6..663d052717 100644 --- a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png +++ b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51883804a895dd5195180db59940463bd270433ba5eee644d4b4e8be7aa9eb15 -size 63921 +oid sha256:8c3b01c917f94aed3b5ee66f97f3f547e8684c85e74cd6949093122816efeeb9 +size 63911 diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png index 23fb8b923f..17aa2bbdd6 100644 --- a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png +++ b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aef1cd693364c37d536136fa6938493a3dc84c9e88f55174305411cd8da3566 -size 56526 +oid sha256:2792f43b90b7629c13ddadd83316ecc066c5379563f2cf37be96fdf01fcce34d +size 56537 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 6c6759fdfc..bd9b16f21e 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72aa683795d1c206ae88f94f30c808e72cf6eecd0e535eb659370780f475e915 -size 656542 +oid sha256:2f2a03520c21dda38ea56170a4227ea2d5dd0fba9f31101974e0648b8afe36ef +size 656233 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png index 544bfa9355..c5b36fe268 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bdc5988d4776d4e8063b0f439a9dadbc15534e418482a65f793d82ac9de4eee -size 46788 +oid sha256:b7fc18ec9bef1ede33fb6c10d7608ec45d040710cd04f91930b939892bfbf74f +size 46800 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png index 6293b9985f..6cc356307c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98dce660fea8c3c061aabceac89477bf736f13367931c6cce62f010404b755db -size 38110 +oid sha256:e269ff6211eff04fdabf714afc63d80fe909e72b4880500876f0c98630246be2 +size 38091 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png index 62f059ea4b..878558a928 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbdaa5cb578a9d04ad919c3719546eeaa14271798d1ee0dd536a5cfb2fedd6cb -size 51870 +oid sha256:6f7b2d58df8a7ccad27f08ea419c96e3be1afc8ceb33b4915a23c4223daa1e1a +size 51872 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png index 51ee1387b5..00b839776a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bbef11c45dc433ce5ec5731a4fe02cb0999cf80c5a68bce343d4894387c70c4 -size 27053 +oid sha256:5d01312bcd516f479da7770fb51648cf7a573cc6970ec02804ca1a2953697f0b +size 27049 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png index 4d8a98358f..9d3de37956 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e2f584143a838ee0d5c79fcfcee7aaa294eeb778611b4599e3e38ffcedb1f6f -size 36273 +oid sha256:659b81e6860c40a4050c6859bf8615741c4cb51d731de99ff87686af4ae9a7d3 +size 36272 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png index 0772496d7c..0a5230d7c8 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bbd1e42b10e7a024c57b396d5d1dd93e95fb8f83853025f19139c08da80ebed -size 188784 +oid sha256:6e367868294b3c641d9fb322efaa10ec9a897992ff5d094710e5e45624f3ce51 +size 188798 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png index 2a4d2dfa05..ddb6bc68c9 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bce07cb89c01f7b8cb76a7a70ac0917d715480bd777fe496da0dca110b61984a -size 187724 +oid sha256:d53e4d8d6ae792f6c760818d49e3db2623c94aa9dee48e042c08e325d1a86fe7 +size 187736 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png index 22d6e4731d..772236abd3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a068b9226ce723806f9b1fc06d32544c58b3e828176d6fde0337e8a62a0a0a71 -size 40791 +oid sha256:2d4f9ba912b11bcdf1d8724debc46b7794e25304ebf037ec750893f67218d44a +size 40783 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png index 3a43863650..7d70f2043c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ae6a30bf7bd8f2d12422a017a6011034e9d0aa003537e7905bf115ea2f9d6d2 -size 440526 +oid sha256:4cbc63df4a772265df5063c104c1a411dc8d3528c56b9b302f46855c282219ff +size 440537 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png index 12094fed5a..006960a3c0 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7d1707cfe6883529d9a67f08422bdcabdc996770267a7181687255ad472a28d -size 320268 +oid sha256:705672affa6095de0fbb33ab7e5e503db5fbb0a08231957cd71f646d10d693fe +size 320260 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png index 82eb781d35..bc155c54ba 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d85947fc3902b94782647e94d863090794156fd337b15dafea13285742a287b -size 340544 +oid sha256:4e385aa71569ea9cf7911959506d72e7b289a32fdea1405bb2c40e3b9acfef92 +size 340534 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png index ff3fc1fd6e..e9bcb7beb6 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6690227d1c3a9a619099f2401525968ed24f31ba558788c23f523226a89384af -size 101027 +oid sha256:e4730e97586a33a79bb02a0c3db2338f9f3b7955e332c7878409cc0154a824e1 +size 101106 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png index 45a6d94f38..7e025adaf1 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db2c52576282de6ee1c36bbbca93c0fcca4b3f46b4569732863c809281ab2c48 -size 204004 +oid sha256:4e94da24208d2a51f73d7af8acf73f9fe5b1402a480fec96c18a3ae62001f5ad +size 203722 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 7b797941fe..d478b69700 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61696bef1357a367766976555bdc90db3be051f03c68e7097eae4fed80fc901a -size 602888 +oid sha256:ce9152942f597f46307475768575a6cbee4e05f08ebfc684e2c76a46f86317c0 +size 602883 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 5c2fbdb099..d9aa6401f9 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d9af30be707f87f5579c1066c0ed3ad935a2d991afe2a1c95d876643ad368b7 -size 1589017 +oid sha256:1ef15a493999b929e00665c7d3fcc1a9d1fe33815cd19e01c6f30a6ea5f20ee8 +size 1587956 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 6eddb9edf2..f50ef45357 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed0cc66e3683214a34ff2e27346d1351e748792149ddcf42f8241cad78805d02 -size 707560 +oid sha256:1ddccc11542e9addbcea3f2a819d85389167f86870b823304d43555a7be6bcba +size 707326 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png index 441edfb026..a90e2fa2ff 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cbc9b055e0fd9a7a4b4e9988f4c47af751c1519f217a501cabf7c1a4408f7a5 -size 48649 +oid sha256:e238adb800bce9ece15ddb4bc8582798f10c212ff34e2b719b7163aa5b4f61c3 +size 48660 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png index 719d2fcdea..3fa769393d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:813dfe189b299559d364e23fe340acc377d45054cc26cfc71a441910bb15a0d2 -size 86277 +oid sha256:1b0e84fbf3022f46b200e3c0727b056644bb9e187fb856d5f799201d3386b20d +size 86255 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png index 4a9ec347b9..db33af1d29 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c8447a9bdaffdfd2940d0cc72d45d27a6d1c59d53ba13b38d33d1ef6c9f68b7 -size 37626 +oid sha256:900744442ad7baa1ae8a871515abe73132052a35558299c92509fbb037886c1f +size 37621 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png index 9c02538f72..c6f43fe3ae 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f0bd84d9dc2c50097c053318c03d0e2724d2579ea3a366da3223c8032ee5094 -size 167453 +oid sha256:af8141b2b4f3c1b579b84ecd10c7d804febd28d3893feaba117e33fd0602496f +size 167450 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png index 31513daa7e..64dcf72874 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c8494fd6b71d3425bf02a60aed6266b7e60f97fa7b53f9c6fff84eacf195236 -size 147856 +oid sha256:9d9f4faa7f3ce6b3942baf82edc179d4faa232319a187c10ce90dbee009039c2 +size 147849 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png index bdf1a60947..c0c6ad3674 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54aa524144cab6ae146a4385b9353cdba1e1dfee2045d6cec380b3dddc7a7dfc -size 70016 +oid sha256:28620728d3cf48a1b7f97d03330364b77a65ea7fbe0f2a93f62ffa5ee557d2cd +size 70012 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png index 1334761955..bdbfc1aafc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5363bbe165e598e64404a65a6058db15602391935d4d118190eaf3f95b0d097 -size 104053 +oid sha256:9146c737df4c7cc377240a1d49274daea56b60f10ff61340ac91b69730b7525a +size 104013 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png index 69c9febc78..0862f381ad 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23e25a534c833585f82b088a0f6b590b04d8aaab5be538686be2dea2140ddc53 -size 81126 +oid sha256:99bbe69edf1958d2114d3b7067102eadb4cc6dede862845f9d8358f5c5fc3eb4 +size 81128 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png index b628d8be4a..70a91dc19f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8761a592b61bac22d84b4d181de550e05715b831e114694d68818b6cd411ac61 -size 61132 +oid sha256:cdb2aad124f15678238491a6cbb295b79f8743da30242a3ee50400221574573d +size 61135 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png index c85ccb1a78..f275319a50 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:113f96247d7d71664285d8c6fa96ecc7338a30b513de729d0d2fba8c9d95b6f4 -size 86677 +oid sha256:5fc2dd871e3b495a4fb344429f63e1fddf8f5f2aa126442a74dca3df0c356d03 +size 6343 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png index ec90887d99..f3629f556b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94b587ccc9d32237f16dd2cb1f067620610daab504d84ed83c4e81cd2d7ec3ff -size 167508 +oid sha256:d310f82c3f3f0ebf88b1311c9dc8a7f8e336a4f9f7a720e24d57291c9be2ff2a +size 167674 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png index 8fa9fa981b..e1b024a6c2 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:594d4546acfcca0b9348265e4ed9363b945e5285135acc237bb123c8577262da -size 159144 +oid sha256:a755537387f46a6d7d118109b4d8a6e7807699ab9ced8abe9d1fe3c0fc151b0b +size 158977 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png index b4a2b12eef..ca6ca13b0f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ca7cfc6474d8f51c5ae805944b8d2f2b39edbf5e44cd2a3ff93f733cbf1f6db -size 68931 +oid sha256:de0c39108b500540ae57030faf5669be036baf338bb85f3d89c95fe6651cfcba +size 68808 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png index aa41daa311..1092e40960 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71ce8975fdcef9ca8e41f0c37c02138b64088b3d3a8ed6641d33335c3fe3eb4e -size 44085 +oid sha256:0f89b9e6d9b3ca2f4082f9ee9305edffe8aa892a1ded86c09771cd13966bcb07 +size 44062 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png index 5810888740..2abaca18f8 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9728974ee61f2211046c3ec8c27dd254b91f12d5b92e126da68af02d8420f45a -size 58362 +oid sha256:545f87e903f9e66119bc2763a4debff6dde4e8a03b88cc7eb87171bd1b7c5907 +size 58438 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png index a581a83506..35ed7314cc 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91ff5344541aee27e4066e16f9b76b5942520a3e4f1f6c1f1125aade11316acf -size 66506 +oid sha256:24026e46da3ed42945cd07bdabd340edbb4264ac67ed22d4d569b5686b319877 +size 66616 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png index 314377f4a2..c5d79bfd35 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1749f4a51e382037cee4b1c35280ce7f6088947ab9fdd303142ff901e396a5d6 -size 70897 +oid sha256:91929906808cfa3ff745a9f6c7cf3d19caec45e4ba7f91fb6c5ab316b0b3d500 +size 70970 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png index 5810888740..2abaca18f8 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9728974ee61f2211046c3ec8c27dd254b91f12d5b92e126da68af02d8420f45a -size 58362 +oid sha256:545f87e903f9e66119bc2763a4debff6dde4e8a03b88cc7eb87171bd1b7c5907 +size 58438 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png index 23ee780a1b..79857ccb8e 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ea3f1395d8d874821002319fa5b76f980b3bd76513d418e4e04c2e40be9ffa9 -size 65291 +oid sha256:572a0188b54828e44a78e6d959355ff9ff512c65261a7cbb87fd05efc09f969b +size 65369 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png index 33e41cf882..6667494b73 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f82c227605a4824f81e36f5e769c3cbc397363b1aba87fbd39e8410dbe333ec -size 44220 +oid sha256:4b9c34684315ae6a933b4822468f6cc1f5a05ccf3e7d40550617c381665811f0 +size 44226 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png index 0532b607ef..f4e8e5f2b9 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9eb506193bdd83b84cf7af3734f4dcf7141fdef063f25941e80026f201fd7f84 -size 54449 +oid sha256:6f534b41ac5c68bb08afed6d47a322a75d522e379b9ca2c4d0cc5eb27b87bb9c +size 54423 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png index 67966d503f..d0c4bae352 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49e58044be527579c1f6d5f7e46e0896c03697ed4ab8f8d205c7837ed3eb82f7 -size 60391 +oid sha256:690d0fdedf4580d1a8805bca27e5403c74309e48548b933d1ace6794d31890b8 +size 60364 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png index eea3e36e33..4d4bf5b1db 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83b80157c952005f67a2bb11c9c0c804886861684e804542fd2bbafb211d0c9e -size 50687 +oid sha256:c00becd8a452c9dac546184df312130f54d3c0ebbf552f0d42d0eea1d0ae87c4 +size 50688 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png index 4b29f448c2..ccf9eae6ad 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d6ec374311f2865309dda614786ab8b0691cbb4942786cb123799b5d7bbbbc9 -size 63501 +oid sha256:b4dafefd623904a1cfad1de27e313a51a49a673f7196ae7f3e89d21c1c86d9b6 +size 63477 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png index a101864a5a..0662b31df6 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dad09169b1d5e5c618b7d178c7fc894099663f2ed7a9307e084c0306aa164916 -size 83196 +oid sha256:5d4b594e837ed381ce418886f4b7586a34cb0972d5bdef42aefdd72ef025d5a0 +size 83118 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png b/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png index 84f88360bf..94ec97e380 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff6fa18687246cff640395b8c8edd3552659d038920543b9cf3b32b1668f8e76 -size 39570 +oid sha256:b7e67dff3aee4de684160ee724b0da7a1e837be2e7ee696bf550f28f32ba1c0e +size 39550 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png index 62be1a60cd..9dd6eefd9a 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fe33530bb06ab117dd67cb88b9eb98ba1c7ba764f249a938649ecabc515fc87 -size 87077 +oid sha256:2062c4275e9eb35757fcac44457deb47b0b8f2185569fbe9e35bc49c9cfef2d1 +size 86995 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png index cf6a10a7c7..21299002c3 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04711a71028bc7bdf74946c556cac7c031caed26ed517a5bf927fb221df32e7c -size 39559 +oid sha256:d85147d823f1e0236e8e2fe8686730993b1a3936a13ffd185bb6f2efc2f8186a +size 39594 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png index 8d4999bdb4..c8f620dc90 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:705cd7f1cc76229c92c48372a83b2cdeca90d0d459f9e0ea985715386322a6ee -size 71113 +oid sha256:52ef79b8a5938ae9890016fd6acc4b9f4e349677aef65807c613c02d2fb5916c +size 71179 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png b/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png index ecca353ef7..d0fbaab042 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5d44aff828bc9f6de654a0974c7aef3d88f321f0e4437be7306398b19b88183 -size 45669 +oid sha256:03877be90f1dc487da181790e57b9c41b9bd7aa29499e905fc928ee922b7c0b1 +size 45652 diff --git a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png index 7cfdf00f13..c1c81108bf 100644 --- a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png +++ b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23799e852c985b0812101c30c647d8feb08078dcb28fafe8829f4e54ebd430ec -size 676522 +oid sha256:9fc1cddf78d5b15fc7f99903cf21ec2895df08aec5f6ed6fde803e854f2717ce +size 676580 diff --git a/tests/angularjs/bootstrap.js b/tests/angularjs/bootstrap.js index 8ae7d16bee..dbd285eec1 100644 --- a/tests/angularjs/bootstrap.js +++ b/tests/angularjs/bootstrap.js @@ -21,7 +21,7 @@ piwik.hasSuperUserAccess = 1; piwik.config = {}; piwik.config = {"action_url_category_delimiter":"\/","action_title_category_delimiter":"\/","autocomplete_min_sites":"5","datatable_export_range_as_day":"rss"}; -var translations = {"CorePluginsAdmin_NoZipFileSelected":"Please select a ZIP file.","General_InvalidDateRange":"Invalid Date Range, Please Try Again","General_Loading":"Loading...","General_Show":"show","General_Hide":"hide","Intl_Year_Short":"yr","General_MultiSitesSummary":"All Websites","CoreHome_YouAreUsingTheLatestVersion":"You are using the latest version of Piwik!","CoreHome_IncludeRowsWithLowPopulation":"Rows with low population are hidden %s Show all rows","CoreHome_ExcludeRowsWithLowPopulation":"All rows are shown %s Exclude low population","CoreHome_DataTableIncludeAggregateRows":"Aggregate rows are hidden %s Show them","CoreHome_DataTableExcludeAggregateRows":"Aggregate rows are shown %s Hide them","CoreHome_Default":"default","CoreHome_PageOf":"%1$s of %2$s","CoreHome_FlattenDataTable":"The report is hierarchical %s Make it flat","CoreHome_UnFlattenDataTable":"The report is flat %s Make it hierarchical","CoreHome_ExternalHelp":"Help (opens in new tab)","SitesManager_NotFound":"No websites found for","Annotations_ViewAndAddAnnotations":"View and add annotations for %s...","General_RowEvolutionRowActionTooltipTitle":"Open Row Evolution","General_RowEvolutionRowActionTooltip":"See how the metrics for this row changed over time","Annotations_IconDesc":"View notes for this date range.","Annotations_IconDescHideNotes":"Hide notes for this date range.","Annotations_HideAnnotationsFor":"Hide annotations for %s...","General_LoadingPopover":"Loading %s...","General_LoadingPopoverFor":"Loading %s for","Intl_Month_Short_StandAlone_1":"Jan","Intl_Month_Short_StandAlone_2":"Feb","Intl_Month_Short_StandAlone_3":"Mar","Intl_Month_Short_StandAlone_4":"Apr","Intl_Month_Short_StandAlone_5":"May","Intl_Month_Short_StandAlone_6":"Jun","Intl_Month_Short_StandAlone_7":"Jul","Intl_Month_Short_StandAlone_8":"Aug","Intl_Month_Short_StandAlone_9":"Sep","Intl_Month_Short_StandAlone_10":"Oct","Intl_Month_Short_StandAlone_11":"Nov","Intl_Month_Short_StandAlone_12":"Dec","Intl_Month_Long_StandAlone_1":"January","Intl_Month_Long_StandAlone_2":"February","Intl_Month_Long_StandAlone_3":"March","Intl_Month_Long_StandAlone_4":"April","Intl_Month_Long_StandAlone_5":"May","Intl_Month_Long_StandAlone_6":"June","Intl_Month_Long_StandAlone_7":"July","Intl_Month_Long_StandAlone_8":"August","Intl_Month_Long_StandAlone_9":"September","Intl_Month_Long_StandAlone_10":"October","Intl_Month_Long_StandAlone_11":"November","Intl_Month_Long_StandAlone_12":"December","Intl_Day_Short_StandAlone_1":"Mon","Intl_Day_Short_StandAlone_2":"Tue","Intl_Day_Short_StandAlone_3":"Wed","Intl_Day_Short_StandAlone_4":"Thu","Intl_Day_Short_StandAlone_5":"Fri","Intl_Day_Short_StandAlone_6":"Sat","Intl_Day_Short_StandAlone_7":"Sun","Intl_Day_Long_StandAlone_1":"Monday","Intl_Day_Long_StandAlone_2":"Tuesday","Intl_Day_Long_StandAlone_3":"Wednesday","Intl_Day_Long_StandAlone_4":"Thursday","Intl_Day_Long_StandAlone_5":"Friday","Intl_Day_Long_StandAlone_6":"Saturday","Intl_Day_Long_StandAlone_7":"Sunday","Intl_Day_Min_StandAlone_1":"Mo","Intl_Day_Min_StandAlone_2":"Tu","Intl_Day_Min_StandAlone_3":"We","Intl_Day_Min_StandAlone_4":"Th","Intl_Day_Min_StandAlone_5":"Fr","Intl_Day_Min_StandAlone_6":"Sa","Intl_Day_Min_StandAlone_7":"Su","General_Search":"Search","General_MoreDetails":"More Details","General_Help":"Help","General_MetricsToPlot":"Metrics to plot","General_MetricToPlot":"Metric to plot","General_RecordsToPlot":"Records to plot","General_SaveImageOnYourComputer":"To save the image on your computer, right click on the image and select \"Save Image As...\"","General_ExportAsImage":"Export as Image","General_NoDataForGraph":"No data for this graph.","Widgetize_OpenInNewWindow":"Open in a new window","Dashboard_LoadingWidget":"Loading widget, please wait...","General_TransitionsRowActionTooltipTitle":"Open Transitions","General_TransitionsRowActionTooltip":"See what visitors did before and after viewing this page","Dashboard_AddPreviewedWidget":"Click to add widget to the dashboard","Dashboard_WidgetPreview":"Widget preview","Dashboard_Maximise":"Maximise","Dashboard_Minimise":"Minimise","Dashboard_WidgetNotFound":"Widget not found","Dashboard_DashboardCopied":"Current dashboard successfully copied to selected user.","General_Close":"Close","General_Refresh":"Refresh","General_Website":"Website","General_ColumnNbVisits":"Visits","General_ColumnPageviews":"Pageviews","General_ColumnRevenue":"Revenue","General_TotalVisitsPageviewsRevenue":"(Total: %s visits, %s pageviews, %s revenue)","General_EvolutionSummaryGeneric":"%1$s in %2$s compared to %3$s in %4$s. Evolution: %5$s","General_AllWebsitesDashboard":"All Websites dashboard","General_NVisits":"%s visits","MultiSites_Evolution":"Evolution","SitesManager_AddSite":"Add a new website","General_Next":"Next","General_Previous":"Previous","General_GoTo":"Go to %s","Dashboard_DashboardOf":"Dashboard of %s","Actions_SubmenuSitesearch":"Site Search","MultiSites_LoadingWebsites":"Loading websites","General_ErrorRequest":"Oops\u2026 problem during the request, please try again.","Goals_AddGoal":"Add Goal","Goals_UpdateGoal":"Update Goal","Goals_DeleteGoalConfirm":"Are you sure you want to delete the Goal %s?","UserCountry_FatalErrorDuringDownload":"A fatal error occurred while downloading this file. There might be something wrong with your internet connection, with the GeoIP database you downloaded or Piwik. Try downloading and installing it manually.","UserCountry_SetupAutomaticUpdatesOfGeoIP":"Setup automatic updates of GeoIP databases","General_Done":"Done","Feedback_ThankYou":"Thank you for helping us to make Piwik better!","Feedback_RateFeatureTitle":"Do you like the '%s' feature? Please rate and leave a comment","Feedback_RateFeatureThankYouTitle":"Thank you for rating '%s'!","Feedback_RateFeatureLeaveMessageLike":"We are glad you like it! Please let us know what you like the most or if you have a feature request.","Feedback_RateFeatureLeaveMessageDislike":"We are sorry to hear you don't like it! Please let us know how we can improve.","Feedback_SendFeedback":"Send Feedback","Feedback_RateFeatureSendFeedbackInformation":"Your Piwik platform will send us (the Piwik team) an email (including your email address) so we can get in contact with you if you have any question.","General_Ok":"Ok","General_OrCancel":"or %s Cancel %s","General_Save":"Save","UsersManager_DeleteConfirm":"Are you sure you want to delete the user %s?","UsersManager_ConfirmGrantSuperUserAccess":"Do you really want to grant '%s' Super User access? Warning: the user will have access to all websites and will be able to perform administrative tasks.","UsersManager_ConfirmProhibitOtherUsersSuperUserAccess":"Do you really want to remove Super User access from '%s'? The user will lose all permissions and access to all websites. Make sure to set permissions to needed websites afterwards if necessary.","UsersManager_ConfirmProhibitMySuperUserAccess":"%s, do you really want to remove your own Super User access? You will lose all permissions and access to all websites and will be logged out from Piwik.","SitesManager_OnlyOneSiteAtTime":"You can only edit one website at a time. Please Save or Cancel your current modifications to the website %s.","SitesManager_DeleteConfirm":"Are you sure you want to delete the website %s?","ScheduledReports_ReportSent":"Report sent","ScheduledReports_ReportUpdated":"Report updated","General_OverlayRowActionTooltipTitle":"Open Page Overlay","General_OverlayRowActionTooltip":"See analytics data directly on your website (opens new tab)","CustomAlerts_InvalidMetricValue":"Value must be numeric","Live_VisitorProfile":"Visitor profile","Live_NoMoreVisits":"There are no more visits for this visitor.","Live_ShowMap":"show map","Live_HideMap":"hide map","Live_PageRefreshed":"Number of times this page was viewed \/ refreshed in a row."}; +var translations = {"CorePluginsAdmin_NoZipFileSelected":"Please select a ZIP file.","General_InvalidDateRange":"Invalid Date Range, Please Try Again","General_Loading":"Loading...","General_Show":"show","General_Hide":"hide","Intl_Year_Short":"yr","General_MultiSitesSummary":"All Websites","CoreHome_YouAreUsingTheLatestVersion":"You are using the latest version of Piwik!","CoreHome_IncludeRowsWithLowPopulation":"Rows with low population are hidden %s Show all rows","CoreHome_ExcludeRowsWithLowPopulation":"All rows are shown %s Exclude low population","CoreHome_DataTableIncludeAggregateRows":"Aggregate rows are hidden %s Show them","CoreHome_DataTableExcludeAggregateRows":"Aggregate rows are shown %s Hide them","CoreHome_Default":"default","CoreHome_FlattenDataTable":"The report is hierarchical %s Make it flat","CoreHome_UnFlattenDataTable":"The report is flat %s Make it hierarchical","CoreHome_ExternalHelp":"Help (opens in new tab)","SitesManager_NotFound":"No websites found for","Annotations_ViewAndAddAnnotations":"View and add annotations for %s...","General_RowEvolutionRowActionTooltipTitle":"Open Row Evolution","General_RowEvolutionRowActionTooltip":"See how the metrics for this row changed over time","Annotations_IconDesc":"View notes for this date range.","Annotations_IconDescHideNotes":"Hide notes for this date range.","Annotations_HideAnnotationsFor":"Hide annotations for %s...","General_LoadingPopover":"Loading %s...","General_LoadingPopoverFor":"Loading %s for","Intl_Month_Short_StandAlone_1":"Jan","Intl_Month_Short_StandAlone_2":"Feb","Intl_Month_Short_StandAlone_3":"Mar","Intl_Month_Short_StandAlone_4":"Apr","Intl_Month_Short_StandAlone_5":"May","Intl_Month_Short_StandAlone_6":"Jun","Intl_Month_Short_StandAlone_7":"Jul","Intl_Month_Short_StandAlone_8":"Aug","Intl_Month_Short_StandAlone_9":"Sep","Intl_Month_Short_StandAlone_10":"Oct","Intl_Month_Short_StandAlone_11":"Nov","Intl_Month_Short_StandAlone_12":"Dec","Intl_Month_Long_StandAlone_1":"January","Intl_Month_Long_StandAlone_2":"February","Intl_Month_Long_StandAlone_3":"March","Intl_Month_Long_StandAlone_4":"April","Intl_Month_Long_StandAlone_5":"May","Intl_Month_Long_StandAlone_6":"June","Intl_Month_Long_StandAlone_7":"July","Intl_Month_Long_StandAlone_8":"August","Intl_Month_Long_StandAlone_9":"September","Intl_Month_Long_StandAlone_10":"October","Intl_Month_Long_StandAlone_11":"November","Intl_Month_Long_StandAlone_12":"December","Intl_Day_Short_StandAlone_1":"Mon","Intl_Day_Short_StandAlone_2":"Tue","Intl_Day_Short_StandAlone_3":"Wed","Intl_Day_Short_StandAlone_4":"Thu","Intl_Day_Short_StandAlone_5":"Fri","Intl_Day_Short_StandAlone_6":"Sat","Intl_Day_Short_StandAlone_7":"Sun","Intl_Day_Long_StandAlone_1":"Monday","Intl_Day_Long_StandAlone_2":"Tuesday","Intl_Day_Long_StandAlone_3":"Wednesday","Intl_Day_Long_StandAlone_4":"Thursday","Intl_Day_Long_StandAlone_5":"Friday","Intl_Day_Long_StandAlone_6":"Saturday","Intl_Day_Long_StandAlone_7":"Sunday","Intl_Day_Min_StandAlone_1":"Mo","Intl_Day_Min_StandAlone_2":"Tu","Intl_Day_Min_StandAlone_3":"We","Intl_Day_Min_StandAlone_4":"Th","Intl_Day_Min_StandAlone_5":"Fr","Intl_Day_Min_StandAlone_6":"Sa","Intl_Day_Min_StandAlone_7":"Su","General_Search":"Search","General_MoreDetails":"More Details","General_Help":"Help","General_MetricsToPlot":"Metrics to plot","General_MetricToPlot":"Metric to plot","General_RecordsToPlot":"Records to plot","General_SaveImageOnYourComputer":"To save the image on your computer, right click on the image and select \"Save Image As...\"","General_ExportAsImage":"Export as Image","General_NoDataForGraph":"No data for this graph.","Widgetize_OpenInNewWindow":"Open in a new window","Dashboard_LoadingWidget":"Loading widget, please wait...","General_TransitionsRowActionTooltipTitle":"Open Transitions","General_TransitionsRowActionTooltip":"See what visitors did before and after viewing this page","Dashboard_AddPreviewedWidget":"Click to add widget to the dashboard","Dashboard_WidgetPreview":"Widget preview","Dashboard_Maximise":"Maximise","Dashboard_Minimise":"Minimise","Dashboard_WidgetNotFound":"Widget not found","Dashboard_DashboardCopied":"Current dashboard successfully copied to selected user.","General_Close":"Close","General_Refresh":"Refresh","General_Website":"Website","General_Pagination":"%1$s–%2$s of %3$s","General_ColumnNbVisits":"Visits","General_ColumnPageviews":"Pageviews","General_ColumnRevenue":"Revenue","General_TotalVisitsPageviewsRevenue":"(Total: %s visits, %s pageviews, %s revenue)","General_EvolutionSummaryGeneric":"%1$s in %2$s compared to %3$s in %4$s. Evolution: %5$s","General_AllWebsitesDashboard":"All Websites dashboard","General_NVisits":"%s visits","MultiSites_Evolution":"Evolution","SitesManager_AddSite":"Add a new website","General_Next":"Next","General_Previous":"Previous","General_GoTo":"Go to %s","Dashboard_DashboardOf":"Dashboard of %s","Actions_SubmenuSitesearch":"Site Search","MultiSites_LoadingWebsites":"Loading websites","General_ErrorRequest":"Oops\u2026 problem during the request, please try again.","Goals_AddGoal":"Add Goal","Goals_UpdateGoal":"Update Goal","Goals_DeleteGoalConfirm":"Are you sure you want to delete the Goal %s?","UserCountry_FatalErrorDuringDownload":"A fatal error occurred while downloading this file. There might be something wrong with your internet connection, with the GeoIP database you downloaded or Piwik. Try downloading and installing it manually.","UserCountry_SetupAutomaticUpdatesOfGeoIP":"Setup automatic updates of GeoIP databases","General_Done":"Done","Feedback_ThankYou":"Thank you for helping us to make Piwik better!","Feedback_RateFeatureTitle":"Do you like the '%s' feature? Please rate and leave a comment","Feedback_RateFeatureThankYouTitle":"Thank you for rating '%s'!","Feedback_RateFeatureLeaveMessageLike":"We are glad you like it! Please let us know what you like the most or if you have a feature request.","Feedback_RateFeatureLeaveMessageDislike":"We are sorry to hear you don't like it! Please let us know how we can improve.","Feedback_SendFeedback":"Send Feedback","Feedback_RateFeatureSendFeedbackInformation":"Your Piwik platform will send us (the Piwik team) an email (including your email address) so we can get in contact with you if you have any question.","General_Ok":"Ok","General_OrCancel":"or %s Cancel %s","General_Save":"Save","UsersManager_DeleteConfirm":"Are you sure you want to delete the user %s?","UsersManager_ConfirmGrantSuperUserAccess":"Do you really want to grant '%s' Super User access? Warning: the user will have access to all websites and will be able to perform administrative tasks.","UsersManager_ConfirmProhibitOtherUsersSuperUserAccess":"Do you really want to remove Super User access from '%s'? The user will lose all permissions and access to all websites. Make sure to set permissions to needed websites afterwards if necessary.","UsersManager_ConfirmProhibitMySuperUserAccess":"%s, do you really want to remove your own Super User access? You will lose all permissions and access to all websites and will be logged out from Piwik.","SitesManager_OnlyOneSiteAtTime":"You can only edit one website at a time. Please Save or Cancel your current modifications to the website %s.","SitesManager_DeleteConfirm":"Are you sure you want to delete the website %s?","ScheduledReports_ReportSent":"Report sent","ScheduledReports_ReportUpdated":"Report updated","General_OverlayRowActionTooltipTitle":"Open Page Overlay","General_OverlayRowActionTooltip":"See analytics data directly on your website (opens new tab)","CustomAlerts_InvalidMetricValue":"Value must be numeric","Live_VisitorProfile":"Visitor profile","Live_NoMoreVisits":"There are no more visits for this visitor.","Live_ShowMap":"show map","Live_HideMap":"hide map","Live_PageRefreshed":"Number of times this page was viewed \/ refreshed in a row."}; if(typeof(piwik_translations) == 'undefined') { var piwik_translations = new Object; }for(var i in translations) { piwik_translations[i] = translations[i];} var piwikUsageTracking = { |
