Allow form select to show specific text for empty option that is not placeholder option… (#13763)

* Allow form select to show specific text for empty option that is not placeholder option & add missing translation.

* Add some code for new section

* Add explicit ability to set access for all websites to user permission edit component.

* Update expected screenshots.

31 files changed, 150 insertions, 52 deletions

diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 45661e3c5e..636f3bef71 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -81,6 +81,7 @@ class Controller extends ControllerAdmin
             ['key' => 'superuser', 'value' => Piwik::translate('Installation_SuperUser'), 'disabled' => true],
         ];
         $view->filterAccessLevels = [
+            ['key' => '', 'value' => Piwik::translate('UsersManager_ShowAll')],
             ['key' => 'noaccess', 'value' => Piwik::translate('UsersManager_PrivNone')],
             ['key' => 'some', 'value' => Piwik::translate('UsersManager_AtLeastView')],
             ['key' => 'view', 'value' => Piwik::translate('UsersManager_PrivView')],
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index 5369e430ca..6cba1cf960 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -294,5 +294,10 @@ class UsersManager extends \Piwik\Plugin
         $translationKeys[] = 'General_Warning';
         $translationKeys[] = 'General_Add';
         $translationKeys[] = 'General_Note';
+        $translationKeys[] = 'UsersManager_FilterByWebsite';
+        $translationKeys[] = 'UsersManager_GiveAccessToAll';
+        $translationKeys[] = 'UsersManager_OrManageIndividually';
+        $translationKeys[] = 'UsersManager_ChangePermToAllSitesConfirm';
+        $translationKeys[] = 'UsersManager_ChangePermToAllSitesConfirm2';
     }
 }
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 7647a669fc..c60b01ec6f 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
@@ -48,7 +48,7 @@
         vm.userToChange = null;
         vm.roleToChangeTo = null;
         vm.previousRole = null;
-        vm.accessLevelFilter = '';
+        vm.accessLevelFilter = null;
 
         // other state
         vm.isRoleHelpToggled = false;
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 fefe4e6d16..498f37679d 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
@@ -6,6 +6,28 @@
             {{:: 'UsersManager_NoAccessWarning'|translate }}
         </div>
     </div>
+    <div class="row to-all-websites">
+        <div class="col s12">
+            <div>
+                <span>{{ 'UsersManager_GiveAccessToAll'|translate }}:</span>
+
+                <div
+                    id="all-sites-access-select"
+                    piwik-field
+                    uicontrol="select"
+                    ng-model="$ctrl.allWebsitesAccssLevelSet"
+                    options="$ctrl.accessLevels"
+                    full-width="true"
+                ></div>
+
+                <a href="" class="btn" ng-class="{ disabled: $ctrl.isGivingAccessToAllSites }" ng-click="$ctrl.showChangeAccessAllSitesModal()">
+                    {{:: 'General_Apply'|translate }}
+                </a>
+            </div>
+            <p>&nbsp;</p>
+            <p>{{ 'UsersManager_OrManageIndividually'|translate }}:</p>
+        </div>
+    </div>
     <div class="filters row">
         <div class="col s12 m12 l8">
             <div class="input-field bulk-actions">
@@ -34,7 +56,13 @@
             </div>
 
             <div class="input-field site-filter">
-                <input type="text" placeholder="Filter by website" ng-model="$ctrl.siteNameFilter" ng-model-options="{debounce: 300}" ng-change="$ctrl.offset = 0; $ctrl.fetchAccess()" />
+                <input
+                    type="text"
+                    placeholder="{{:: 'UsersManager_FilterByWebsite'|translate }}"
+                    ng-model="$ctrl.siteNameFilter"
+                    ng-model-options="{debounce: 300}"
+                    ng-change="$ctrl.offset = 0; $ctrl.fetchAccess()"
+                />
             </div>
 
             <div class="input-field access-filter">
@@ -149,4 +177,15 @@
             <a href="" class="modal-action modal-close modal-no" ng-click="$ctrl.siteAccessToChange.role = $ctrl.previousRole; $ctrl.siteAccessToChange = null; $ctrl.roleToChangeTo = null;">{{:: 'General_No'|translate }}</a>
         </div>
     </div>
