update admin level, user manage text (#18050)

* update admin level, user manage text

update admin level, user manage text

* update admin view

update admin view

* Update plugins/UsersManager/lang/en.json

update text

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* update UI

update UI

Co-authored-by: Stefan Giehl <stefan@matomo.org>

8 files changed, 17 insertions, 12 deletions

diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index d7e61921ac..e5620260ef 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -263,6 +263,7 @@ class UsersManager extends \Piwik\Plugin
         $translationKeys[] = "UsersManager_PrivNone";
         $translationKeys[] = "UsersManager_ManageUsers";
         $translationKeys[] = "UsersManager_ManageUsersDesc";
+        $translationKeys[] = "UsersManager_ManageUsersAdminDesc";
         $translationKeys[] = 'Mobile_NavigationBack';
         $translationKeys[] = 'UsersManager_AddExistingUser';
         $translationKeys[] = 'UsersManager_AddUser';
diff --git a/plugins/UsersManager/angularjs/users-manager/users-manager.component.html b/plugins/UsersManager/angularjs/users-manager/users-manager.component.html
index 41232ad3e2..4b996e92d7 100644
--- a/plugins/UsersManager/angularjs/users-manager/users-manager.component.html
+++ b/plugins/UsersManager/angularjs/users-manager/users-manager.component.html
@@ -9,9 +9,12 @@
                 {{:: 'UsersManager_ManageUsers'|translate }}
             </h2>
 
-            <p>
+            <p ng-if="$ctrl.currentUserRole==='superuser'">
                 {{:: 'UsersManager_ManageUsersDesc'|translate }}
             </p>
+            <p ng-if="$ctrl.currentUserRole==='admin'">
+                {{:: 'UsersManager_ManageUsersAdminDesc'|translate }}
+            </p>
 
             <div class="row add-user-container">
                 <div class="col s12">
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index ca9a14da0c..9b6de7a717 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -123,6 +123,7 @@
         "AtLeastView": "At least view",
         "ManageUsers": "Manage Users",
         "ManageUsersDesc": "Create new users or update the existing users. You can then set their permissions here too.",
+        "ManageUsersAdminDesc": "Create new users or update the existing users. You can then set their permissions here too. Please note that you are logged in as an administrator. This means you only see and manage users that have access to the specific websites where you have \"admin\" permissions. Only a user with super user access can see and manage all users across all websites.",
         "NoAccessWarning": "This user has not been granted access to a website. When they login, they will see an error message. To prevent this, add access to a website below.",
         "BulkActions": "Bulk Actions",
         "SetPermission": "Set Permission",
@@ -188,4 +189,4 @@
         "NewsletterSignupSuccessMessage": "Super, you're all signed up! We'll be in touch soon.",
         "FirstWebsitePermission": "First website permission"
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png
index cd37758548..0d7398b3b0 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_email.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90bba80ad150f158da4e495020b32fc4090b26fd9fe46ed26fd9acb09a30c057
-size 31294
+oid sha256:afb463e2d4e7c13becb781bf3e6f6f008ed94df157b9cb6f05e689700c01c14c
+size 43087
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png
index d1ab8f5895..a25e02b4a6 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_by_login.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63a25e0aef31ebdd66e6cdd47bfc552d7e0a88deb6c7a75cf9b451cf482e8683
-size 29315
+oid sha256:8317f94199b6b470c972d733d15d311fd8723af682e823cc5a6ffd2bac80c05d
+size 41205
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png
index d94ac299ec..49d0c49a37 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_add_user_not_exists.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fdfb637c4b5904b5cc79222d813e366260f80afc884be070ae81241abbc5284
-size 27037
+oid sha256:b81cd40cfebf00039992dd4ba2d6ba6fc23c16fe1a15098f11e6d450fbe0dd40
+size 38944
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 344bd0c268..dd85882018 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:22ae7ebf89befe1a0975f6a87d0cfa55257b449fd5b937c17888c507ffee091d
-size 94730
+oid sha256:ef307406aedeeea5fdcc18c3ce79b07f6e1f630f8ac27c06a98906d3f3dc6160
+size 106425
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 c0c9549a79..3cf2cae2b2 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:1725a441e91038e86fc3d7931957bdceb7c240423fc710c617e5b02fd6b660f3
-size 110015
+oid sha256:785f2657e80772713a2487bbb1e4ed8901d3cde44ff2ddcbed9aed72274770c3
+size 105064