\
- 
\
+ 
\
',
+ xindicator: '
',
event: 'dblclick', //event: 'mouseover'
});
@@ -525,7 +526,7 @@ function initColumns(columnArray) {
function changeThemeTo(theme) {
currentTheme = theme;
- $("link[title=cardsize]").attr("href", "/css/" + theme + ".css");
+ $("link[title=cardsize]").attr("href", "css/" + theme + ".css");
}
@@ -686,7 +687,7 @@ $(function() {
if (boardInitialized === false)
- blockUI('');
+ blockUI('');
//setTimeout($.unblockUI, 2000);
diff --git a/config.js b/config.js
index 4d7100b..3789ec3 100644
--- a/config.js
+++ b/config.js
@@ -6,8 +6,25 @@
};
*/
-exports.database = {
- type: 'redis',
- prefix: '#scrumblr#'
+var argv = require('yargs')
+ .usage('Usage: $0 [--port INTEGER [8080]] [--baseurl STRING ["/"]] [--redis STRING:INT [127.0.0.1:6379]] [--gaEnabled] [--gaAccount STRING [UA-2069672-4]]')
+ .argv;
+
+exports.server = {
+ port: argv.port || 8080,
+ baseurl: argv.baseurl || '/'
+};
+
+exports.googleanalytics = {
+ enabled: argv['gaEnabled'] || false,
+ account: argv['gaAccount'] || "UA-2069672-4"
+};
+
+var redis_conf = argv.redis || '127.0.0.1:6379';
+exports.database = {
+ type: 'redis',
+ prefix: '#scrumblr#',
+ host: redis_conf.split(':')[0] || '127.0.0.1',
+ port: redis_conf.split(':')[1] || 6379
};
diff --git a/lib/data/redis.js b/lib/data/redis.js
index 5cf8f5e..baf451e 100644
--- a/lib/data/redis.js
+++ b/lib/data/redis.js
@@ -1,4 +1,4 @@
-//var conf = require('../../config.js').database;
+var conf = require('../../config.js').database;
var redis = require("redis"),
redisClient = null; //redis.createClient();
@@ -16,7 +16,8 @@ var REDIS_PREFIX = '#scrumblr#';
var db = function(callback) {
- redisClient = redis.createClient();
+ console.log('Opening redis connection to ' + conf.host + ':' + conf.port);
+ redisClient = redis.createClient(conf.port, conf.host, {});
redisClient.on("connect", function (err) {
callback();
});
diff --git a/package.json b/package.json
index 31a3cc1..0cfd57e 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
"redis": "~0.12.1",
"sanitizer": "~0.1.1",
"simplesets": "~1.2.0",
- "socket.io": "1.x"
+ "socket.io": "1.x",
+ "yargs": "~2.3.0"
}
}
diff --git a/server.js b/server.js
index 22c533c..39d7a6f 100644
--- a/server.js
+++ b/server.js
@@ -7,6 +7,8 @@ var async = require('async');
var sanitizer = require('sanitizer');
var compression = require('compression');
var express = require('express');
+var conf = require('./config.js').server;
+var ga = require('./config.js').googleanalytics;
/**************
LOCAL INCLUDES
@@ -24,27 +26,35 @@ var sids_to_user_names = [];
SETUP EXPRESS
**************/
var app = express();
+var router = express.Router();
app.use(compression());
-app.use(express.static(__dirname + '/client'));
+app.use(conf.baseurl, router);
+
+app.locals.ga = ga.enabled;
+app.locals.gaAccount = ga.account;
+
+router.use(express.static(__dirname + '/client'));
var server = require('http').Server(app);
-var port = process.argv[2] || 8080;
-server.listen(port);
+server.listen(conf.port);
-console.log('Server running at http://127.0.0.1:' + port + '/');
+console.log('Server running at http://127.0.0.1:' + conf.port + '/');
/**************
SETUP Socket.IO
**************/
-var io = require('socket.io')(server);
+var io = require('socket.io')(server, {
+ path: conf.baseurl == '/' ? '' : conf.baseurl + "/socket.io"
+});
+
/**************
ROUTES
**************/
-app.get('/', function(req, res) {
+router.get('/', function(req, res) {
//console.log(req.header('host'));
- url = req.header('host');
+ url = req.header('host') + req.baseUrl;
var connected = io.sockets.connected;
clientsCount = Object.keys(connected).length;
@@ -56,14 +66,14 @@ app.get('/', function(req, res) {
});
-app.get('/demo', function(req, res) {
+router.get('/demo', function(req, res) {
res.render('index.jade', {
- pageTitle: 'scrumblr - demo',
- demo: true
+ pageTitle: 'scrumblr - demo',
+ demo: true
});
});
-app.get('/:id', function(req, res){
+router.get('/:id', function(req, res){
res.render('index.jade', {
pageTitle: ('scrumblr - ' + req.params.id)
});
@@ -111,7 +121,6 @@ io.sockets.on('connection', function (client) {
break;
case 'joinRoom':
-
joinRoom(client, message.data, function(clients) {
client.json.send( { action: 'roomAccept', data: '' } );
diff --git a/views/home.jade b/views/home.jade
index c77b8b8..c473a06 100644
--- a/views/home.jade
+++ b/views/home.jade
@@ -2,7 +2,7 @@ doctype html
html(lang="en")
head
-
+
@@ -56,4 +56,5 @@ body
-
+ - if (locals.ga)
+
diff --git a/views/index.jade b/views/index.jade
index b391d69..c796e6c 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -12,15 +12,15 @@ block body
div.board-outline
div#board
div#board-doodles
- image#marker(src='/images/marker.png')
- image#eraser(src='/images/eraser.png')
+ image#marker(src='images/marker.png')
+ image#eraser(src='images/eraser.png')
table#board-table.board-table
tr
td#icon-col(width='1%')
- image#add-col.col-icon(width='20', height='20', src='/images/icons/iconic/raster/black/plus_alt_32x32.png')
- image#delete-col.col-icon(width='20', height='20', src='/images/icons/iconic/raster/black/minus_alt_32x32.png')
+ image#add-col.col-icon(width='20', height='20', src='images/icons/iconic/raster/black/plus_alt_32x32.png')
+ image#delete-col.col-icon(width='20', height='20', src='images/icons/iconic/raster/black/minus_alt_32x32.png')
div.buttons
@@ -65,4 +65,5 @@ block body
// this will be the backlog that only appears on drag or perhaps not at all
-
+ - if (locals.ga)
+
diff --git a/views/layout.jade b/views/layout.jade
index 7ab8ae3..6897ff4 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -5,8 +5,8 @@ html(lang="en")
-
-
+
+
@@ -19,15 +19,15 @@ html(lang="en")
-
-
-
+
+
+
-
+
-
+
title= locals.pageTitle