Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Neil Lalonde 2014-09-03 10:41:13 -04:00
parent ff136ddeea
commit 6489c1d7e3
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/assets/javascripts/admin/templates/user_index.js.handlebars
View File

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

5
app/assets/stylesheets/common/admin/admin_base.scss
View File

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