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

fixed #907

Browse Source
This commit is contained in:
Julian Lam
2014-05-01 15:06:20 -04:00
parent 3e296a42f7
commit 970b259e06
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/middleware/index.js
View File

@@ -45,21 +45,31 @@ function routeThemeScreenshots(app, themes) {
});
}
function routeCurrentTheme(app, themeData) {
var themeId = (themeData['theme:id'] || 'nodebb-theme-vanilla');
function routeCurrentTheme(app, themeId, themesData) {
var themeId = (themeId || 'nodebb-theme-vanilla'),
themeObj = (function(id) {
return themesData.filter(function(themeObj) {
return themeObj.id === id;
})[0];
})(themeId);
// Detect if a theme has been selected, and handle appropriately
if (process.env.NODE_ENV === 'development') {
winston.info('[themes] Using theme ' + themeId);
}
// Theme's static directory
if (themeData['theme:staticDir']) {
app.use(relativePath + '/css/assets', express.static(path.join(themesPath, themeData['theme:id'], themeData['theme:staticDir']), {
// Theme's templates path
nconf.set('theme_templates_path', themeObj.templates ? path.join(themesPath, themeObj.id, themeObj.templates) : nconf.get('base_templates_path'));
themeTemplatesPath = nconf.get('theme_templates_path');
// Theme's static directory (to be deprecated for 0.5.0)
if (themeObj.staticDir) {
app.use(relativePath + '/css/assets', express.static(path.join(themesPath, themeObj.id, themeObj.staticDir), {
maxAge: app.enabled('cache') ? 5184000000 : 0
}));
if (process.env.NODE_ENV === 'development') {
winston.info('Static directory routed for theme: ' + themeData['theme:id']);
winston.info('Static directory routed for theme: ' + themeObj.id);
}
}
}
@@ -173,7 +183,6 @@ module.exports = function(app, data) {
viewsPath = nconf.get('views_dir');
themesPath = nconf.get('themes_path');
baseTemplatesPath = nconf.get('base_templates_path');
themeTemplatesPath = nconf.get('theme_templates_path');
app.configure(function() {
app.engine('tpl', templates.__express);
@@ -210,7 +219,7 @@ module.exports = function(app, data) {
auth.initialize(app);
routeCurrentTheme(app, data.currentThemeData);
routeCurrentTheme(app, data.currentThemeId, data.themesData);
routeThemeScreenshots(app, data.themesData);
plugins.getTemplates(function(err, pluginTemplates) {