From d6333a3969ef42e107e95cabc61d8b40e5d3843c Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli <barisusakli@gmail.com> Date: Mon, 6 Jan 2014 23:44:32 -0500 Subject: [PATCH] fixed plugin css files for relative path --- src/plugins.js | 1 + src/routes/plugins.js | 5 ++++- src/webserver.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins.js b/src/plugins.js index e2dbfb5ea1..375616c414 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -2,6 +2,7 @@ var fs = require('fs'), path = require('path'), async = require('async'), winston = require('winston'), + nconf = require('nconf'), eventEmitter = require('events').EventEmitter, db = require('./database'); diff --git a/src/routes/plugins.js b/src/routes/plugins.js index 517b86db01..f767107a5c 100644 --- a/src/routes/plugins.js +++ b/src/routes/plugins.js @@ -26,9 +26,12 @@ var nconf = require('nconf'), // Static Assets app.get('/plugins/:id/*', function(req, res) { - var relPath = req._parsedUrl.pathname.replace('/plugins/' + req.params.id, ''); + + var relPath = req._parsedUrl.pathname.replace(nconf.get('relative_path') + '/plugins/' + req.params.id, ''); + if (plugins.staticDirs[req.params.id]) { var fullPath = path.join(plugins.staticDirs[req.params.id], relPath); + fs.exists(fullPath, function(exists) { if (exists) { res.sendfile(fullPath, { diff --git a/src/webserver.js b/src/webserver.js index f9761a2e40..b1691714ba 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -94,7 +94,7 @@ if(nconf.get('ssl')) { }], templateValues = { cssSrc: meta.config['theme:src'] || nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css', - pluginCSS: plugins.cssFiles.map(function(file) { return { path: file + (meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : '') }; }), + pluginCSS: plugins.cssFiles.map(function(file) { return { path: '/nodebb'+file + (meta.config['cache-buster'] ? '?v=' + meta.config['cache-buster'] : '') }; }), title: meta.config.title || '', description: meta.config.description || '', 'brand:logo': meta.config['brand:logo'] || '',