From 33fcf794442809b4b0ce596e6d449050df4a5bfe Mon Sep 17 00:00:00 2001 From: Catrin Date: Mon, 5 May 2014 09:25:30 +0200 Subject: [PATCH] setting permissions to change category notification levels --- .../javascripts/discourse/routes/discovery_route_builders.js | 1 + .../discourse/templates/navigation/category.js.handlebars | 2 ++ app/assets/stylesheets/desktop/category-notification.scss | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/routes/discovery_route_builders.js b/app/assets/javascripts/discourse/routes/discovery_route_builders.js index df909771a2c..5f450a01336 100644 --- a/app/assets/javascripts/discourse/routes/discovery_route_builders.js +++ b/app/assets/javascripts/discourse/routes/discovery_route_builders.js @@ -108,6 +108,7 @@ function buildCategoryRoute(filter, params) { opts.noSubcategories = params && params.no_subcategories; opts.canEditCategory = Discourse.User.currentProp('staff'); this.controllerFor('navigation/category').setProperties(opts); + opts.canChangeCategoryNotificationLevel = Discourse.User.current(); return Discourse.TopicList.list(listFilter, params).then(function(list) { var tracking = Discourse.TopicTrackingState.current(); diff --git a/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars b/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars index 9081893e9b2..44673b24147 100644 --- a/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars +++ b/app/assets/javascripts/discourse/templates/navigation/category.js.handlebars @@ -7,7 +7,9 @@ {{customHTML "extraNavItem"}} +{{#if canChangeCategoryNotificationLevel}} {{view Discourse.CategoryNotificationsButton categoryBinding="model" category=category}} +{{/if}} {{#if canCreateTopic}} diff --git a/app/assets/stylesheets/desktop/category-notification.scss b/app/assets/stylesheets/desktop/category-notification.scss index 179f65a5467..ee0ceaed498 100644 --- a/app/assets/stylesheets/desktop/category-notification.scss +++ b/app/assets/stylesheets/desktop/category-notification.scss @@ -8,7 +8,7 @@ display: none; width: 550px; padding: 4px 0; - margin: 1px 0 0; + margin: 32px 560px; list-style: none; background-color: $primary_background_color; border: 1px solid $primary_border_color;