From ad406b6e1107d9501a4a052a36f4bd8b42da9bbe Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 21 Apr 2021 21:45:09 +0200 Subject: [PATCH] FEATURE: Make `category-navigation` outlet tagless (#12788) --- .../app/templates/navigation/category.hbs | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs index 4ec2968f173..0b5a8fe0e88 100644 --- a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs +++ b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs @@ -1,22 +1,23 @@ - {{add-category-tag-classes category=category tagName=""}} +{{add-category-tag-classes category=category tagName=""}} -
- {{#if category.uploaded_logo.url}} - {{cdn-img - src=category.uploaded_logo.url - class="category-logo" - width=category.uploaded_logo.width - height=category.uploaded_logo.height}} - {{#if category.description}} -

{{dir-span category.description}}

- {{/if}} +
+ {{#if category.uploaded_logo.url}} + {{cdn-img + src=category.uploaded_logo.url + class="category-logo" + width=category.uploaded_logo.width + height=category.uploaded_logo.height + }} + + {{#if category.description}} +

{{dir-span category.description}}

{{/if}} + {{/if}} - {{plugin-outlet name="category-heading" args=(hash category=category)}} -
+ {{plugin-outlet name="category-heading" args=(hash category=category)}} +
{{#d-section class="navigation-container category-navigation"}} - {{d-navigation category=category filterMode=filterMode @@ -25,8 +26,12 @@ createTopic=(route-action "createTopic") createTopicDisabled=cannotCreateTopicOnCategory hasDraft=currentUser.has_topic_draft - editCategory=(route-action "editCategory" category)}} - - {{plugin-outlet name="category-navigation" args=(hash category=category)}} + editCategory=(route-action "editCategory" category) + }} + {{plugin-outlet + name="category-navigation" + args=(hash category=category) + tagName="" + }} {{/d-section}}