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

Merge branch 'keep-title-and-category-in-sync' of git://github.com/ZogStriP/discourse

This commit is contained in:
Robin Ward 2013-03-04 15:25:24 -05:00
parent fbeee1b13d ccb715fba3
commit 4385a174a2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/topic.js.handlebars
View File

@ -17,7 +17,7 @@
<h1> <h1>
{{#if view.topic.fancy_title}} {{#if view.topic.fancy_title}}
{{view Discourse.TopicStatusView topicBinding="view.topic"}} {{view Discourse.TopicStatusView topicBinding="view.topic"}}
<a href='{{unbound view.topic.url}}'>{{{unbound view.topic.fancy_title}}}</a> <a href='{{unbound view.topic.url}}'>{{{view.topic.fancy_title}}}</a>
{{else}} {{else}}
{{#if view.topic.errorLoading}} {{#if view.topic.errorLoading}}
{{view.topic.errorTitle}} {{view.topic.errorTitle}}
@ -25,7 +25,7 @@
{{i18n topic.loading}} {{i18n topic.loading}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{categoryLink view.topic.category}} {{#bind view.topic.category}}{{categoryLink this}}{{/bind}}
{{#if view.topic.can_edit}} {{#if view.topic.can_edit}}
<a href='#' {{action editTopic target="view"}} class='edit-topic' title='{{i18n edit}}'><i class="icon-pencil"></i></a> <a href='#' {{action editTopic target="view"}} class='edit-topic' title='{{i18n edit}}'><i class="icon-pencil"></i></a>