From 7bb3e905adf892103553aa411d0f552972fed078 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Thu, 31 Dec 2020 17:00:06 +0800
Subject: [PATCH] Always show description

---
 common/common.scss                                            |  4 ++++
 javascripts/discourse/components/category-name-header.js.es6  | 11 +++++------
 .../discourse/templates/components/category-name-header.hbs   |  5 ++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/common/common.scss b/common/common.scss
index b9afe9f..372138f 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -12,6 +12,10 @@
   margin-bottom: 20px;
   width: 100%;
   
+  p:first-child {
+    display: none;
+  }
+  
   &.has-logo {
     border: 2px solid $tertiary;
     padding: 1em;
diff --git a/javascripts/discourse/components/category-name-header.js.es6 b/javascripts/discourse/components/category-name-header.js.es6
index 4a2582f..53629d6 100644
--- a/javascripts/discourse/components/category-name-header.js.es6
+++ b/javascripts/discourse/components/category-name-header.js.es6
@@ -7,14 +7,13 @@ export default Component.extend({
   didInsertElement() {
     scheduleOnce('afterRender', () => {
       let $el = $(this.element);
-                  
+      $el.appendTo('section.category-heading');
+      
       if (this.category.uploaded_logo) {
-        $el.insertAfter('section.category-heading .category-logo');
-        $('section.category-heading').addClass('has-logo');
-        $('section.category-heading .category-name-header, section.category-heading p').wrapAll('<div class="category-heading-details"></div>');
-      } else {
-        $el.appendTo('section.category-heading');    
+        $('section.category-heading').addClass('has-logo');  
       }
+      
+      $('section.category-heading .category-name-header, section.category-heading p').wrapAll('<div class="category-heading-details"></div>');
     });
   }
 })
\ No newline at end of file
diff --git a/javascripts/discourse/templates/components/category-name-header.hbs b/javascripts/discourse/templates/components/category-name-header.hbs
index 8ea1282..25210a8 100644
--- a/javascripts/discourse/templates/components/category-name-header.hbs
+++ b/javascripts/discourse/templates/components/category-name-header.hbs
@@ -1 +1,4 @@
-{{category.name}}
\ No newline at end of file
+{{category.name}}
+{{#if category.description}}
+  <p>{{dir-span category.description}}</p>
+{{/if}}
\ No newline at end of file