diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js index 73e81425af..358afb9141 100644 --- a/public/src/forum/admin/categories.js +++ b/public/src/forum/admin/categories.js @@ -81,7 +81,8 @@ define(function() { name: $('#inputName').val(), description: $('#inputDescription').val(), icon: $('#new-category-modal i').val(), - blockclass: $('#inputBlockclass').val() + bgColor: '#0059b2', + color: '#fff' }; socket.emit('api:admin.categories.create', category, function(err, data) { diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index 186853a83a..0f3439aa81 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -135,7 +135,9 @@ define(function() { categoriesEl.className = 'category-list'; for (x = 0; x < numCategories; x++) { info = data.categories[x]; - categoryEl.className = info.blockclass + (info.disabled === '1' ? ' disabled' : ''); + categoryEl.style.background = info.bgColor; + categoryEl.style.color = info.color || '#fff'; + categoryEl.className = info.disabled === '1' ? ' disabled' : ''; categoryEl.innerHTML = ' ' + info.name; categoryEl.setAttribute('data-cid', info.cid); categoriesFrag.appendChild(categoryEl.cloneNode(true)); diff --git a/public/templates/admin/categories.tpl b/public/templates/admin/categories.tpl index e5fb32d1e4..ceddd9a51c 100644 --- a/public/templates/admin/categories.tpl +++ b/public/templates/admin/categories.tpl @@ -18,8 +18,8 @@ - - + + @@ -65,20 +65,6 @@ - -
- -
- -
-
- diff --git a/src/admin/categories.js b/src/admin/categories.js index 405f180cdc..804741be52 100644 --- a/src/admin/categories.js +++ b/src/admin/categories.js @@ -4,10 +4,6 @@ var RDB = require('./../redis.js'), (function(CategoriesAdmin) { - CategoriesAdmin.create = function(data, callback) { - categories.create(data, callback); - }; - CategoriesAdmin.update = function(modified, socket) { var updated = []; diff --git a/src/categories.js b/src/categories.js index d21b461a66..cc72bdc7b1 100644 --- a/src/categories.js +++ b/src/categories.js @@ -25,7 +25,8 @@ var RDB = require('./redis.js'), name: data.name, description: data.description, icon: data.icon, - blockclass: data.blockclass, + bgColor: data.bgColor, + color: data.color, slug: slug, topic_count: 0, disabled: 0, diff --git a/src/install.js b/src/install.js index d9bb7140b7..3f12f4b9fb 100644 --- a/src/install.js +++ b/src/install.js @@ -204,10 +204,7 @@ var async = require('async'), }, function (next) { // Categories - var Categories = require('./categories'), - admin = { - categories: require('./admin/categories') - }; + var Categories = require('./categories'); Categories.getAllCategories(0, function (err, data) { if (data.categories.length === 0) { @@ -217,7 +214,7 @@ var async = require('async'), default_categories = JSON.parse(default_categories); async.eachSeries(default_categories, function (category, next) { - admin.categories.create(category, next); + Categories.create(category, next); }, function (err) { if (!err) { next(); diff --git a/src/websockets.js b/src/websockets.js index b144eb5db8..bd77f04bbe 100644 --- a/src/websockets.js +++ b/src/websockets.js @@ -891,7 +891,7 @@ module.exports.init = function(io) { }); socket.on('api:admin.categories.create', function(data, callback) { - admin.categories.create(data, function(err, data) { + categories.create(data, function(err, data) { callback(err, data); }); });