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

fixed #912, added new page string for popular topics

Browse Source
This commit is contained in:
Julian Lam
2014-02-19 14:33:34 -05:00
parent b5496b5680
commit 031e8128c7
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/webserver.js
View File

@@ -132,16 +132,6 @@ module.exports.server = server;
href: nconf.get('relative_path') + '/favicon.ico'
});
// Browser Title
var metaTitle = templateValues.metaTags.filter(function(tag) {
return tag.property === 'og:title';
});
if (metaTitle.length > 0 && metaTitle[0].content) {
templateValues.browserTitle = metaTitle[0].content;
} else {
templateValues.browserTitle = meta.config.browserTitle || 'NodeBB';
}
if(options.req.user && options.req.user.uid) {
uid = options.req.user.uid;
}
@@ -153,15 +143,34 @@ module.exports.server = server;
templateValues.customCSS = meta.config.customCSS;
}
user.isAdministrator(uid, function(err, isAdmin) {
templateValues.isAdmin = isAdmin;
async.parallel([
function(next) {
translator.get('pages:' + path.basename(options.req.url), function(translated) {
var metaTitle = templateValues.metaTags.filter(function(tag) {
return tag.name === 'title';
});
if (translated) {
templateValues.browserTitle = translated;
} else if (metaTitle.length > 0 && metaTitle[0].content) {
templateValues.browserTitle = metaTitle[0].content;
} else {
templateValues.browserTitle = meta.config.browserTitle || 'NodeBB';
}
next();
});
},
function(next) {
user.isAdministrator(uid, function(err, isAdmin) {
templateValues.isAdmin = isAdmin || false;
next();
});
}
], function() {
translator.translate(templates.header.parse(templateValues), function(template) {
callback(null, template);
});
});
});
};