From fa9636a62ada5c4c20969b91253809dd6228a279 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Tue, 12 Nov 2013 12:41:16 -0500 Subject: [PATCH] closes #495 --- public/src/templates.js | 2 +- public/templates/admin/header.tpl | 20 +++++++++++++++--- src/routes/admin.js | 34 ++++++++++++++++++------------- src/routes/api.js | 2 +- src/routes/authentication.js | 2 +- src/routes/user.js | 2 +- src/webserver.js | 8 ++++---- 7 files changed, 45 insertions(+), 25 deletions(-) diff --git a/public/src/templates.js b/public/src/templates.js index bd3f376ca8..8f8099eb3c 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -91,7 +91,7 @@ } else { getTemplates(__dirname + '/../templates'); } - + } function loadClient() { diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl index e96a39c4ff..a4dd571c0c 100644 --- a/public/templates/admin/header.tpl +++ b/public/templates/admin/header.tpl @@ -39,7 +39,7 @@ -
+
diff --git a/src/routes/admin.js b/src/routes/admin.js index a071d8ecbe..d2f8871be3 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -19,21 +19,27 @@ var user = require('./../user.js'), }); } - Admin.build_header = function (res, callback) { + Admin.buildHeader = function (req, res, callback) { var custom_header = { 'plugins': [] }; - plugins.fireHook('filter:admin.header.build', custom_header, function(err, custom_header) { - callback(err, templates['admin/header'].parse({ - csrf: res.locals.csrf_token, - relative_path: nconf.get('relative_path'), - plugins: custom_header.plugins - })); + user.getUserFields(req.user.uid, ['username', 'userslug', 'picture'], function(err, userData) { + + plugins.fireHook('filter:admin.header.build', custom_header, function(err, custom_header) { + callback(err, templates['admin/header'].parse({ + csrf: res.locals.csrf_token, + relative_path: nconf.get('relative_path'), + plugins: custom_header.plugins, + userpicture: userData.picture, + username: userData.username, + userslug: userData.userslug + })); + }); }); } - Admin.create_routes = function (app) { + Admin.createRoutes = function (app) { (function () { var routes = [ @@ -46,7 +52,7 @@ var user = require('./../user.js'), for (var i = 0, ii = routes.length; i < ii; i++) { (function (route) { app.get('/admin/' + route, Admin.isAdmin, function (req, res) { - Admin.build_header(res, function(err, header) { + Admin.buildHeader(req, res, function(err, header) { res.send(header + app.create_route('admin/' + route) + templates['admin/footer']); }); }); @@ -58,7 +64,7 @@ var user = require('./../user.js'), for (var i = 0, ii = unit_tests.length; i < ii; i++) { (function (route) { app.get('/admin/testing/' + route, Admin.isAdmin, function (req, res) { - Admin.build_header(res, function(err, header) { + Admin.buildHeader(req, res, function(err, header) { res.send(header + app.create_route('admin/testing/' + route) + templates['admin/footer']); }); }); @@ -69,13 +75,13 @@ var user = require('./../user.js'), app.namespace('/admin', function () { app.get('/', Admin.isAdmin, function (req, res) { - Admin.build_header(res, function(err, header) { + Admin.buildHeader(req, res, function(err, header) { res.send(header + app.create_route('admin/index') + templates['admin/footer']); }); }); app.get('/index', Admin.isAdmin, function (req, res) { - Admin.build_header(res, function(err, header) { + Admin.buildHeader(req, res, function(err, header) { res.send(header + app.create_route('admin/index') + templates['admin/footer']); }); }); @@ -144,7 +150,7 @@ var user = require('./../user.js'), (function(route) { app[routes[route].method || 'get']('/admin' + routes[route].route, function(req, res) { routes[route].options(req, res, function(options) { - Admin.build_header(res, function (err, header) { + Admin.buildHeader(req, res, function (err, header) { res.send(header + options.content + templates['admin/footer']); }); }); @@ -158,7 +164,7 @@ var user = require('./../user.js'), app.namespace('/api/admin', function () { app.get('/index', function (req, res) { res.json({ - version: pkg.version + version: pkg.version, }); }); diff --git a/src/routes/api.js b/src/routes/api.js index 5b4e1c5f10..5142cf1202 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -12,7 +12,7 @@ var user = require('./../user.js'), (function (Api) { - Api.create_routes = function (app) { + Api.createRoutes = function (app) { app.namespace('/api', function () { app.get('/get_templates_listing', function (req, res) { utils.walk(path.join(__dirname, '../../', 'public/templates'), function (err, data) { diff --git a/src/routes/authentication.js b/src/routes/authentication.js index e4a69623b0..7b3eb3c0e9 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -89,7 +89,7 @@ return login_strategies; } - Auth.create_routes = function(app) { + Auth.createRoutes = function(app) { app.post('/logout', function(req, res) { if (req.user && req.user.uid > 0) { winston.info('[Auth] Session ' + req.sessionID + ' logout (uid: ' + req.user.uid + ')'); diff --git a/src/routes/user.js b/src/routes/user.js index 9f219c90f0..b43d770f5c 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -12,7 +12,7 @@ var user = require('./../user.js'), websockets = require('./../websockets.js'); (function (User) { - User.create_routes = function (app) { + User.createRoutes = function (app) { app.get('/uid/:uid', function (req, res) { diff --git a/src/webserver.js b/src/webserver.js index fa334fb756..839bcdbdfc 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -323,10 +323,10 @@ var express = require('express'), app.namespace(nconf.get('relative_path'), function () { - auth.create_routes(app); - admin.create_routes(app); - userRoute.create_routes(app); - apiRoute.create_routes(app); + auth.createRoutes(app); + admin.createRoutes(app); + userRoute.createRoutes(app); + apiRoute.createRoutes(app); // Basic Routes (entirely client-side parsed, goal is to move the rest of the crap in this file into this one section)