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

Merge branch 'master' into vdom

This commit is contained in:
Sam 2016-02-12 22:06:41 +11:00
parent f02e035f94 f77dfda097
commit 560e910c6c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -134,7 +134,7 @@
{{#if model.details.suggested_topics.length}} {{#if model.details.suggested_topics.length}}
<div id="suggested-topics"> <div id="suggested-topics">
<h3>{{{unbound view.suggestedTitle}}}</h3> <h3>{{{view.suggestedTitle}}}</h3>
<div class="topics"> <div class="topics">
{{#if model.isPrivateMessage}} {{#if model.isPrivateMessage}}
{{basic-topic-list {{basic-topic-list

2
app/assets/javascripts/discourse/views/topic.js.es6
View File

@ -169,7 +169,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
return this.get('controller.model.isPrivateMessage') ? return this.get('controller.model.isPrivateMessage') ?
"<i class='private-message-glyph fa fa-envelope'></i> " + I18n.t("suggested_topics.pm_title") : "<i class='private-message-glyph fa fa-envelope'></i> " + I18n.t("suggested_topics.pm_title") :
I18n.t("suggested_topics.title"); I18n.t("suggested_topics.title");
}.property() }.property('topic')
}); });
function highlight(postNumber) { function highlight(postNumber) {