hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #495

Browse Source
v1.18.x
Baris Usakli 12 years ago
parent 69fefc0625
commit fa9636a62a
7 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
public/src/templates.js
Unescape Escape View File

@ -91,7 +91,7 @@
} else {
getTemplates(__dirname + '/../templates');
}
}
function loadClient() {

20
public/templates/admin/header.tpl
Unescape Escape View File

@ -39,7 +39,7 @@
</head>
<body class="admin">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar navbar-inverse navbar-fixed-top header">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@ -64,8 +64,22 @@
<a href="#" id="reconnect"></a>
</li>
</ul>
<ul class="nav pull-right" id="right-menu">
<li><a href="/users" id="user_label"></a></li>
<ul id="logged-in-menu" class="nav navbar-nav navbar-right">
<li id="user_label" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="user_dropdown">
<img src="{userpicture}"/>
</a>
<ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown">
<li>
<a id="user-profile-link" href="/user/{userslug}" target="_top"><span>Profile</span></a>
</li>
<li id="logout-link">
<a href="#">Log out</a>
</li>
</ul>
</li>
</ul>
</div>
</div>

34
src/routes/admin.js
Unescape Escape View File

@ -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,
});
});

2
src/routes/api.js
Unescape Escape View File

@ -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) {

2
src/routes/authentication.js
Unescape Escape View File

@ -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 + ')');

2
src/routes/user.js
Unescape Escape View File

@ -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) {

8
src/webserver.js
Unescape Escape View File

@ -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)

Write Preview
Loading…
Cancel
Save