Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -2,4 +2,5 @@
 rsync.sh
 *.swp
 *.log
-.monitor
+.monitor
+node_modules/

README.markdown

@@ -40,22 +40,14 @@ how to install and run on your own computer (linux/osx)
 -------------------------------------------------------
 
 - install redis v2.2.2
-- install node.js >= 0.4.1
-- install npm
-- install these npm packages:
-	- async
-	- express
-	- jade
-	- redis-client
-	- redis
-	- sanitizer
-	- socket.io
-	- simplesets
-	- connect-redis
-	- (and perhaps more which you will notice when you try to start it)
-- now start redis ($ redis-server)
-- now start ($ node server.js 80) where "80" is the port you want it to run on. 
-
+- install node.js >= 0.4.7
+- install npm 
+- cd to the scrumblr directory; you should see server.js and config.js and other files.
+- run `npm install`
+- If you get errors about express, you may need to change in package.json to have "express":  ">=2.4.x", 
+- run redis `redis-server`
+- run scrumblr `node server.js 80` where "80" is the port you have opened in your firewall and want scrumblr to run on. 
+- open a browser to `http://localhost:80` where "80" is the port you chose in the previous step.
 license
 -------
 

client/css/smallcards.css

@@ -46,16 +46,39 @@
 	display: block;
 	width: 79px; 
 	height: 45px;
-	margin: 3px 10px 0px 19px;
+	margin: 1px 10px 0px 19px;
 
 	font-family: "Arial Rounded MT Bold" , arial, serif;
 	font-size: 10px;
-	letter-spacing: 0px;	
+	letter-spacing: 0px;
+	line-height: 9px;	
 
 	xtext-shadow: 0px 0px 1px #444;
 
 	opacity: 1;
 
+	color: #333;
+	text-align: center;
+	padding-top: 8px;
+}
+
+
+.xcontent { 
+	overflow: hidden;
+	display: block;
+	width: 79px; 
+	height: 45px;
+	margin: 0px 10px 0px 19px;
+
+	font-family: "Arial Rounded MT Bold", "Arial" , arial, serif;
+	xfont-size: 10px;
+	letter-spacing: 0px;
+	line-height: 8px;	
+
+	xtext-shadow: 0px 0px 1px #444;
+
+	opacity: 1;
+
 	color: #333;
 	text-align: center;
 	padding-top: 8px;

client/css/style.css

@@ -12,6 +12,17 @@ body {
 
 	xheight: 1400px;
 	xwidth: 2000px;
+
+
+
+	user-select: none;
+	-o-user-select:none;
+	-moz-user-select: none;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+
+	background-image: url('/css/bg/concrete_wall_2_2.png');
+
 }
 
 #board {
@@ -46,8 +57,8 @@ body {
 	xmargin-left: auto;
 	xmargin-right: auto;
 
-	-webkit-box-shadow: 1px 1px 2px #aaa;
-	-moz-box-shadow: 1px 1px 2px #aaa;
+	-webkit-box-shadow: 1px 3px 2px #aaa;
+	-moz-box-shadow: 1px 3px 2px #999;
 
 	x-webkit-transform:rotate(0.3deg); /*"is that a little off-level? i feel like it is off-level"*/
 }
@@ -57,8 +68,8 @@ body {
 	height: 100%;
 	position: absolute;
 	display: inline;
-	opacity: .08;
-	background-image: url('nexum_whiteboard.jpg');
+	opacity: 0.035;
+	background-image: url('scribbles2.png');
 }
 
 
@@ -81,7 +92,7 @@ width: 16px; height: 16px;
 }
 
 .card-edit-form, .card-edit-form input, .card-edit-form textarea {
-	border:none;
+	border: none;
 	font-size:inherit;
 	font-weight:inherit;
 	background-color:inherit;
@@ -95,6 +106,8 @@ width: 16px; height: 16px;
 	overflow: hidden;
 	resize: none;
 	width: 100%;
+	color: #330066;
+	color: #666;
 
 }
 
@@ -466,6 +479,17 @@ input:hover {
 	color: #333;
 }
 
+#marker {
+	position: absolute; bottom: 0; right: 200px;
+	z-index: 1;
+}
+
+#eraser {
+	position: absolute; bottom: 0; right: 70px;
+	z-index: 1;
+}
+
+
 
 
 

client/lib/jquery-ui/development-bundle/ui/jquery-ui-1.8.9.custom.js

@@ -656,7 +656,8 @@ $.widget("ui.mouse", {
 			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
 			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
 
-		event.preventDefault();
+		//ali: fixing this http://bugs.jqueryui.com/ticket/4261
+		//event.preventDefault();
 		event.originalEvent.mouseHandled = true;
 		return true;
 	},

client/lib/jquery-ui/development-bundle/ui/jquery.ui.mouse.js

@@ -86,7 +86,7 @@ $.widget("ui.mouse", {
 			.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
 			.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
 
-		event.preventDefault();
+		//event.preventDefault();
 		event.originalEvent.mouseHandled = true;
 		return true;
 	},

client/lib/jquery.jeditable.js

@@ -285,16 +285,16 @@
                 } else if ('submit' == settings.onblur) {
                     input.blur(function(e) {
                         /* prevent double submit if submit was clicked */
-                        //t = setTimeout(function() {
+                        t = setTimeout(function() {
                             form.submit();
-                        //}, 200);
+                        }, 200);
                     });
 						//ali here: i hacked this in so that submit happens on mouseout too
-						input.mouseout(function(e) {
+						input.blur(function(e) {
                         /* prevent double submit if submit was clicked */
-                        //t = setTimeout(function() {
+                        t = setTimeout(function() {
                             form.submit();
-                        //}, 200);
+                        }, 200);
                     });
                 } else if ($.isFunction(settings.onblur)) {
                     input.blur(function(e) {