From 09ea159afc75bedd670ccb96208a142cd3a99647 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 27 Aug 2014 13:52:01 -0400 Subject: [PATCH] UX: Add link to change username on admin page --- .../admin/templates/user_index.js.handlebars | 37 +++++++++++-------- .../stylesheets/common/admin/admin_base.scss | 16 +++++--- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars index 1d5d5c099b9..f237e6cc46b 100644 --- a/app/assets/javascripts/admin/templates/user_index.js.handlebars +++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars @@ -1,25 +1,32 @@
+
+ {{#link-to 'user' model class="btn"}} + + {{i18n admin.user.show_public_profile}} + {{/link-to}} + {{#if can_impersonate}} + + {{/if}} + {{#if currentUser.admin}} + + {{/if}} +
+
{{i18n user.username.title}}
{{username}}
- {{#link-to 'user' model class="btn"}} - - {{i18n admin.user.show_public_profile}} + {{#link-to 'preferences.username' model class="btn"}} + + {{i18n user.change_username.title}} {{/link-to}} - {{#if can_impersonate}} - - {{/if}} - {{#if currentUser.admin}} - - {{/if}}
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 441db8c03c5..28342d4b210 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -284,11 +284,11 @@ td.flaggers td { section.details { h1 { - font-size: 15px; - background-color: scale-color-diff(); - color: $secondary; - padding: 0 10px; - margin: 0 0 5px 0; + font-size: 18px; + color: $primary; + padding: 5px 10px; + margin: 30px 0 5px 0; + border-bottom: 5px solid scale-color-diff(); } } @@ -301,6 +301,12 @@ section.details { width: 1075px; } +.user-controls { + padding: 5px; + clear: both; + text-align: right; +} + .display-row { line-height: 30px; padding: 5px;