Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-06 23:48:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

ultimate acp route refactorizationing

Browse Source
This commit is contained in:
psychobunny
2014-09-28 21:09:40 -04:00
parent 6a9b131223
commit 341959be82
25 changed files with 72 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/controllers/admin.js
View File

@@ -53,7 +53,7 @@ adminController.home = function(req, res, next) {
if (err) {
return next(err);
}
res.render('admin/index', {
res.render('admin/general/index', {
version: pkg.version,
notices: results.notices,
stats: results.stats
@@ -137,7 +137,7 @@ function filterAndRenderCategories(req, res, next, active) {
return active ? !category.disabled : category.disabled;
});
res.render('admin/categories', {
res.render('admin/manage/categories', {
categories: categoryData,
csrf: req.csrfToken()
});
@@ -150,13 +150,13 @@ adminController.tags.get = function(req, res, next) {
return next(err);
}
res.render('admin/tags', {tags: tags});
res.render('admin/managetags', {tags: tags});
});
};
adminController.database.get = function(req, res, next) {
db.info(function (err, data) {
res.render('admin/database', data);
res.render('admin/advanced/database', data);
});
};
@@ -167,7 +167,7 @@ adminController.events.get = function(req, res, next) {
}
data = data.toString().split('\n').reverse().join('\n');
res.render('admin/events', {
res.render('admin/advanced/events', {
eventdata: data
});
});
@@ -179,7 +179,7 @@ adminController.plugins.get = function(req, res, next) {
plugins = [];
}
res.render('admin/plugins' , {
res.render('admin/extend/plugins' , {
plugins: plugins
});
})
@@ -187,7 +187,7 @@ adminController.plugins.get = function(req, res, next) {
adminController.languages.get = function(req, res, next) {
languages.list(function(err, languages) {
res.render('admin/languages', {
res.render('admin/general/languages', {
languages: languages
});
});
@@ -202,7 +202,7 @@ adminController.settings.get = function(req, res, next) {
};
adminController.logger.get = function(req, res, next) {
res.render('admin/logger', {});
res.render('admin/development/logger', {});
};
adminController.appearance.get = function(req, res, next) {
@@ -280,7 +280,7 @@ adminController.groups.get = function(req, res, next) {
groups = groups.filter(function(group) {
return group.name !== 'registered-users' && group.name !== 'guests';
});
res.render('admin/groups', {
res.render('admin/manage/groups', {
groups: groups,
yourid: req.user.uid
});
@@ -295,7 +295,7 @@ adminController.sounds.get = function(req, res, next) {
};
});
res.render('admin/sounds', {
res.render('admin/general/sounds', {
sounds: sounds
});
});

4
src/controllers/admin/users.js
View File

@@ -6,7 +6,7 @@ var user = require('./../../user');
var usersController = {};
usersController.search = function(req, res, next) {
res.render('admin/users', {
res.render('admin/manage/users', {
search_display: '',
loadmore_display: 'none',
users: []
@@ -30,7 +30,7 @@ function getUsers(set, req, res, next) {
if (err) {
return next(err);
}
res.render('admin/users', {
res.render('admin/manage/users', {
search_display: 'hidden',
loadmore_display: 'block',
users: users,

48
src/routes/admin.js
View File

@@ -36,35 +36,35 @@ function apiRouter(middleware, controllers) {
}
function addRoutes(router, middleware, controllers) {
//main
router.get('/index', controllers.admin.home);
router.get('/plugins', controllers.admin.plugins.get);
router.get('/appearance/:term?', controllers.admin.appearance.get);
router.get('/extend/widgets', controllers.admin.extend.widgets);
router.get('/languages', controllers.admin.languages.get);
router.get('/groups', controllers.admin.groups.get);
router.get('/sounds', controllers.admin.sounds.get);
router.get('/general/index', controllers.admin.home);
router.get('/general/languages', controllers.admin.languages.get);
router.get('/general/sounds', controllers.admin.sounds.get);
router.get('/manage/categories', middleware.applyCSRF, controllers.admin.categories.active);
router.get('/manage/categories/active', middleware.applyCSRF, controllers.admin.categories.active);
router.get('/manage/categories/disabled', middleware.applyCSRF, controllers.admin.categories.disabled);
router.get('/manage/tags', controllers.admin.tags.get);
router.get('/manage/users', controllers.admin.users.search);
router.get('/manage/users/search', controllers.admin.users.search);
router.get('/manage/users/latest', controllers.admin.users.sortByJoinDate);
router.get('/manage/users/sort-posts', controllers.admin.users.sortByPosts);
router.get('/manage/users/sort-reputation', controllers.admin.users.sortByReputation);
router.get('/manage/groups', controllers.admin.groups.get);
//settings
router.get('/settings/:term?', middleware.applyCSRF, controllers.admin.settings.get);
//user
router.get('/users', controllers.admin.users.search);
router.get('/users/search', controllers.admin.users.search);
router.get('/users/latest', controllers.admin.users.sortByJoinDate);
router.get('/users/sort-posts', controllers.admin.users.sortByPosts);
router.get('/users/sort-reputation', controllers.admin.users.sortByReputation);
router.get('/appearance/:term?', controllers.admin.appearance.get);
//forum
router.get('/categories', middleware.applyCSRF, controllers.admin.categories.active);
router.get('/categories/active', middleware.applyCSRF, controllers.admin.categories.active);
router.get('/categories/disabled', middleware.applyCSRF, controllers.admin.categories.disabled);
router.get('/tags', controllers.admin.tags.get);
router.get('/extend/plugins', controllers.admin.plugins.get);
router.get('/extend/widgets', controllers.admin.extend.widgets);
//misc
router.get('/database', controllers.admin.database.get);
router.get('/events', controllers.admin.events.get);
router.get('/logger', controllers.admin.logger.get);
router.get('/advanced/database', controllers.admin.database.get);
router.get('/advanced/events', controllers.admin.events.get);
router.get('/development/logger', controllers.admin.logger.get);
}
module.exports = function(app, middleware, controllers) {

0
src/views/admin/database.tpl → src/views/admin/advanced/database.tpl
View File

0
src/views/admin/events.tpl → src/views/admin/advanced/events.tpl
View File

0
src/views/admin/logger.tpl → src/views/admin/development/logger.tpl
View File

0
src/views/admin/plugins.tpl → src/views/admin/extend/plugins.tpl
View File

0
src/views/admin/index.tpl → src/views/admin/general/index.tpl
View File

0
src/views/admin/languages.tpl → src/views/admin/general/languages.tpl
View File

0
src/views/admin/sounds.tpl → src/views/admin/general/sounds.tpl
View File

26
src/views/admin/header.tpl
View File

@@ -55,7 +55,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand nodebb-logo" href="{relative_path}/admin/index"><img src="{relative_path}/images/logo.png" alt="NodeBB ACP" /> Admin Control Panel <span id="breadcrumbs"></span></a>
<a class="navbar-brand nodebb-logo" href="{relative_path}/admin/general/index"><img src="{relative_path}/images/logo.png" alt="NodeBB ACP" /> Admin Control Panel <span id="breadcrumbs"></span></a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
@@ -99,18 +99,18 @@
<div class="sidebar-nav">
<ul class="nav nav-list">
<li class="nav-header"><i class="fa fa-fw fa-dashboard"></i> General</li>
<li class="active"><a href="{relative_path}/admin/index">Dashboard</a></li>
<li><a href="{relative_path}/admin/languages">Languages</a></li>
<li><a href="{relative_path}/admin/sounds">Sounds</a></li>
<li class="active"><a href="{relative_path}/admin/general/index">Dashboard</a></li>
<li><a href="{relative_path}/admin/general/languages">Languages</a></li>
<li><a href="{relative_path}/admin/general/sounds">Sounds</a></li>
</ul>
</div>
<div class="sidebar-nav">
<ul class="nav nav-list">
<li class="nav-header"><i class="fa fa-fw fa-comments-o"></i> Manage</li>
<li><a href="{relative_path}/admin/categories/active">Categories</a></li>
<li><a href="{relative_path}/admin/tags">Tags</a></li>
<li><a href="{relative_path}/admin/users/latest">Users</a></li>
<li><a href="{relative_path}/admin/groups">Groups</a></li>
<li><a href="{relative_path}/admin/manage/categories/active">Categories</a></li>
<li><a href="{relative_path}/admin/manage/tags">Tags</a></li>
<li><a href="{relative_path}/admin/manage/users/latest">Users</a></li>
<li><a href="{relative_path}/admin/manage/groups">Groups</a></li>
</ul>
</div>
<div class="sidebar-nav">
@@ -139,22 +139,22 @@
<div class="sidebar-nav">
<ul class="nav nav-list">
<li class="nav-header"><i class="fa fa-fw fa-wrench"></i> Extend</li>
<li><a href="{relative_path}/admin/plugins">Plugins</a></li>
<li><a href="{relative_path}/admin/extend/plugins">Plugins</a></li>
<li><a href="{relative_path}/admin/extend/widgets">Widgets</a></li>
</ul>
</div>
<div class="sidebar-nav">
<ul class="nav nav-list">
<li class="nav-header"><i class="fa fa-fw fa-hdd-o"></i> Advanced</li>
<li><a href="{relative_path}/admin/database">Database</a></li>
<li><a href="{relative_path}/admin/events">Events</a></li>
<li><a href="{relative_path}/admin/advanced/database">Database</a></li>
<li><a href="{relative_path}/admin/advanced/events">Events</a></li>
</ul>
</div>
<div class="sidebar-nav">
<ul class="nav nav-list">
<li class="nav-header"><i class="fa fa-fw fa-facebook-square"></i> Social Authentication</li>
<!-- IF !authentication.length -->
<li><a href="{relative_path}/admin/plugins">Install SSO Plugins</a></li>
<li><a href="{relative_path}/admin/extend/plugins">Install SSO Plugins</a></li>
<!-- ENDIF !authentication.length -->
<!-- BEGIN authentication -->
<li>
@@ -177,7 +177,7 @@
<div class="sidebar-nav">
<ul class="nav nav-list">
<li class="nav-header"><i class="fa fa-fw fa-th"></i> Development</li>
<li><a href="{relative_path}/admin/logger">Logger</a></li>
<li><a href="{relative_path}/admin/development/logger">Logger</a></li>
</ul>
</div>
<!-- ENDIF env -->

4
src/views/admin/categories.tpl → src/views/admin/manage/categories.tpl
View File

@@ -8,8 +8,8 @@
</h1>
<hr />
<ul class="nav nav-pills">
<li class='active'><a href='/admin/categories/active'>Active</a></li>
<li class=''><a href='/admin/categories/disabled'>Disabled</a></li>
<li class='active'><a href='/admin/manage/categories/active'>Active</a></li>
<li class=''><a href='/admin/manage/categories/disabled'>Disabled</a></li>
</ul>
<div class="row admin-categories">

0
src/views/admin/groups.tpl → src/views/admin/manage/groups.tpl
View File

0
src/views/admin/tags.tpl → src/views/admin/manage/tags.tpl
View File

8
src/views/admin/users.tpl → src/views/admin/manage/users.tpl
View File

@@ -4,10 +4,10 @@
<a target="_blank" href="/admin/users/csv" class="btn btn-primary">Download CSV</a>
<hr />
<ul class="nav nav-pills">
<li class='active'><a href='{relative_path}/admin/users/search'>Search</a></li>
<li class=''><a href='{relative_path}/admin/users/latest'>Latest Users</a></li>
<li class=''><a href='{relative_path}/admin/users/sort-posts'>Top Posters</a></li>
<li class=''><a href='{relative_path}/admin/users/sort-reputation'>Most Reputation</a></li>
<li class='active'><a href='{relative_path}/admin/manage/users/search'>Search</a></li>
<li class=''><a href='{relative_path}/admin/manage/users/latest'>Latest Users</a></li>
<li class=''><a href='{relative_path}/admin/manage/users/sort-posts'>Top Posters</a></li>
<li class=''><a href='{relative_path}/admin/manage/users/sort-reputation'>Most Reputation</a></li>
<div class="btn-group pull-right">