From aa1994be671fc4141ed51f6dd742aff9231f10e7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 7 Nov 2013 15:52:17 -0500 Subject: [PATCH] updated MOTD to not be inside a jumbotron, updated default styling of MOTD --- public/templates/home.tpl | 2 +- src/routes/api.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/public/templates/home.tpl b/public/templates/home.tpl index 48032a83b3..cc8c5073fa 100644 --- a/public/templates/home.tpl +++ b/public/templates/home.tpl @@ -1,4 +1,4 @@ -
+
{motd}
diff --git a/src/routes/api.js b/src/routes/api.js index b3c9afde81..f52b43d273 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -51,8 +51,10 @@ var user = require('./../user.js'), } async.each(data.categories, iterator, function (err) { - data.motd_class = (meta.config.show_motd === '1' || meta.config.show_motd === undefined) ? '' : 'none'; - data.motd = require('marked')(meta.config.motd || "# NodeBB v " + pkg.version + "\nWelcome to NodeBB, the discussion platform of the future.\n\n
 Get NodeBB  Fork us on Github  @dcplabs
"); + data.motd_class = (meta.config.show_motd === '1' || meta.config.show_motd === undefined) ? '' : ' none'; + data.motd_class += (meta.config.motd.length > 0 ? '' : ' default'); + + data.motd = require('marked')(meta.config.motd || "
 Get NodeBB  Fork us on Github  @dcplabs
\n\n# NodeBB v" + pkg.version + "\nWelcome to NodeBB, the discussion platform of the future."); res.json(data); });