Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix global mod priv check and styling for flags page

Browse Source
This commit is contained in:
Julian Lam
2016-02-04 14:36:22 -05:00
parent 95fb0075c6
commit eb8b6af7fb
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/less/admin/admin.less
View File

@@ -10,7 +10,6 @@
@import "./general/navigation"; @import "./general/navigation";
@import "./manage/categories"; @import "./manage/categories";
@import "./manage/tags"; @import "./manage/tags";
@import "./manage/flags";
@import "./manage/groups"; @import "./manage/groups";
@import "./manage/users"; @import "./manage/users";
@import "./appearance/customise"; @import "./appearance/customise";
@@ -21,6 +20,8 @@
@import "./advanced/logs"; @import "./advanced/logs";
@import "./settings"; @import "./settings";
@import "../flags";
@import "./modules/alerts"; @import "./modules/alerts";
@import "./modules/selectable"; @import "./modules/selectable";
@import "./modules/snackbar"; @import "./modules/snackbar";

6
public/less/admin/manage/flags.less → public/less/flags.less
View File

@@ -1,3 +1,9 @@
/*
Flags page CSS
- Originally in ACP
- Now available in front-end for global mods as well
*/
.flag-reporters { .flag-reporters {
font-size: 1.2rem; font-size: 1.2rem;

1
src/meta/css.js
View File

@@ -69,6 +69,7 @@ module.exports = function(Meta) {
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/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";';
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/textcomplete/jquery.textcomplete.css";'; source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/textcomplete/jquery.textcomplete.css";';
source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";'; source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";';
source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/flags.less";';
source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/generics.less";'; source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/generics.less";';
source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/mixins.less";'; source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/mixins.less";';

6
src/socket.io/posts/flag.js
View File

@@ -108,7 +108,7 @@ module.exports = function(SocketPosts) {
} }
async.waterfall([ async.waterfall([
function (next) { function (next) {
user.isAdminOrGlobalModerator(socket.uid, next); user.isAdminOrGlobalMod(socket.uid, next);
}, },
function (isAdminOrGlobalModerator, next) { function (isAdminOrGlobalModerator, next) {
if (!isAdminOrGlobalModerator) { if (!isAdminOrGlobalModerator) {
@@ -122,7 +122,7 @@ module.exports = function(SocketPosts) {
SocketPosts.dismissAllFlags = function(socket, data, callback) { SocketPosts.dismissAllFlags = function(socket, data, callback) {
async.waterfall([ async.waterfall([
function (next) { function (next) {
user.isAdminOrGlobalModerator(socket.uid, next); user.isAdminOrGlobalMod(socket.uid, next);
}, },
function (isAdminOrGlobalModerator, next) { function (isAdminOrGlobalModerator, next) {
if (!isAdminOrGlobalModerator) { if (!isAdminOrGlobalModerator) {
@@ -144,7 +144,7 @@ module.exports = function(SocketPosts) {
async.waterfall([ async.waterfall([
function (next) { function (next) {
user.isAdminOrGlobalModerator(socket.uid, next); user.isAdminOrGlobalMod(socket.uid, next);
}, },
function (isAdminOrGlobalModerator, next) { function (isAdminOrGlobalModerator, next) {
if (!isAdminOrGlobalModerator) { if (!isAdminOrGlobalModerator) {