acp shenans

src/middleware/admin.js

@@ -32,9 +32,29 @@ middleware.isAdmin = 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;
-	async.parallel([
-		function(next) {
+
 	var custom_header = {
 		'plugins': [],
 		'authentication': []
@@ -83,26 +103,15 @@ middleware.buildHeader = function(req, res, next) {
 				authentication: results.custom_header.authentication,
 				scripts: results.scripts,
 				'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) {
-						if (err) {
-							return next(err);
-						}
-						res.locals.adminHeader = template;
-						next();
-					});
-				});
+			data.template = {name: res.locals.template};
+			data.template[res.locals.template] = true;
+
+			app.render('admin/header', data, next);
 		});
-		},
-		function(next) {
-			app.render('admin/footer', {}, function(err, template) {
-				res.locals.adminFooter = template;
-				next(err);
 	});
-		}
-	], next);
 };
 
 module.exports = function(webserver) {

src/middleware/middleware.js

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