+
+    <div class="confirm-give-access-all-sites modal">
+        <div class="modal-content">
+            <h3 piwik-translate="UsersManager_ChangePermToAllSitesConfirm"><strong>{{ $ctrl.userLogin }}</strong>::<strong>{{ $ctrl.getRoleDisplay($ctrl.allWebsitesAccssLevelSet) }}</strong></h3>
+            <p>{{ 'UsersManager_ChangePermToAllSitesConfirm2'|translate }}</p>
+        </div>
+        <div class="modal-footer">
+            <a href="" class="modal-action modal-close btn" ng-click="$ctrl.giveAccessToAllSites()">{{:: 'General_Yes'|translate }}</a>
+            <a href="" class="modal-action modal-close modal-no">{{:: 'General_No'|translate }}</a>
+        </div>
+    </div>
 </div>
\ No newline at end of file
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 8af3fe206c..b8d407b447 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
@@ -35,6 +35,7 @@
         vm.accessLevelFilter = 'some';
         vm.siteNameFilter = '';
         vm.isLoadingAccess = false;
+        vm.allWebsitesAccssLevelSet = 'view';
 
         // row selection state
         vm.isAllCheckboxSelected = false;
@@ -46,6 +47,7 @@
         // other state
         vm.hasAccessToAtLeastOneSite = true;
         vm.isRoleHelpToggled = false;
+        vm.isGivingAccessToAllSites = false;
 
         // intermediate state
         vm.roleToChangeTo = null;
@@ -66,6 +68,32 @@
         vm.showChangeAccessConfirm = showChangeAccessConfirm;
         vm.getRoleDisplay = getRoleDisplay;
         vm.showAddExistingUserModal = showAddExistingUserModal;
+        vm.giveAccessToAllSites = giveAccessToAllSites;
+        vm.showChangeAccessAllSitesModal = showChangeAccessAllSitesModal;
+
+        function giveAccessToAllSites() {
+            vm.isGivingAccessToAllSites = true;
+            piwikApi.fetch({
+                method: 'SitesManager.getSitesWithAdminAccess',
+            }).then(function (allSites) {
+                var idSites = allSites.map(function (s) { return s.idsite; });
+                return piwikApi.post({
+                    method: 'UsersManager.setUserAccess'
+                }, {
+                    userLogin: vm.userLogin,
+                    access: vm.allWebsitesAccssLevelSet,
+                    'idSites[]': idSites,
+                });
+            }).then(function () {
+                return vm.fetchAccess();
+            })['finally'](function () {
+                vm.isGivingAccessToAllSites = false;
+            });
+        }
+
+        function showChangeAccessAllSitesModal() {
+            $element.find('.confirm-give-access-all-sites').openModal({ dismissible: false });
+        }
 
         function $onInit() {
             vm.limit = vm.limit || 10;
diff --git a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.less b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.less
index 000d2811f6..aadd55fe21 100644
--- a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.less
+++ b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.less
@@ -183,7 +183,7 @@
     float: right;
   }
 
-  .delete-access-confirm-modal, .change-access-confirm-modal {
+  .delete-access-confirm-modal, .change-access-confirm-modal, .confirm-give-access-all-sites {
     .modal-no {
       float: right;
       margin-right: 1em;
@@ -203,6 +203,25 @@
       }
     }
   }
