1
0
mirror of https://github.com/flarum/core.git synced 2025-07-26 03:01:22 +02:00

Render deleted users better

This commit is contained in:
Toby Zerner
2015-02-26 12:47:50 +10:30
parent 6ad8050840
commit b9c09dc37f
5 changed files with 19 additions and 6 deletions

View File

@@ -8,5 +8,5 @@ var precompileTemplate = Ember.Handlebars.compile;
export default Ember.Component.extend({ export default Ember.Component.extend({
tagName: 'h3', tagName: 'h3',
classNames: ['post-user'], classNames: ['post-user'],
layout: precompileTemplate('{{#link-to "user" post.user}}{{user-avatar post.user}} {{post.user.username}}{{/link-to}}') layout: precompileTemplate('{{#if post.user}}{{#link-to "user" post.user}}{{user-avatar post.user}} {{user-name post.user}}{{/link-to}}{{else}}{{user-avatar post.user}} {{user-name post.user}}{{/if}}')
}); });

View File

@@ -1,7 +1,7 @@
import Ember from 'ember'; import Ember from 'ember';
export default Ember.Handlebars.makeBoundHelper(function(user, options) { export default Ember.Handlebars.makeBoundHelper(function(user, options) {
var attributes = 'class="avatar '+options.hash.class+'"'; var attributes = 'class="avatar '+(options.hash.class || '')+'"';
var content = ''; var content = '';
if (user) { if (user) {

View File

@@ -0,0 +1,12 @@
import Ember from 'ember';
export default Ember.Handlebars.makeBoundHelper(function(user, options) {
var username;
if (user) {
username = user.get('username');
}
username = username || '[deleted]';
return new Ember.Handlebars.SafeString('<span class="username">'+Ember.Handlebars.Utils.escapeExpression(username)+'</span>');
});

View File

@@ -234,6 +234,7 @@
font-weight: 300; font-weight: 300;
text-align: center; text-align: center;
vertical-align: top; vertical-align: top;
background-color: @fl-body-control-bg;
.avatar-size(48px); .avatar-size(48px);
& img { & img {

View File

@@ -1,7 +1,7 @@
{{#if displayLastPost}} {{#if displayLastPost}}
<span class="username">{{discussion.lastUser.username}}</span> replied {{user-name discussion.lastUser}} replied
<span class="time">{{human-time discussion.lastTime}}</span> {{human-time discussion.lastTime}}
{{else}} {{else}}
<span class="username">{{discussion.startUser.username}}</span> started {{user-name discussion.startUser}} started
<span class="time">{{human-time discussion.startTime}}</span> {{human-time discussion.startTime}}
{{/if}} {{/if}}