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
This commit is contained in:
Fabian Becker 2015-07-14 16:20:40 +02:00
parent ed0b726665
commit 37235413e8
4 changed files with 43 additions and 4 deletions

View File

@ -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;
}

View File

@ -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
/* ---------------------------------------------------------- */

View File

@ -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>
</aside>

View File

@ -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}}