UI: update user icon to show inactive users (#4246)

redaxo · Jan 4, 2021 · 4813ecb · 4813ecb
1 parent 1f78fbe
commit 4813ecb
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/.github/tests-visual/users_edit.png b/.github/tests-visual/users_edit.png
diff --git a/redaxo/src/addons/be_style/assets/css/styles.css b/redaxo/src/addons/be_style/assets/css/styles.css
diff --git a/redaxo/src/addons/be_style/scss/_icon.scss b/redaxo/src/addons/be_style/scss/_icon.scss
@@ -295,6 +295,9 @@
 .rex-icon-user-secret {
     @extend .fa-user-secret;
 }
+.rex-icon-user-inactive {
+    @extend .fa-user-o;
+}
 .rex-icon-unstable-version {
     @extend .fa-flask;
 }

diff --git a/redaxo/src/addons/users/lang/de_de.lang b/redaxo/src/addons/users/lang/de_de.lang
@@ -27,7 +27,8 @@ user_extras = Extras
 last_login = Letzter Login
 user_caption = Liste der angelegten Benutzer
 user_password_change_required = Passwort muss nach Login ausgetauscht werden
-user_status = User ist aktiv
+user_status_active = Benutzer ist aktiv
+user_status_inactive = Benutzer ist inaktiv
 startpage = Startseite
 
 user_role = Rolle(n)

diff --git a/redaxo/src/addons/users/lang/en_gb.lang b/redaxo/src/addons/users/lang/en_gb.lang
@@ -27,7 +27,8 @@ user_extras = Extras
 last_login = Last login
 user_caption = List of users
 user_password_change_required = Password needs to be replaced after signing in
-user_status = Status
+user_status_active = User is active
+user_status_inactive = User is inactive
 startpage = Startpage
 
 user_role = Role(s)

diff --git a/redaxo/src/addons/users/lang/es_es.lang b/redaxo/src/addons/users/lang/es_es.lang
@@ -27,7 +27,6 @@ user_extras = Extras
 last_login = Último acceso
 user_caption = Lista de usuarios
 user_password_change_required = La contraseña debe cambiarse después de iniciar sesión
-user_status = Estado
 startpage = Página de inicio
 
 user_role = Papel(es)

diff --git a/redaxo/src/addons/users/lang/pt_br.lang b/redaxo/src/addons/users/lang/pt_br.lang
@@ -24,7 +24,6 @@ user_options = Opções
 user_extras = Extras
 last_login = Último login
 user_caption = Lista de usuários
-user_status = Status
 startpage = Página inicial
 
 user_role = Função/Funções

diff --git a/redaxo/src/addons/users/lang/sv_se.lang b/redaxo/src/addons/users/lang/sv_se.lang
@@ -27,7 +27,6 @@ user_extras = Extras
 last_login = Senase login
 user_caption = Lista över sparade användare
 user_password_change_required = Lösenord måste bytas ut efter inloggning
-user_status = Användaren är aktiv
 startpage = Startsida
 
 user_role = Roll

diff --git a/redaxo/src/addons/users/pages/users.php b/redaxo/src/addons/users/pages/users.php
@@ -472,7 +472,7 @@
     }
 
     $n = [];
-    $n['label'] = '<label for="rex-user-status">' . rex_i18n::msg('user_status') . '</label>';
+    $n['label'] = '<label for="rex-user-status">' . rex_i18n::msg('user_status_active') . '</label>';
     $n['field'] = $add_status_chkbox;
     $formElements[] = $n;
 
@@ -563,13 +563,16 @@
     ');
     $list->addTableAttribute('class', 'table-striped table-hover');
 
-    $tdIcon = '<i class="rex-icon rex-icon-user"></i>';
+    $tdIcon = '<i class="rex-icon rex-icon-user" title="'.  rex_i18n::msg('user_status_active') . '"></i>';
     $thIcon = '<a href="' . $list->getUrl(['FUNC_ADD' => '1']) . '"' . rex::getAccesskey(rex_i18n::msg('create_user'), 'add') . ' title="' . rex_i18n::msg('create_user') . '"><i class="rex-icon rex-icon-add-user"></i></a>';
     $list->addColumn($thIcon, $tdIcon, 0, ['<th class="rex-table-icon">###VALUE###</th>', '<td class="rex-table-icon">###VALUE###</td>']);
     $list->setColumnParams($thIcon, ['user_id' => '###id###']);
     $list->setColumnFormat($thIcon, 'custom', static function ($params) use ($thIcon, $tdIcon) {
         $list = $params['list'];
-        $tdIcon = !$list->getValue('status') ? str_replace('rex-icon-user', 'rex-icon-user text-muted', $tdIcon) : $tdIcon;
+        if (!$list->getValue('status')) {
+            $tdIcon = str_replace('rex-icon-user', 'rex-icon-user-inactive text-muted', $tdIcon);
+            $tdIcon = str_replace(rex_i18n::msg('user_status_active'), rex_i18n::msg('user_status_inactive'), $tdIcon);
+        }
         return !$list->getValue('admin') || rex::getUser()->isAdmin() ? $list->getColumnLink($thIcon, $tdIcon) : $tdIcon;
     });