Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 04:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #3547

Browse Source
This commit is contained in:
barisusakli
2015-09-22 19:22:20 -04:00
parent 87a194a4bd
commit 13508ca7f9
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/app.js
View File

@@ -292,8 +292,8 @@ app.cacheBuster = null;
app.refreshTitle = function(title) { app.refreshTitle = function(title) {
require(['translator'], function(translator) { require(['translator'], function(translator) {
title = config.titleLayout.replace(/{/g, '{').replace(/}/g, '}').replace('{pageTitle}', title).replace('{browserTitle}', config.browserTitle);
translator.translate(title, function(translated) { translator.translate(title, function(translated) {
translated = translated ? (translated + ' | ' + config.browserTitle) : config.browserTitle;
titleObj.titles[0] = translated; titleObj.titles[0] = translated;
app.alternatingTitle(''); app.alternatingTitle('');
}); });

1
src/controllers/api.js
View File

@@ -34,6 +34,7 @@ apiController.getConfig = function(req, res, next) {
config.version = nconf.get('version'); config.version = nconf.get('version');
config.siteTitle = validator.escape(meta.config.title || meta.config.browserTitle || 'NodeBB'); config.siteTitle = validator.escape(meta.config.title || meta.config.browserTitle || 'NodeBB');
config.browserTitle = validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB'); config.browserTitle = validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB');
config.titleLayout = (meta.config.titleLayout || '{pageTitle} || {browserTitle}').replace(/{/g, '{').replace(/}/g, '}');
config.showSiteTitle = parseInt(meta.config.showSiteTitle, 10) === 1; config.showSiteTitle = parseInt(meta.config.showSiteTitle, 10) === 1;
config.postDelay = meta.config.postDelay; config.postDelay = meta.config.postDelay;
config.minimumTitleLength = meta.config.minimumTitleLength; config.minimumTitleLength = meta.config.minimumTitleLength;

15
src/middleware/middleware.js
View File

@@ -237,9 +237,7 @@ middleware.renderHeader = function(req, res, data, callback) {
} }
}, },
title: function(next) { title: function(next) {
var title = validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB'); next(null, buildTitle(data.title));
title = data.title ? (data.title + ' | ' + title) : title;
next(null, title);
}, },
isAdmin: function(next) { isAdmin: function(next) {
user.isAdministrator(req.uid, next); user.isAdministrator(req.uid, next);
@@ -456,8 +454,17 @@ function redirectToLogin(req, res) {
return controllers.helpers.redirect(res, '/login'); return controllers.helpers.redirect(res, '/login');
} }
function buildTitle(pageTitle) {
var titleLayout = meta.config.titleLayout || '{pageTitle} | {browserTitle}';
var browserTitle = validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB');
pageTitle = pageTitle || '';
var title = titleLayout.replace('{pageTitle}', pageTitle).replace('{browserTitle}', browserTitle);
return title;
}
function modifyTitle(obj) { function modifyTitle(obj) {
var title = '[[pages:home]] | ' + validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB'); var title = buildTitle('[[pages:home]]');
obj.browserTitle = title; obj.browserTitle = title;
if (obj.metaTags) { if (obj.metaTags) {

6
src/views/admin/settings/general.tpl
View File

@@ -22,6 +22,12 @@
If no browser title is specified, the site title will be used If no browser title is specified, the site title will be used
</p> </p>
<label>Title Layout</label>
<input class="form-control" type="text" placeholder="Title Layout" data-field="titleLayout" />
<p class="help-block">
Define how the browser title will be structured ie. &#123;pageTitle&#125; | &#123;browserTitle&#125;
</p>
<label>Site Description</label> <label>Site Description</label>
<input type="text" class="form-control" placeholder="A short description about your community" data-field="description" /><br /> <input type="text" class="form-control" placeholder="A short description about your community" data-field="description" /><br />