Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-04 10:29:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'develop'

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-01-30 15:41:14 -07:00
parent 54ac23cc7a bc9fa0a990
commit c14a31644b
15 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/controllers/admin/blacklist.js
View File

@@ -9,7 +9,10 @@ blacklistController.get = function (req, res, next) {
if (err) {
return next(err);
}
res.render('admin/manage/ip-blacklist', { rules: rules });
res.render('admin/manage/ip-blacklist', {
rules: rules,
title: '[[pages:ip-blacklist]]'
});
});
};

20
src/controllers/admin/dashboard.js
View File

@@ -19,14 +19,14 @@ dashboardController.get = function (req, res, next) {
var notices = [
{
done: !meta.reloadRequired,
doneText: 'Restart not required',
notDoneText:'Restart required'
doneText: '[[admin/general/dashboard:restart-not-required]]',
notDoneText:'[[admin/general/dashboard:restart-required]]'
},
{
done: plugins.hasListeners('filter:search.query'),
doneText: 'Search Plugin Installed',
notDoneText:'Search Plugin not installed',
tooltip: 'Install a search plugin from the plugin page in order to activate search functionality',
doneText: '[[admin/general/dashboard:search-plugin-installed]]',
notDoneText:'[[admin/general/dashboard:search-plugin-not-installed]]',
tooltip: '[[admin/general/dashboard:search-plugin-tooltip]]',
link:'/admin/extend/plugins'
}
];
@@ -62,10 +62,10 @@ function getStats(callback) {
if (err) {
return callback(err);
}
results[0].name = 'Unique Visitors';
results[1].name = 'Users';
results[2].name = 'Posts';
results[3].name = 'Topics';
results[0].name = '[[admin/general/dashboard:unique-visitors]]';
results[1].name = '[[admin/general/dashboard:users]]';
results[2].name = '[[admin/general/dashboard:posts]]';
results[3].name = '[[admin/general/dashboard:topics]]';
callback(null, results);
});
@@ -101,4 +101,4 @@ function getGlobalField(field, callback) {
});
}
module.exports = dashboardController;
module.exports = dashboardController;