diff --git a/app/assets/javascripts/discourse/controllers/edit_category_controller.js b/app/assets/javascripts/discourse/controllers/edit_category_controller.js index 4175eb6303c..5f85d617733 100644 --- a/app/assets/javascripts/discourse/controllers/edit_category_controller.js +++ b/app/assets/javascripts/discourse/controllers/edit_category_controller.js @@ -70,6 +70,19 @@ Discourse.EditCategoryController = Discourse.ObjectController.extend(Discourse.M return "background-color: #" + (this.get('color')) + "; color: #" + (this.get('text_color')) + ";"; }.property('color', 'text_color'), + parentStyle: function() { + if (this.get('parent_category_id')) { + var parent = Discourse.Category.list().findBy('id', parseInt(this.get('parent_category_id'), 10)); + if (parent) { + return 'background-color: #' + parent.get('color') + ';'; + } else { + return 'display: none'; + } + } else { + return 'display: none;'; + } + }.property('parent_category_id'), + // background colors are available as a pipe-separated string backgroundColors: function() { var categories = Discourse.Category.list(); diff --git a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars index 6077c9e0081..b0656358213 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars +++ b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars @@ -52,7 +52,7 @@
- {{categoryName}} +  {{categoryName}}
{{i18n category.background_color}}: