From 2836d548fbe2dc4126ac104109de4ae7ea803f12 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 21 Mar 2017 12:23:10 -0400 Subject: [PATCH] Category boxes with feature topics will show pins and locks as bullet for pinned and closed/archived topics --- .../components/categories-boxes-topic.js.es6 | 14 ++++++++++++++ .../components/categories-boxes-topic.hbs | 3 +++ .../components/categories-boxes-with-topics.hbs | 6 +----- app/assets/stylesheets/desktop/category-list.scss | 2 ++ 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs diff --git a/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6 b/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6 new file mode 100644 index 0000000000..7a23f3e140 --- /dev/null +++ b/app/assets/javascripts/discourse/components/categories-boxes-topic.js.es6 @@ -0,0 +1,14 @@ +import computed from 'ember-addons/ember-computed-decorators'; + +export default Ember.Component.extend({ + tagName: "li", + classNameBindings: ['topicStatusIcon'], + + @computed('topic.pinned', 'topic.closed', 'topic.archived') + topicStatusIcon() { + if(this.get('topic.pinned')) { return 'topic-pinned'; } + if(this.get('topic.closed')) { return 'topic-closed'; } + if(this.get('topic.archived')) { return 'topic-archived'; } + return 'topic-open'; + } +}); diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs new file mode 100644 index 0000000000..5251070169 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-topic.hbs @@ -0,0 +1,3 @@ + + {{text-overflow class="overflow" text=topic.fancyTitle}} + diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs index 6e65397af8..8909e8a9ba 100644 --- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs +++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs @@ -20,11 +20,7 @@ {{#if c.topics}} {{/if}} diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss index a2b03a52f8..2a6a53add6 100644 --- a/app/assets/stylesheets/desktop/category-list.scss +++ b/app/assets/stylesheets/desktop/category-list.scss @@ -309,5 +309,7 @@ float: left; margin-left: -1.5em; } + li.topic-pinned:before { content: '\f08d'; } + li.topic-closed:before, li.topic-archived:before { content: '\f023'; } } }