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

remove meta/title.js and meta.title.build #3481

Browse Source
This commit is contained in:
barisusakli
2015-08-26 15:54:54 -04:00
parent 098c56a106
commit eaefd9d24c
18 changed files with 89 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/controllers/accounts.js
View File

@@ -230,6 +230,7 @@ function getFollow(tpl, name, req, res, next) {
userData.users = users;
userData.nextStart = 50;
userData.title = '[[pages:' + tpl + ', ' + userData.username + ']]';
res.render(tpl, userData);
});
@@ -268,7 +269,7 @@ accountsController.getGroups = function(req, res, next) {
userData.groups = groupsData[0];
userData.groups.forEach(groups.escapeGroupData);
userData.title = '[[pages:account/groups, ' + userData.username + ']]';
res.render('account/groups', userData);
});
});
@@ -321,6 +322,8 @@ function getFromUserSet(tpl, set, method, type, req, res, next) {
var pagination = require('../pagination');
userData.pagination = pagination.create(page, pageCount);
userData.title = '[[pages:' + tpl + ', ' + userData.username + ']]';
res.render(tpl, userData);
});
});
@@ -377,7 +380,7 @@ accountsController.accountEdit = function(req, res, next) {
}
userData.hasPassword = !!password;
userData.title = '[[pages:account/edit, ' + userData.username + ']]';
res.render('account/edit', userData);
});
};
@@ -514,6 +517,8 @@ accountsController.accountSettings = function(req, res, next) {
userData.disableCustomUserSkins = parseInt(meta.config.disableCustomUserSkins, 10) === 1;
userData.title = '[[pages:account/settings]]';
res.render('account/settings', userData);
});
};
@@ -563,7 +568,8 @@ accountsController.getNotifications = function(req, res, next) {
return next(err);
}
res.render('notifications', {
notifications: notifications
notifications: notifications,
title: '[[pages:notifications]]'
});
});
};
@@ -603,7 +609,8 @@ accountsController.getChats = function(req, res, next) {
chats: results.recentChats.users,
nextStart: results.recentChats.nextStart,
contacts: results.contacts,
allowed: true
allowed: true,
title: '[[pages:chats]]'
});
}
@@ -631,7 +638,8 @@ accountsController.getChats = function(req, res, next) {
contacts: results.contacts,
meta: data.toUser,
messages: data.messages,
allowed: data.allowed
allowed: data.allowed,
title: '[[pages:chat, ' + data.toUser.username + ']]'
});
});
});

1
src/controllers/api.js
View File

@@ -27,6 +27,7 @@ apiController.getConfig = function(req, res, next) {
config.websocketAddress = nconf.get('socket.io:address') || '';
config.version = nconf.get('version');
config.siteTitle = validator.escape(meta.config.title || meta.config.browserTitle || 'NodeBB');
config.browserTitle = validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB');
config.showSiteTitle = parseInt(meta.config.showSiteTitle, 10) === 1;
config.postDelay = meta.config.postDelay;
config.minimumTitleLength = meta.config.minimumTitleLength;

4
src/controllers/categories.js
View File

@@ -65,6 +65,8 @@ categoriesController.list = function(req, res, next) {
return next(err);
}
data.title = '[[pages:categories]]';
plugins.fireHook('filter:categories.build', {req: req, res: res, templateData: data}, function(err, data) {
if (err) {
return next(err);
@@ -250,7 +252,7 @@ categoriesController.get = function(req, res, next) {
data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
data.rssFeedUrl = nconf.get('relative_path') + '/category/' + data.cid + '.rss';
data.pagination = pagination.create(data.currentPage, data.pageCount);
data.title = data.name;
data.pagination.rel.forEach(function(rel) {
res.locals.linkTags.push(rel);
});

2
src/controllers/groups.js
View File

@@ -16,6 +16,7 @@ groupsController.list = function(req, res, next) {
if (err) {
return next(err);
}
data.title = '[[pages:groups]]';
res.render('groups/list', data);
});
};
@@ -97,6 +98,7 @@ groupsController.details = function(req, res, next) {
return helpers.notFound(req, res);
}
results.title = '[[pages:group, ' + results.group.displayName + ']]';
res.render('groups/details', results);
});
});

8
src/controllers/index.js
View File

@@ -61,7 +61,8 @@ Controllers.reset = function(req, res, next) {
valid: valid,
displayExpiryNotice: req.session.passwordExpired,
code: req.params.code ? req.params.code : null,
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}])
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}]),
title: '[[pages:reset]]'
});
delete req.session.passwordExpired;
@@ -69,7 +70,8 @@ Controllers.reset = function(req, res, next) {
} else {
res.render('reset', {
code: req.params.code ? req.params.code : null,
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]'}])
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]'}]),
title: '[[pages:reset]]'
});
}
@@ -90,6 +92,7 @@ Controllers.login = function(req, res, next) {
data.allowLoginWith = '[[login:' + (meta.config.allowLoginWith || 'username-email') + ']]';
data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[global:login]]'}]);
data.error = req.flash('error')[0];
data.title = '[[pages:login]]';
res.render('login', data);
};
@@ -128,6 +131,7 @@ Controllers.register = function(req, res, next) {
data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[register:register]]'}]);
data.regFormEntry = [];
data.error = req.flash('error')[0];
data.title = '[[pages:register]]';
plugins.fireHook('filter:register.build', {req: req, res: res, templateData: data}, next);
}

