From 6489c1d7e3f34a96becd8e65e1d64686e2516024 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 3 Sep 2014 10:41:13 -0400
Subject: [PATCH] FIX: admin page for users who have not been activated makes
 it more clear that the account is inactive, and won't offer actions that
 don't work yet

---
 .../admin/templates/user_index.js.handlebars  | 39 ++++++++++---------
 .../stylesheets/common/admin/admin_base.scss  |  5 +++
 2 files changed, 26 insertions(+), 18 deletions(-)

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 @@
-<section class='details'>
+<section {{bind-attr class=":details active::not-activated"}}>
 
   <div class='user-controls'>
-    {{#link-to 'user' model class="btn"}}
-      <i class='fa fa-user'></i>
-      {{i18n admin.user.show_public_profile}}
-    {{/link-to}}
-    {{#if can_impersonate}}
-        <button class='btn btn-danger' {{action impersonate target="content"}} title="{{i18n admin.impersonate.help}}">
-          <i class='fa fa-crosshairs'></i>
-          {{i18n admin.impersonate.title}}
-        </button>
-    {{/if}}
-    {{#if currentUser.admin}}
-    <button class='btn' {{action log_out target="content"}}>
-      <i class='fa fa-power-off'></i>
-      {{i18n admin.user.log_out}}
-    </button>
+    {{#if active}}
+      {{#link-to 'user' model class="btn"}}
+        <i class='fa fa-user'></i>
+        {{i18n admin.user.show_public_profile}}
+      {{/link-to}}
+      {{#if can_impersonate}}
+          <button class='btn btn-danger' {{action impersonate target="content"}} title="{{i18n admin.impersonate.help}}">
+            <i class='fa fa-crosshairs'></i>
+            {{i18n admin.impersonate.title}}
+          </button>
+      {{/if}}
+      {{#if currentUser.admin}}
+      <button class='btn' {{action log_out target="content"}}>
+        <i class='fa fa-power-off'></i>
+        {{i18n admin.user.log_out}}
+      </button>
+      {{/if}}
     {{/if}}
   </div>
 
-  <div class='display-row'>
+  <div class='display-row username'>
     <div class='field'>{{i18n user.username.title}}</div>
     <div class='value'>{{username}}</div>
     <div class='controls'>
@@ -30,9 +32,10 @@
     </div>
   </div>
 
-  <div class='display-row'>
+  <div class='display-row email'>
     <div class='field'>{{i18n user.email.title}}</div>
     <div class='value'><a href="mailto:{{unbound email}}">{{email}}</a></div>
+    <div class='controls'>{{i18n admin.users.not_verified}}</div>
   </div>
 
   <div class='display-row'>
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