From 4a0717d5f8aa0ff3378ff589b106cd35c0586367 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 29 Sep 2014 19:31:25 -0400
Subject: outline walls on builder

---
 public/assets/javascripts/ui/builder/BuilderInfo.js     | 1 +
 public/assets/javascripts/ui/builder/BuilderSettings.js | 7 ++++++-
 public/assets/javascripts/ui/builder/BuilderView.js     | 5 +++++
 public/assets/javascripts/ui/site/LayoutsModal.js       | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'public/assets/javascripts/ui')

diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 2fffdba..e6b7e97 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -55,6 +55,7 @@ var BuilderInfo = View.extend({
 		this.$height.unitVal( room.height )
 		this.$x.unitVal( room.rect.x.a )
 		this.$y.unitVal( room.rect.y.a )
+	  this.show()
 	},
 
 	destroy: function(room){
diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index 796c398..94eed29 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -9,7 +9,7 @@ var BuilderSettings = FormView.extend({
 	events: {
 		"keydown": 'stopPropagation',
 		"keydown [name=name]": 'enterSubmit',
-		"click [data-role='save-layout']": 'save',
+		"click [data-role='save-layout']": 'clickSave',
 		"click [data-role='clone-layout']": 'clone',
 		"click [data-role='clear-layout']": 'clear',
 		"click [data-role='destroy-layout']": 'destroy',
@@ -118,6 +118,11 @@ var BuilderSettings = FormView.extend({
 		fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) )
 		return fd
 	},
+
+	clickSave: function(){
+    this.toggle(false)
+    this.save()
+	},
 	
 	success: function(data){
 		this.$id.val(data._id)
diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js
index a89111f..81dce52 100644
--- a/public/assets/javascripts/ui/builder/BuilderView.js
+++ b/public/assets/javascripts/ui/builder/BuilderView.js
@@ -12,6 +12,11 @@ var BuilderView = View.extend({
 		this.toolbar = new BuilderToolbar ({ parent: this })
 		this.settings = new BuilderSettings ({ parent: this })
 		this.lightControl = new LightControl ({ parent: this })
+
+		app.on("rooms-built", function(){
+		  Walls.paint()
+		})
+
 	},
 
 	load: function(name){
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 1bfc6cb..2449465 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -29,6 +29,7 @@ var LayoutsIndex = View.extend({
 			
 			this.$templates.append($span)
 		}.bind(this))
+		console.log(this.$templates.html())
 		this.show()
 	}
 
-- 
cgit v1.2.3-70-g09d2


From e4fe87c0a5c3e441b533cdb4e0e85b683e244d3b Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Tue, 30 Sep 2014 02:42:42 -0400
Subject: untitled room

---
 public/assets/javascripts/ui/editor/EditorSettings.js | 2 +-
 server/lib/middleware.js                              | 2 +-
 views/staff/_projects.ejs                             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'public/assets/javascripts/ui')

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 92eff2b..8a88f7a 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -53,7 +53,7 @@ var EditorSettings = FormView.extend({
     }
 
 		if (data.isNew) {
-		  this.$name.val( "Room " + moment().format("DD/MM/YYYY ha") )
+		  this.$name.val( "Untitled Room" )
 		}
 		else {
 			this.thumbnailIsStale()
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index b3c9bec..0bf16ce 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -59,7 +59,7 @@ var middleware = {
 				}
 				next()
 			})
-		}
+		}	
 		else {
 			req.project = null
 			next()
diff --git a/views/staff/_projects.ejs b/views/staff/_projects.ejs
index 9e37a6c..0fdfcf5 100644
--- a/views/staff/_projects.ejs
+++ b/views/staff/_projects.ejs
@@ -8,11 +8,11 @@
       <a href="/project/[[- project.slug ]]">[view]</a>
       <a href="/project/[[- project.slug ]]/edit">[edit]</a>
     </td>
-    [[ if (project.user) { ]]
     <td>
+    [[ if (project.user) { ]]
       <a href="/staff/users/[[- project.user.username ]]">[[- project.user.username ]]</a>
-    </td>
     [[ } ]]
+    </td>
     <td>
       [[- project.date ]]
     </td>
-- 
cgit v1.2.3-70-g09d2