From 48c7e20d80d8b8f7fcdecb2301b3f1860f772fc9 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 21 Jan 2015 12:20:39 -0500 Subject: [PATCH] DRY up the displaying of topic categories. Should not be duplicated. --- .../discourse/templates/components/topic-category.hbs | 6 ++++++ app/assets/javascripts/discourse/templates/header.hbs | 5 +---- app/assets/javascripts/discourse/templates/topic.hbs | 6 +----- 3 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 app/assets/javascripts/discourse/templates/components/topic-category.hbs diff --git a/app/assets/javascripts/discourse/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/templates/components/topic-category.hbs new file mode 100644 index 0000000000..8a914440e0 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/topic-category.hbs @@ -0,0 +1,6 @@ +{{#if topic.category.parentCategory}} + {{bound-category-link topic.category.parentCategory}} +{{/if}} +{{bound-category-link topic.category hideParent=true}} + +{{plugin-outlet "topic-category"}} diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs index 24aa48c715..85056267fb 100644 --- a/app/assets/javascripts/discourse/templates/header.hbs +++ b/app/assets/javascripts/discourse/templates/header.hbs @@ -112,10 +112,7 @@ {{/if}} {{/if}} - {{#if topic.category.parentCategory}} - {{bound-category-link topic.category.parentCategory}} - {{/if}} - {{bound-category-link topic.category hideParent=true}} + {{topic-category topic=topic}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 878fa421e3..f1c0e22c4e 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -43,11 +43,7 @@ {{#unless isPrivateMessage}} - {{#if category.parentCategory}} - {{bound-category-link category.parentCategory}} - {{/if}} - {{bound-category-link category hideParent=true}} - {{plugin-outlet "topic-category"}} + {{topic-category topic=model}} {{/unless}} {{/if}}