Merge pull request #2779 from cpradio/add-suspension-to-user-card

UX: Add suspension to user card
This commit is contained in:
Jeff Atwood 2014-09-10 16:37:45 -07:00
commit 52672088a0
3 changed files with 16 additions and 2 deletions

View File

@ -18,6 +18,8 @@ export default ObjectController.extend({
hasUserFilters: Em.computed.gt('postStream.userFilters.length', 0),
isSuspended: Em.computed.notEmpty('user.suspend_reason'),
showBadges: Discourse.computed.setting('enable_badges'),
moreBadgesCount: function() {

View File

@ -32,7 +32,15 @@
</div>
<div class='bottom'>
{{#if user.bio_cooked}}<div class='bio'>{{{user.bio_cooked}}}</div>{{/if}}
{{#if isSuspended}}
<div class='suspended'>
<i class='fa fa-ban'></i>
<b>{{i18n user.suspended_notice date="user.suspendedTillDate"}}</b><br/>
<b>{{i18n user.suspended_reason}}</b> {{user.suspend_reason}}
</div>
{{else}}
{{#if user.bio_cooked}}<div class='bio'>{{{user.bio_cooked}}}</div>{{/if}}
{{/if}}
{{#if user.can_send_private_message_to_user}}
<button class='btn btn-primary' {{action composePrivateMessage user}}><i class='fa fa-envelope'></i>{{i18n user.private_message}}</button>
@ -47,7 +55,6 @@
{{#if hasUserFilters}}
<button class='btn' {{action cancelFilter}}><i class='fa fa-times'></i>{{i18n topic.filters.cancel}}</button>
{{/if}}
</div>
{{else}}
<p class='loading'>{{i18n loading}}</p>

View File

@ -135,4 +135,9 @@
font-size: 13px;
}
}
.suspended {
color: $danger;
margin-bottom: 10px;
}
}