From 2053b94d28ee9c287afd9373f1754e4c69237f59 Mon Sep 17 00:00:00 2001
From: Fabian Becker <halfdan@xnorfz.de>
Date: Tue, 14 Jul 2015 16:20:40 +0200
Subject: [PATCH] Fix team/index screen

- Incorrect message was shown (Invitation sent instead of Invitation not sent)
- Correct colouring of message (new .description-error class)
- Correctly display lastLogin time
- Add colour classes
---
 core/client/app/styles/layouts/users.css      |  8 +++++
 core/client/app/styles/patterns/global.css    | 29 +++++++++++++++++++
 core/client/app/templates/-user-list-item.hbs |  4 +--
 core/client/app/templates/team/index.hbs      |  6 ++--
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/core/client/app/styles/layouts/users.css b/core/client/app/styles/layouts/users.css
index 9064982ff0..f5275e2217 100644
--- a/core/client/app/styles/layouts/users.css
+++ b/core/client/app/styles/layouts/users.css
@@ -108,6 +108,14 @@ a.user-list-item {
     font-size: 12px;
 }
 
+.user-list-item-body .description-error {
+    display: inline-block;
+    margin-top: 3px;
+    color: var(--red);
+    white-space: nowrap;
+    font-size: 12px;
+}
+
 .user-list-item-aside .user-list-action:not(:first-of-type) {
     margin-left: 20px;
 }
diff --git a/core/client/app/styles/patterns/global.css b/core/client/app/styles/patterns/global.css
index 2c6ae102b2..a74c823db9 100644
--- a/core/client/app/styles/patterns/global.css
+++ b/core/client/app/styles/patterns/global.css
@@ -20,6 +20,35 @@
     --font-family-mono: Consolas, "Liberation Mono", Menlo, Courier, monospace;
 }
 
+/* Colour classes
+/* ---------------------------------------------------------- */
+.darkgrey {
+    color: var(--darkgrey);
+}
+
+.midgrey {
+    color: var(--midgrey);
+}
+
+.lightgrey {
+    color: var(--lightgrey);
+}
+
+.blue {
+    color: var(--blue);
+}
+
+.red {
+    color: var(--red);
+}
+
+.orange {
+    color: var(--orange);
+}
+
+.green {
+    color: var(--green);
+}
 
 /* Layout
 /* ---------------------------------------------------------- */
diff --git a/core/client/app/templates/-user-list-item.hbs b/core/client/app/templates/-user-list-item.hbs
index 3cdb1ebcc3..7b5eda3b14 100644
--- a/core/client/app/templates/-user-list-item.hbs
+++ b/core/client/app/templates/-user-list-item.hbs
@@ -7,7 +7,7 @@
         {{user.name}}
     </span>
     <br>
-    <span class="description">Last seen: {{component.last_login}}</span>
+    <span class="description">Last seen: {{component.lastLogin}}</span>
 </div>
 <aside class="user-list-item-aside">
     {{#unless session.user.isAuthor}}
@@ -15,4 +15,4 @@
             <span class="role-label {{role.lowerCaseName}}">{{role.name}}</span>
         {{/each}}
     {{/unless}}
-</aside>
\ No newline at end of file
+</aside>
diff --git a/core/client/app/templates/team/index.hbs b/core/client/app/templates/team/index.hbs
index dd6ec6be9f..6beb552a56 100644
--- a/core/client/app/templates/team/index.hbs
+++ b/core/client/app/templates/team/index.hbs
@@ -26,8 +26,10 @@
                                 <span class="user-list-item-icon icon-mail">ic</span>
                                 <div class="user-list-item-body">
                                     <span class="name">{{user.email}}</span><br>
-                                        {{#if user.model.pending}}
-                                            <span class="red">Invitation not sent - please try again</span>
+                                        {{#if user.pending}}
+                                            <span class="description-error">
+                                                Invitation not sent - please try again
+                                            </span>
                                         {{else}}
                                             <span class="description">
                                                 Invitation sent: {{component.createdAt}}