themes - added ability to route custom templates

v1.18.x
psychobunny 11 years ago
parent e0e32efd26
commit 842cd17979

@ -120,9 +120,8 @@ var utils = require('./../public/src/utils.js'),
});
},
function(config, next) {
if (config.staticDir) {
themeData['theme:staticDir'] = config.staticDir;
}
themeData['theme:staticDir'] = config.staticDir ? config.staticDir : false;
themeData['theme:templates'] = config.templates ? config.templates : false;
RDB.hmset('config', themeData, next);
}

@ -165,7 +165,7 @@ var express = require('express'),
},
function(next) {
// Theme configuration
RDB.hmget('config', 'theme:type', 'theme:id', 'theme:staticDir', function(err, themeData) {
RDB.hmget('config', 'theme:type', 'theme:id', 'theme:staticDir', 'theme:templates', function(err, themeData) {
var themeId = (themeData[1] || 'nodebb-theme-vanilla');
// Detect if a theme has been selected, and handle appropriately
@ -183,6 +183,13 @@ var express = require('express'),
}
}
if (themeData[3]) {
app.use('/templates', express.static(path.join(__dirname, '../node_modules', themeData[1], themeData[3])));
if (process.env.NODE_ENV === 'development') {
winston.info('Custom templates directory routed for theme: ' + themeData[1]);
}
}
app.use(require('less-middleware')({
src: path.join(__dirname, '../node_modules/' + themeId),
dest: path.join(__dirname, '../public/css'),

Loading…
Cancel
Save