Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-23 00:40:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into notifications

Browse Source
This commit is contained in:
Julian Lam
2013-05-23 13:13:35 -04:00
parent ffbafc99c4 f4218264e2
commit 78713f0599
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/app.js
View File

@@ -41,7 +41,7 @@ var socket,
app.alert({ app.alert({
alert_id: 'connection_alert', alert_id: 'connection_alert',
title: 'Connected', title: 'Connected',
message: 'Connection successfull', message: 'Connection successful',
type: 'success', type: 'success',
timeout: 5000 timeout: 5000
}); });

2
src/webserver.js
View File

@@ -116,7 +116,7 @@ var express = require('express'),
case 'home' : case 'home' :
categories.getAllCategories(function(data) { categories.getAllCategories(function(data) {
data.motd_class = (config.show_motd || config.show_motd === undefined) ? '' : 'none'; 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<a target=\"_blank\" href=\"http://www.nodebb.org\" class=\"btn btn-large\"><i class=\"icon-comment\"></i> Get NodeBB</a> <a target=\"_blank\" href=\"https://github.com/psychobunny/NodeBB\" class=\"btn btn-large\"><i class=\"icon-github-alt\"></i> Fork us on Github</a> <a target=\"_blank\" href=\"https://twitter.com/dcplabs\" class=\"btn btn-large\"><i class=\"icon-twitter\"></i> @dcplabs</a>"); data.motd = marked(config.motd || "# NodeBB v0.1\nWelcome to NodeBB, the discussion platform of the future.\n\n<a target=\"_blank\" href=\"http://www.nodebb.org\" class=\"btn btn-large\"><i class=\"icon-comment\"></i> Get NodeBB</a> <a target=\"_blank\" href=\"https://github.com/designcreateplay/NodeBB\" class=\"btn btn-large\"><i class=\"icon-github-alt\"></i> Fork us on Github</a> <a target=\"_blank\" href=\"https://twitter.com/dcplabs\" class=\"btn btn-large\"><i class=\"icon-twitter\"></i> @dcplabs</a>");
res.send(JSON.stringify(data)); res.send(JSON.stringify(data));
}, (req.user) ? req.user.uid : 0); }, (req.user) ? req.user.uid : 0);
break; break;