diff --git a/config.default.js b/config.default.js index e7a662b76b..7228221310 100644 --- a/config.default.js +++ b/config.default.js @@ -1,3 +1,12 @@ +/** + * READ ME! + * The config directives here are all different based on where NodeBB is installed. + * This config file system will be deprecated soon, and all configs will be moved + * to the redis db, under the hash "config" + * + * As of May 22nd, 2013, this migration hasn't started yet + */ + var config = { // The "secret" is used to encrypt cookie sessions, change this to any random string "secret": 'nodebb-secret', @@ -47,7 +56,10 @@ var config = { "privilege_thresholds": { "manage_thread": 1000, "manage_content": 2000 - } + }, + + "show_motd": true, + "motd": undefined } config.url = config.base_url + (config.use_port ? ':' + config.port : '') + '/'; diff --git a/public/src/templates.js b/public/src/templates.js index 9c88fc271f..34b8784be6 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -2,8 +2,7 @@ (function (module) { - var ready_callback, - config = {}, + var config = {}, templates, fs = null, available_templates = []; @@ -35,8 +34,19 @@ }; templates.ready = function(callback) { - if (callback == null && ready_callback) ready_callback(); - else ready_callback = callback; + if (callback == null) { + if (this.ready_callback) { + this.ready_callback(); + } else { + this.loaded = true; + } + } else { + if (this.loaded == true) { + callback(); + } else { + this.ready_callback = callback; + } + } }; templates.prepare = function(raw_tpl, data) { diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 05d604b7d5..e5518d3dbb 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -1,8 +1,10 @@ - + NodeBB + + diff --git a/public/templates/home.tpl b/public/templates/home.tpl index 736b993be5..880b244505 100644 --- a/public/templates/home.tpl +++ b/public/templates/home.tpl @@ -1,11 +1,5 @@ -
-

NodeBB

-

Welcome to NodeBB, the discussion platform of the future.

-

- Get NodeBB - Fork us on Github - @dcplabs -

+
+ {motd}
diff --git a/src/webserver.js b/src/webserver.js index 9f6c500a32..47901413fc 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -6,9 +6,9 @@ var express = require('express'), config = require('../config.js'), redis = require('redis'), redisServer = redis.createClient(config.redis.port, config.redis.host, config.redis.options), + marked = require('marked'), user = require('./user.js'), - categories = require('./categories.js'), posts = require('./posts.js'), topics = require('./topics.js'), @@ -18,7 +18,6 @@ var express = require('express'), userRoute = require('./routes/user.js'), auth = require('./routes/authentication.js'); - (function(app) { var templates = null; @@ -115,6 +114,8 @@ var express = require('express'), break; case 'home' : categories.getAllCategories(function(data) { + data.motd_class = (config.show_motd || config.show_motd === undefined) ? '' : 'none'; + data.motd = marked(config.motd || "# NodeBB v0.1\nWelcome to NodeBB, the discussion platform of the future.\n\n Get NodeBB Fork us on Github @dcplabs"); res.send(JSON.stringify(data)); }, (req.user) ? req.user.uid : 0); break; @@ -191,6 +192,7 @@ var express = require('express'), break; case 'popular' : categories.get(function(data) { + console.log(data); if(!data) { res.send(false); return; @@ -239,7 +241,7 @@ var express = require('express'), app.get('/test', function(req, res) { categories.get(function(category) { res.send(JSON.stringify(category, null, 4)); - }, 2, 2, null, null); + }, null, 2, null, null); });