Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 21:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

added colorpicker to frontend, badge colour changes for groups, #2588

Browse Source
This commit is contained in:
Julian Lam
2015-01-09 13:51:27 -05:00
parent 7be0830751
commit b4731ad47b
8 changed files with 102 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/groups.js
View File

@@ -423,7 +423,8 @@ var async = require('async'),
description: values.description || '',
icon: values.icon || '',
labelColor: values.labelColor || '#000000',
hidden: values.hidden || '0'
hidden: values.hidden || '0',
'private': values.private === false ? '0' : '1'
}, function(err) {
if (err) {
return callback(err);

4
src/meta/css.js
View File

@@ -49,9 +49,11 @@ module.exports = function(Meta) {
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css";';
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";';
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";';
acpSource = '\n@import "..' + path.sep + 'public/less/admin/admin";\n' + source;
acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";';
source = '@import "./theme";\n' + source;
async.parallel([

1
src/socket.io/admin/groups.js
View File

@@ -41,6 +41,7 @@ Groups.leave = function(socket, data, callback) {
groups.leave(data.groupName, data.uid, callback);
};
// Possibly remove this and call SocketGroups.update instead
Groups.update = function(socket, data, callback) {
if(!data) {
return callback(new Error('[[error:invalid-data]]'));

14
src/socket.io/groups.js
View File

@@ -87,4 +87,18 @@ SocketGroups.reject = function(socket, data, callback) {
});
};
SocketGroups.update = function(socket, data, callback) {
if(!data) {
return callback(new Error('[[error:invalid-data]]'));
}
groups.ownership.isOwner(socket.uid, data.groupName, function(err, isOwner) {
if (!isOwner) {
return callback(new Error('[[error:no-privileges]]'));
}
groups.update(data.groupName, data.values, callback);
});
};
module.exports = SocketGroups;

1
src/views/admin/header.tpl
View File

@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="{relative_path}/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css?{cache-buster}">
<link rel="stylesheet" type="text/css" href="{relative_path}/vendor/colorpicker/colorpicker.css?{cache-buster}">
<link rel="stylesheet" type="text/css" href="{relative_path}/vendor/nanoscroller/nanoscroller.css?{cache-buster}">
<link rel="stylesheet" type="text/css" href="{relative_path}/admin.css?{cache-buster}" />