Merge pull request #2773 from riking/post-handlebars

(Trivial) Handlebars structure tweaks to post.handlebars
This commit is contained in:
Sam 2014-09-10 09:04:12 +10:00
commit 4edbb5b98c
2 changed files with 9 additions and 10 deletions

View file

@ -4,10 +4,10 @@
{{view 'reply-history' content=replyHistory}} {{view 'reply-history' content=replyHistory}}
</div> </div>
<article class='boxed' {{bind-attr id="postElementId"}} {{bind-attr data-post-id="id"}} data-user-id="{{unbound user_id}}"> <article class='boxed' {{bind-attr id="postElementId" data-post-id="id" data-user-id="user_id"}}>
<div class='row'> <div class='row'>
{{#if showUserReplyTab}} {{#if showUserReplyTab}}
<a href='#' {{action toggleReplyHistory this target="view"}} class='reply-to-tab'> <a href {{action toggleReplyHistory this target="view"}} class='reply-to-tab'>
{{#if loadingReplyHistory}} {{#if loadingReplyHistory}}
{{i18n loading}} {{i18n loading}}
{{else}} {{else}}
@ -18,15 +18,13 @@
</a> </a>
{{/if}} {{/if}}
<div class='topic-avatar'> <div class='topic-avatar'>
{{#unless userDeleted}} <div class="contents">
<div {{bind-attr class=":contents byTopicCreator:topic-creator"}}> {{#unless userDeleted}}
{{poster-avatar action="expandPostUser" post=this classNames="main-avatar"}} {{poster-avatar action="expandPostUser" post=this classNames="main-avatar"}}
</div> {{else}}
{{else}}
<div class="contents">
<i class="fa fa-trash-o deleted-user-avatar"></i> <i class="fa fa-trash-o deleted-user-avatar"></i>
</div> {{/unless}}
{{/unless}} </div>
{{#if wiki}} {{#if wiki}}
<div {{action editPost this}} class="wiki" title="{{i18n post.wiki.about}}"><i class="fa fa-pencil-square-o fa-3x"></i></div> <div {{action editPost this}} class="wiki" title="{{i18n post.wiki.about}}"><i class="fa fa-pencil-square-o fa-3x"></i></div>
{{/if}} {{/if}}
@ -44,7 +42,7 @@
{{#if hasHistory}} {{#if hasHistory}}
<div class='post-info edits'> <div class='post-info edits'>
{{#if can_view_edit_history}} {{#if can_view_edit_history}}
<a href='#' class="{{unbound view.historyHeat}}" {{action showHistory this}} title="{{i18n post.last_edited_on}} {{raw-date updated_at}}"> <a href class="{{unbound view.historyHeat}}" {{action showHistory this}} title="{{i18n post.last_edited_on}} {{raw-date updated_at}}">
{{editCount}} {{editCount}}
<i class='fa fa-pencil'></i> <i class='fa fa-pencil'></i>
</a> </a>

View file

@ -7,6 +7,7 @@ Discourse.PostView = Discourse.GroupedView.extend(Ember.Evented, {
'selected', 'selected',
'post.hidden:post-hidden', 'post.hidden:post-hidden',
'post.deleted', 'post.deleted',
'byTopicCreator:topic-creator',
'groupNameClass'], 'groupNameClass'],
postBinding: 'content', postBinding: 'content',