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

special theme.set socket call + static dir support, closes #427, tweaked languages 404 to work with subdirs

Browse Source
This commit is contained in:
Julian Lam
2013-10-21 12:07:37 -04:00
parent 44d2297546
commit 65a8de7845
4 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/webserver.js
View File

@@ -145,14 +145,25 @@ var express = require('express'),
});
},
function(next) {
RDB.hmget('config', 'theme:type', 'theme:id', function(err, themeData) {
// Theme configuration
RDB.hmget('config', 'theme:type', 'theme:id', 'theme:staticDir', function(err, themeData) {
var themeId = (themeData[1] || 'nodebb-theme-vanilla');
// Detect if a theme has been selected, and handle appropriately
if (!themeData[0] || themeData[0] === 'local') {
// Local theme
if (process.env.NODE_ENV === 'development') {
winston.info('[themes] Using theme ' + themeId);
}
// Theme's static directory
if (themeData[2]) {
app.use('/css/assets', express.static(path.join(__dirname, '../node_modules', themeData[1], themeData[2])));
if (process.env.NODE_ENV === 'development') {
winston.info('Static directory routed for theme: ' + themeData[1]);
}
}
app.use(require('less-middleware')({
src: path.join(__dirname, '../node_modules/' + themeId),
dest: path.join(__dirname, '../public/css'),
@@ -189,7 +200,7 @@ var express = require('express'),
// 404 catch-all
app.use(function (req, res, next) {
var isLanguage = /^\/language\/[\w]{2,}\/[\w]+\.json/,
var isLanguage = /^\/language\/[\w]{2,}\/.*\.json/,
isClientScript = /^\/src\/forum\/[\w]+\.js/;
res.status(404);