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

changed base templates path to Persona, from Vanilla.

Browse Source 
This breaks all themes relying on templates from Vanilla!! See: https://community.nodebb.org/topic/6098/on-changing-the-default-theme-to-persona
This commit is contained in:
Julian Lam
2015-07-22 11:30:04 -04:00
parent c38cab3b74
commit fe7f5402a8
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app.js
View File

@@ -95,7 +95,7 @@ function loadConfig() {
// Ensure themes_path is a full filepath // Ensure themes_path is a full filepath
nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path'))); nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
nconf.set('core_templates_path', path.join(__dirname, 'src/views')); nconf.set('core_templates_path', path.join(__dirname, 'src/views'));
nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates')); nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-persona/templates'));
if (!process.send) { if (!process.send) {
// If run using `node app`, log GNU copyright info along with server info // If run using `node app`, log GNU copyright info along with server info

2
src/meta/css.js
View File

@@ -34,7 +34,7 @@ module.exports = function(Meta) {
return callback(err); return callback(err);
} }
var themeId = (themeData['theme:id'] || 'nodebb-theme-vanilla'), var themeId = (themeData['theme:id'] || 'nodebb-theme-persona'),
baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-vanilla')), baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-vanilla')),
paths = [ paths = [
baseThemePath, baseThemePath,

2
src/meta/themes.js
View File

@@ -119,7 +119,7 @@ module.exports = function(Meta) {
return callback(err); return callback(err);
} }
var themeId = data.currentThemeId || 'nodebb-theme-vanilla'; var themeId = data.currentThemeId || 'nodebb-theme-persona';
var themeObj = data.themesData.filter(function(themeObj) { var themeObj = data.themesData.filter(function(themeObj) {
return themeObj.id === themeId; return themeObj.id === themeId;

12
src/webserver.js
View File

@@ -89,6 +89,12 @@ function initializeNodeBB(callback) {
function(next) { function(next) {
plugins.init(app, middleware, next); plugins.init(app, middleware, next);
}, },
function(next) {
plugins.fireHook('static:app.preload', {
app: app,
middleware: middleware
}, next);
},
function(next) { function(next) {
async.parallel([ async.parallel([
async.apply(meta.templates.compile), async.apply(meta.templates.compile),
@@ -98,12 +104,6 @@ function initializeNodeBB(callback) {
], next); ], next);
}, },
function(results, next) { function(results, next) {
plugins.fireHook('static:app.preload', {
app: app,
middleware: middleware
}, next);
},
function(next) {
routes(app, middleware); routes(app, middleware);
next(); next();
} }