Add site setting category support

Author: nlalonde

app/assets/javascripts/admin/models/site_setting.js

@@ -103,21 +103,25 @@ Discourse.SiteSetting = Discourse.Model.extend({
 
 Discourse.SiteSetting.reopenClass({
 
-  /**
-    Retrieve all settings from the server
-
-    @method findAll
-  **/
   findAll: function() {
-    var result = Em.A();
-    Discourse.ajax("/admin/site_settings").then(function (settings) {
+    return Discourse.ajax("/admin/site_settings").then(function (settings) {
+      // Group the results by category
+      var categoryNames = [],
+          categories = {},
+          result = Em.A();
       _.each(settings.site_settings,function(s) {
         s.originalValue = s.value;
-        result.pushObject(Discourse.SiteSetting.create(s));
+        if (!categoryNames.contains(s.category)) {
+          categoryNames.pushObject(s.category);
+          categories[s.category] = Em.A();
+        }
+        categories[s.category].pushObject(Discourse.SiteSetting.create(s));
+      });
+      _.each(categoryNames, function(n) {
+        result.pushObject({nameKey: n, name: I18n.t('admin.site_settings.categories.' + n),siteSettings: categories[n]});
       });
-      result.set('diags', settings.diags);
+      return result;
     });
-    return result;
   },
 
   update: function(key, value) {
@@ -126,6 +130,7 @@ Discourse.SiteSetting.reopenClass({
       data: { value: value }
     });
   }
+
 });
 
 

app/assets/javascripts/admin/routes/admin_routes.js

@@ -7,7 +7,9 @@
 Discourse.Route.buildRoutes(function() {
   this.resource('admin', { path: '/admin' }, function() {
     this.route('dashboard', { path: '/' });
-    this.route('site_settings', { path: '/site_settings' });
+    this.resource('adminSiteSettings', { path: '/site_settings' }, function() {
+      this.resource('adminSiteSettingsCategory', { path: 'category/:category_id'} );
+    });
 
 
     this.resource('adminSiteContents', { path: '/site_contents' }, function() {

app/assets/javascripts/admin/routes/admin_site_setting_category_route.js

@@ -0,0 +1,18 @@
+/**
+  Handles routes related to viewing and editing site settings within one category.
+
+  @class AdminSiteSettingCategoryRoute
+  @extends Discourse.Route
+  @namespace Discourse
+  @module Discourse
+**/
+Discourse.AdminSiteSettingsCategoryRoute = Discourse.Route.extend({
+  model: function(params) {
+    var category = this.modelFor('adminSiteSettings').find(function(siteSettingCategory) {
+      return siteSettingCategory.nameKey === params.category_id;
+    });
+    if (category) {
+      return category.siteSettings;
+    }
+  }
+});

app/assets/javascripts/admin/routes/admin_site_settings_route.js

@@ -11,3 +11,13 @@ Discourse.AdminSiteSettingsRoute = Discourse.Route.extend({
     return Discourse.SiteSetting.findAll();
   }
 });
+
+/**
+  Handles when you click the Site Settings tab in admin, but haven't
+  chosen a category. It will redirect to the first category.
+**/
+Discourse.AdminSiteSettingsIndexRoute = Discourse.Route.extend({
+  model: function() {
+    this.transitionTo('adminSiteSettingsCategory', this.modelFor('adminSiteSettings')[0].nameKey);
+  }
+});

app/assets/javascripts/admin/templates/admin.js.handlebars

@@ -5,7 +5,7 @@
       <ul class="nav nav-pills">
         <li>{{#link-to 'admin.dashboard'}}{{i18n admin.dashboard.title}}{{/link-to}}</li>
         {{#if currentUser.admin}}
-          <li>{{#link-to 'admin.site_settings'}}{{i18n admin.site_settings.title}}{{/link-to}}</li>
+          <li>{{#link-to 'adminSiteSettings'}}{{i18n admin.site_settings.title}}{{/link-to}}</li>
           <li>{{#link-to 'adminSiteContents'}}{{i18n admin.site_content.title}}{{/link-to}}</li>
         {{/if}}
         <li>{{#link-to 'adminUsersList'}}{{i18n admin.users.title}}{{/link-to}}</li>

app/assets/javascripts/admin/templates/site_settings.js.handlebars

@@ -8,8 +8,14 @@
   <div class='controls'>
     {{textField value=filter placeholderKey="type_to_filter"}}
   </div>
-
 </div>
 
-{{collection contentBinding="filteredContent" classNames="form-horizontal settings" itemViewClass="Discourse.SiteSettingView"}}
+<ul class="nav nav-pills">
+  {{#each category in controller}}
+    <li>{{#link-to 'adminSiteSettingsCategory' category.nameKey}}{{category.name}}{{/link-to}}</a></li>
+  {{/each}}
+</ul>
+
+<hr/>
 
+{{ outlet }}

app/assets/javascripts/admin/templates/site_settings_category.js.handlebars

@@ -0,0 +1 @@
+{{collection contentBinding="content" classNames="form-horizontal settings" itemViewClass="Discourse.SiteSettingView"}}

app/assets/javascripts/admin/views/admin_site_settings_category_view.js

@@ -0,0 +1,3 @@
+Discourse.AdminSiteSettingsCategoryView = Discourse.View.extend({
+  templateName: 'admin/templates/site_settings_category'
+});

app/models/site_setting.rb

@@ -8,11 +8,10 @@ class SiteSetting < ActiveRecord::Base
   validates_presence_of :data_type
 
   SiteSettings::YamlLoader.new("#{Rails.root}/config/site_settings.yml").load do |category, name, default, opts|
-    # TODO: category support
     if opts.delete(:client)
-      client_setting(name.to_sym, default)
+      client_setting(name, default, category)
     else
-      setting(name.to_sym, default, opts)
+      setting(name, default, category, opts)
     end
   end
 

config/locales/client.en.yml

@@ -1417,5 +1417,13 @@ en:
         title: 'Settings'
         reset: 'reset to default'
         none: 'none'
-
-
+        categories:
+          mandatory: 'Mandatory'
+          users: 'Users'
+          posting: 'Posting'
+          email: 'Email'
+          files: 'Files'
+          trust: 'Trust Levels'
+          spam: 'Spam'
+          rate_limits: 'Rate Limits'
+          uncategorized: 'Uncategorized'