github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-06-05 23:44:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Render deleted users better

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/ember/app/components/discussion/post-header/user.js
View File

@ -8,5 +8,5 @@ var precompileTemplate = Ember.Handlebars.compile;
export default Ember.Component.extend({
tagName: 'h3',
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}}')
});

2
framework/core/ember/app/helpers/user-avatar.js
View File

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

12
framework/core/ember/app/helpers/user-name.js Normal file
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>');
});

1
framework/core/ember/app/styles/flarum/components.less
View File

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

8
framework/core/ember/app/templates/components/index/discussion-info/terminal-post.hbs
View File

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