+
+  .to-all-websites {
+    margin-left: -0.75em;
+    margin-right: -0.75em;
+  }
+  #all-sites-access-select {
+    display: inline-block;
+    vertical-align: bottom;
+    width: 150px;
+    .form-group {
+      margin: 0;
+    }
+    .input-field {
+      margin-top: 0;
+    }
+    .select-dropdown {
+      margin-bottom: 0;
+    }
+  }
 }
 
 .user-permission-toast .notification {
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index ea4972c43d..c8246305c2 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -133,6 +133,8 @@
         "DeleteUsers": "Delete Users",
         "UserSearch": "User search",
         "FilterByAccess": "Filter by access",
+        "FilterByWebsite": "Filter by website",
+        "ShowAll": "Show all",
         "Username": "Username",
         "RoleFor": "Role for",
         "TheDisplayedUsersAreSelected": "The %1$s displayed users are selected.",
@@ -144,6 +146,10 @@
         "DeleteUserPermConfirmSingle": "Are you sure you want to change %1$s's role to %2$s for %3$s?",
         "DeleteUserPermConfirmMultiple": "Are you sure you want to change the %1$s selected users' role to %2$s for %3$s?",
         "AreYouSureChangeDetails": "Are you sure you want to change the user information for %s?",
-        "AnonymousUserRoleChangeWarning": "Giving the %1$s user the %2$s role will make this website's data public and available to everyone, even if they do not have a Matomo login."
+        "AnonymousUserRoleChangeWarning": "Giving the %1$s user the %2$s role will make this website's data public and available to everyone, even if they do not have a Matomo login.",
+        "GiveAccessToAll": "Give this user access to All Websites",
+        "OrManageIndividually": "Or manage this user's access to each website individually",
+        "ChangePermToAllSitesConfirm": "Are you sure you want to give the %1$s user %2$s access to every website you currently have admin access to?",
+        "ChangePermToAllSitesConfirm2": "Note: this will only affect the currently existing websites. New websites you may create will not be automatically accessible to this user."
     }
 }
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 7ecdc02174..fe715e43c7 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:5af0ff689fc58f9604974d9275ed1ee2073b05744b36a4995211ad1b1668e83e
-size 19316
+oid sha256:6713729f17fd0759512f63887162482dfa7c8e9f2e10219bb88bd001883c846d
+size 30475
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 4ee07c0411..abc2f48332 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:02a4aad80769cc9a72e9ec80febe82f6eade8cc7989da949d7ce8d4273447355
-size 162558
+oid sha256:c29133fe81c8ccce8086de231c6d3fbf96589d6c30d340e00cc997ca47d313b1
+size 161819
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 812d0a35b6..d46bdcfadb 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:eddf8afc4d4917512d01cd3320b4160de827d11cc38c808bb38f2d8331c316a7
-size 162549
+oid sha256:939e66b5c4cb95890a2dee58b0e55745af574cd904ae54d94f5241ca98d0634f
+size 161818
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 812d0a35b6..d46bdcfadb 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:eddf8afc4d4917512d01cd3320b4160de827d11cc38c808bb38f2d8331c316a7
-size 162549
+oid sha256:939e66b5c4cb95890a2dee58b0e55745af574cd904ae54d94f5241ca98d0634f
+size 161818
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 7209e7594b..ec032e499f 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:907ff23bc446226bad0f2b27ff0be44fc80b7e102eb952a316ed4af482a001c2
-size 157504
+oid sha256:1ba88f9ed89a81b943a70da4ca19473fc20d898a5a18c9c4d1fc3a8e8fecfb80
+size 156814
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 0f9dd3b596..4c23537ad7 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:49e47fc3ea646316bd3ea7c5f83f6038e461b345ea27c95360df7371083a3a91
-size 143490
+oid sha256:b590350831bf72fa4085ab9754433dc69ee35a86231b17104da9b3b9ee328351
+size 142796
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 f777bf4342..bbb6a1d124 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:17605bdd7e770372f958b079ad1466e11ebac45ffd9716350c97c928cd8059ba
-size 156043
+oid sha256:3ae28122fef76c910c64a13cab3ecab46cd823bbc7a2b0e8c857831fbe5aba65
+size 155379
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 e22a1a2db4..7ca8d9763c 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:0e6e9d998e354c0c1e7df5fce0822af8b096a01f214fdbff05f7c57a7cf45112
-size 143602
+oid sha256:2cbabd2e695a24daeb9d00d74755c5b7270ef5b40507b32d033284d2db3e4557
+size 142902
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 8ed13a7929..5c5f293f35 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:01a27e9aaaad2e14e8fd42e568a49b5400d61aa9f7b265c1c2ce6c1644b63e6f
-size 149877
+oid sha256:eda2d1c1092176cb3afb178d9e52b887b769a2b89b7df6fe45f8982f29b6f325
+size 149690
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 24c993e586..7bb4972d12 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:8dfb2ab09266c96ddc26710471b71c29bba8454a95f99e16cb1191b14efd46db
-size 79523
+oid sha256:c747950e8d7574ecbf43f387209e76ba2771565b1100f37dfb353f41cb7a5711
+size 89916
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 4c860bc98f..632e48bfae 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:69bd64454b653519e9cb8ce0546d5c9490d0eabc5e29de7017642c08c2ff8794
-size 59674
+oid sha256:267019894869ba44f78e6cb6aac306006ae4e2b45bcba615ab04406fe5d1cc95
+size 70146
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 ea3afe3c20..f9490ff4f1 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:ef8f354c9554fec728ad2e67802bcc77b19c1510830874ccdc3e5c1b7f283a86
-size 46856
+oid sha256:9b7754d21f78f6669e76a95dd8441c47a99814340d52595954c5f0022f4d78a6
+size 57691
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png
index b58ebdd42a..a817c9af4b 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set_all.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a67f49a3464dafe5e119bd54c30724a7d094c51e9faf1786721d495c100129b0
-size 43098
+oid sha256:a0c57f2616d3d3ac3fab68275ad9aa8d0706a7f625644704c424c480403f0a90
+size 54324
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 47942ddcb7..adc047eee4 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:f8d5bcf65e4c8cba2a75f83d307329235cb9c6c81da83e78acd5ed5d8424c5de
-size 22338
+oid sha256:19af110d3f0f8099c3571658eee30035a1760742b0a212f8598fd7d496e404cd
+size 33184
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png
index aa6f4fc89c..283aebc771 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_filters.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e2c31955f424aac3edb5fcbaacf7ae0d7c601d46010a19003d31992aab381708
-size 23863
+oid sha256:c3c54b9f70bf5375bab136c49285be92a7b1f8d28527db3ebcd6297b78d4dc17
+size 35036
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 18f88dba0d..83eeb9a3c3 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:b0c120863e08999fc62a1e31a03a1bd7f0dd6fa3b31208d6de62b7421320e4c7
-size 47838
+oid sha256:062d2ee470fea1889a225aa863a1a63fe44f6ba4d44e5798ae7e42c5c7da26bf
+size 58589
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 bea08422af..89846393c0 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:06a79299f1b659e826c0db92536aca743b65eccd18c9878f6c691631665e77b1
-size 83895
+oid sha256:f4ec2c5324228d608bf2a71460336a2418d78fc0b378294fa120be43ebd191c9
+size 94072
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 b83bd77055..84bfef28a0 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:e9b9dc7e1299d0e432b622bdfc2a172344fe7170c3009e4d714e7b694e2fe1bc
-size 46923
+oid sha256:94e7a9c38ca62c5706e4be0c96698603ec80475bf76056908dd7a958db883bb6
+size 57752
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png
index 82cd9a23c4..f0f17e8cd0 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_all.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a305013ef58ee6a0cc0f14a99eee01d90893b1ecc9642a225172abdc9d76f7d6
-size 26306
+oid sha256:46ff6c3a397682428e73f09151b18e5a13555906e124767cce9e7abb5a9279a9
+size 37308
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 4feba4d9c2..93b426143f 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:bfa90b9605a062876d7eaa00c35fca53be0007efbddd73d03f9b758b15395b7f
-size 49500
+oid sha256:3c97c5f1951c3c7c0239b48f43497d078d0305c85c9c72ff32fb43a1b73e5965
+size 59915
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png
index c960ce1f1d..7901f62611 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_single_site_access.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3d629f87f1df2f166ff93506dbaf32c87ba5341f03a563a519ef3d70ddb6107
-size 43107
+oid sha256:6521f9410b6da146b217620ca421ce8d49784a1789bec0d15783a8d4b3285694
+size 54315
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png
index f59b4b10ec..66e7a5bdf7 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:06e86f317c80d229141316c424553d2b9c69a15b2a4776d541ced793818ce48e
-size 142879
+oid sha256:015387b5883db92467c2556a4594172aef37e7d4cce879923487e6857553b4aa
+size 142213
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 d58bfe9766..543f209d92 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:cc86791d4e6a184f18cd3d6660ee4de749bbb6d8daa9dbb1620dbaf6e9ebd233
-size 149045
+oid sha256:268b8153adda52f709c91b9a494dacca4157b80a85bfdbf8f60d46b1bb1c796e
+size 148372
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 c5b036c43e..cac10d7a7c 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:e4dbd02ff49853db34aba1d57e987103d885f0fb35a08e49b6fed2c2d2decfc3
-size 150218
+oid sha256:77c1f32f5b2644f11b53b31c5cafa123655f4f75caa6cd26fb0b1582af4dfaab
+size 149559