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

acp shenans

Browse Source
This commit is contained in:
barisusakli
2015-03-06 19:38:10 -05:00
parent c15a289d2a
commit 3809b331bc
2 changed files with 77 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/middleware/admin.js
View File

@@ -32,9 +32,29 @@ middleware.isAdmin = function(req, res, next) {
}; };
middleware.buildHeader = function(req, res, next) { middleware.buildHeader = function(req, res, next) {
res.locals.renderAdminHeader = true;
async.parallel({
config: function(next) {
controllers.api.getConfig(req, res, next);
},
footer: function(next) {
app.render('admin/footer', {}, next);
}
}, function(err, results) {
if (err) {
return next(err);
}
res.locals.config = results.config;
res.locals.adminFooter = results.footer;
next();
});
};
middleware.renderHeader = function(req, res, next) {
var uid = req.user ? req.user.uid : 0; var uid = req.user ? req.user.uid : 0;
async.parallel([
function(next) {
var custom_header = { var custom_header = {
'plugins': [], 'plugins': [],
'authentication': [] 'authentication': []
@@ -83,26 +103,15 @@ middleware.buildHeader = function(req, res, next) {
authentication: results.custom_header.authentication, authentication: results.custom_header.authentication,
scripts: results.scripts, scripts: results.scripts,
'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '', 'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
env: process.env.NODE_ENV ? true : false env: process.env.NODE_ENV ? true : false,
}; };
app.render('admin/header', data, function(err, template) { data.template = {name: res.locals.template};
if (err) { data.template[res.locals.template] = true;
return next(err);
} app.render('admin/header', data, next);
res.locals.adminHeader = template;
next();
}); });
}); });
});
},
function(next) {
app.render('admin/footer', {}, function(err, template) {
res.locals.adminFooter = template;
next(err);
});
}
], next);
}; };
module.exports = function(webserver) { module.exports = function(webserver) {

15
src/middleware/middleware.js
View File

@@ -284,7 +284,6 @@ middleware.renderHeader = function(req, res, callback) {
href: nconf.get('relative_path') + '/favicon.ico' href: nconf.get('relative_path') + '/favicon.ico'
}); });
async.parallel({ async.parallel({
customCSS: function(next) { customCSS: function(next) {
templateValues.useCustomCSS = parseInt(meta.config.useCustomCSS, 10) === 1; templateValues.useCustomCSS = parseInt(meta.config.useCustomCSS, 10) === 1;
@@ -401,20 +400,18 @@ middleware.processRender = function(req, res, next) {
str = str + res.locals.adminFooter; str = str + res.locals.adminFooter;
} }
if (res.locals.renderHeader) { if (res.locals.renderHeader || res.locals.renderAdminHeader) {
middleware.renderHeader(req, res, function(err, template) { var method = res.locals.renderHeader ? middleware.renderHeader : middleware.admin.renderHeader;
method(req, res, function(err, template) {
if (err) {
return fn(err);
}
str = template + str; str = template + str;
var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB'; var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
translator.translate(str, language, function(translated) { translator.translate(str, language, function(translated) {
fn(err, translated); fn(err, translated);
}); });
}); });
} else if (res.locals.adminHeader) {
str = res.locals.adminHeader + str;
var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
translator.translate(str, language, function(translated) {
fn(err, translated);
});
} else { } else {
fn(err, str); fn(err, str);
} }