Merge branch 'master' into vdom

2016-02-12 18:21:03 +11:00
parent 06403df059 6478f5defa
commit f02e035f94
3 changed files with 4 additions and 4 deletions
@@ -134,7 +134,7 @@

            {{#if model.details.suggested_topics.length}}
              <div id="suggested-topics">
-                <h3>{{unbound view.suggestedTitle}}</h3>
+                <h3>{{{unbound view.suggestedTitle}}}</h3>
                <div class="topics">
                  {{#if model.isPrivateMessage}}
                  {{basic-topic-list
@@ -167,7 +167,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli

  suggestedTitle: function(){
    return this.get('controller.model.isPrivateMessage') ?
-      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");
  }.property()
 });