diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars index 5a0cc6e4782..952fd8f9477 100644 --- a/app/assets/javascripts/admin/templates/user_index.js.handlebars +++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars @@ -1,25 +1,27 @@ -
+
- {{#link-to 'user' model class="btn"}} - - {{i18n admin.user.show_public_profile}} - {{/link-to}} - {{#if can_impersonate}} - - {{/if}} - {{#if currentUser.admin}} - + {{#if active}} + {{#link-to 'user' model class="btn"}} + + {{i18n admin.user.show_public_profile}} + {{/link-to}} + {{#if can_impersonate}} + + {{/if}} + {{#if currentUser.admin}} + + {{/if}} {{/if}}
-
+
{{i18n user.username.title}}
{{username}}
@@ -30,9 +32,10 @@
-
+
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 625c8ca6ce8..2ac1f9eb467 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -1305,4 +1305,9 @@ tr.not-activated { td, td a, td a:visited { color: #bbb; } +} +.details.not-activated { + .username .value, .email .value a, .email .value a:visited { + color: #bbb; + } } \ No newline at end of file