From 65977383227d4952ab98f30381fa0896d39ba701 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 5 Nov 2013 14:41:04 -0500 Subject: [PATCH] Improve how banned fields are rendered on admin user page --- .../admin/templates/user.js.handlebars | 17 ++++++++--------- .../stylesheets/common/admin/admin_base.scss | 3 +++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars index ec6893bb0..b98fc0839 100644 --- a/app/assets/javascripts/admin/templates/user.js.handlebars +++ b/app/assets/javascripts/admin/templates/user.js.handlebars @@ -198,7 +198,7 @@ -
+
{{i18n admin.user.banned}}
{{isBanned}}
@@ -222,21 +222,20 @@
{{#if isBanned}} -
+
{{i18n admin.user.banned_by}}
-
+
{{#link-to 'adminUser' banned_by}}{{avatar banned_by imageSize="tiny"}}{{/link-to}} {{#link-to 'adminUser' banned_by}}{{banned_by.username}}{{/link-to}}
-
- -
-
{{i18n admin.user.ban_reason}}
-
{{ban_reason}}
+
+ {{i18n admin.user.ban_reason}}: + {{ban_reason}} +
{{/if}} -
+
{{i18n admin.user.blocked}}
{{blocked}}
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 000118785..f78f38168 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -201,6 +201,9 @@ table { &:nth-of-type(1) { border-top: 0; } + &.highlight-danger { + background-color: #ffe5e5; + } border-top: 1px solid #dddddd; &:before, &:after { display: table;