3
src/controllers/popular.js
View File

@@ -36,7 +36,8 @@ popularController.get = function(req, res, next) {
topics: topics,
'feeds:disableRSS': parseInt(meta.config['feeds:disableRSS'], 10) === 1,
rssFeedUrl: nconf.get('relative_path') + '/popular/' + (req.params.term || 'daily') + '.rss',
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[global:header.popular]]'}])
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[global:header.popular]]'}]),
title: '[[pages:popular-' + term + ']]'
};
if (!req.uid) {

1
src/controllers/recent.js
View File

@@ -21,6 +21,7 @@ recentController.get = function(req, res, next) {
data['feeds:disableRSS'] = parseInt(meta.config['feeds:disableRSS'], 10) === 1;
data.rssFeedUrl = nconf.get('relative_path') + '/recent.rss';
data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[recent:title]]'}]);
data.title = '[[pages:recent]]';
plugins.fireHook('filter:recent.build', {req: req, res: res, templateData: data}, function(err, data) {
if (err) {

6
src/controllers/tags.js
View File

@@ -62,7 +62,8 @@ tagsController.getTag = function(req, res, next) {
topics: results.topics,
tag: tag,
nextStart: stop + 1,
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]', url: '/tags'}, {text: tag}])
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]', url: '/tags'}, {text: tag}]),
title: '[[pages:tag, ' + tag + ']]'
};
res.render('tag', data);
});
@@ -76,7 +77,8 @@ tagsController.getTags = function(req, res, next) {
var data = {
tags: tags,
nextStart: 100,
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]'}])
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[tags:tags]]'}]),
title: '[[pages:tags]]'
};
res.render('tags', data);
});

2
src/controllers/unread.js
View File

@@ -55,6 +55,8 @@ unreadController.get = function(req, res, next) {
}
data.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[unread:title]]'}]);
data.title = '[[pages:unread]]';
res.render('unread', data);
});
};

19
src/controllers/users.js
View File

@@ -49,7 +49,8 @@ usersController.getOnlineUsers = function(req, res, next) {
loadmore_display: results.count > 50 ? 'block' : 'hide',
users: results.users,
anonymousUserCount: websockets.getOnlineAnonCount(),
defaultGravatar: user.createGravatarURLFromEmail('')
defaultGravatar: user.createGravatarURLFromEmail(''),
title: '[[pages:users/online]]'
};
render(req, res, userData, next);
@@ -57,18 +58,18 @@ usersController.getOnlineUsers = function(req, res, next) {
};
usersController.getUsersSortedByPosts = function(req, res, next) {
usersController.getUsers('users:postcount', 0, 49, req, res, next);
usersController.getUsers('users:postcount', '[[pages:users/sort-posts]]', 0, 49, req, res, next);
};
usersController.getUsersSortedByReputation = function(req, res, next) {
usersController.getUsers('users:reputation', 0, 49, req, res, next);
usersController.getUsers('users:reputation', '[[pages:users/sort-reputation]]', 0, 49, req, res, next);
};
usersController.getUsersSortedByJoinDate = function(req, res, next) {
usersController.getUsers('users:joindate', 0, 49, req, res, next);
usersController.getUsers('users:joindate', '[[pages:users/latest]]', 0, 49, req, res, next);
};
usersController.getUsers = function(set, start, stop, req, res, next) {
usersController.getUsers = function(set, title, start, stop, req, res, next) {
usersController.getUsersAndCount(set, req.uid, start, stop, function(err, data) {
if (err) {
return next(err);
@@ -78,7 +79,8 @@ usersController.getUsers = function(set, start, stop, req, res, next) {
search_display: 'hidden',
loadmore_display: data.count > (stop - start + 1) ? 'block' : 'hide',
users: data.users,
pagination: pagination.create(1, pageCount)
pagination: pagination.create(1, pageCount),
title: title
};
userData['route_' + set] = true;
render(req, res, userData, next);
@@ -119,7 +121,8 @@ usersController.getUsersForSearch = function(req, res, next) {
var userData = {
search_display: 'block',
loadmore_display: 'hidden',
users: data.users
users: data.users,
title: '[[pages:users/search]]'
};
render(req, res, userData, next);
@@ -195,7 +198,7 @@ usersController.getMap = function(req, res, next) {
}
});
res.render('usersMap', {rooms: data});
res.render('usersMap', {rooms: data, title: '[[pages:users/map]]'});
});
};