From c32a6ff52628fbe0a530b4f72fc907a2ef651127 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 30 Sep 2014 13:18:45 -0400
Subject: fixing points not moving bug

---
 public/assets/javascripts/ui/site/LayoutsModal.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 2449465..1bfc6cb 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -29,7 +29,6 @@ var LayoutsIndex = View.extend({
 			
 			this.$templates.append($span)
 		}.bind(this))
-		console.log(this.$templates.html())
 		this.show()
 	}
 
-- 
cgit v1.2.3-70-g09d2


From 82343a901aa641569ecf03e55d4560f691bea9ba Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 15:34:10 -0400
Subject: better markup on layouts modal

---
 public/assets/javascripts/ui/site/LayoutsModal.js | 12 ++++++---
 public/assets/stylesheets/app.css                 | 30 ++++++++++++-----------
 2 files changed, 25 insertions(+), 17 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 1bfc6cb..8eaf081 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -22,10 +22,16 @@ var LayoutsIndex = View.extend({
 		this.$templates.empty()
 		data.forEach(function(room){
 			var $span = $("<span>")
-			// $span.html(JSON.stringify(room))
 			$span.data("slug", room.slug)
-			$span.css("background-image", "url(" + room.photo + ")")
-			$span.attr("data-name", room.name)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
 			
 			this.$templates.append($span)
 		}.bind(this))
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 93645e1..b91c02d 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -647,36 +647,38 @@ iframe.embed {
 }
 
 .templates span {
+  display: block;
+  float: left;
+  background: white;
+  margin: 2vw;
+  padding: 2vw;
+  cursor:pointer;
+}
+.templates span .image {
   background-position: center;
   background-size: contain;
   background-repeat: no-repeat;
   background-color: #fff;
   width: 20vw;
-  height: 20vw;
-  display: inline-block;
-  margin: 4vw;
+  height: 15vw;
+  display: block;
   background-color: #ddd;
-  position: relative;
 }
 
-.templates span:after {
-	content: attr(data-name);
-	position: absolute;
-	top: 100%;
+.templates span label {
 	width: 100%;
 	left: 0;
-	background: #fff;
-	padding: 5px;
+  display: block;
 	font-weight: 300;
 }
 
-.templates span:hover {
+.templates span:hover,
+.templates span:hover .image {
   background-color: #f00;
   cursor:pointer;
 }
-
-.templates span:hover:after {
-  color: #f00;
+.templates span:hover label {
+  color: white;
 }
 
 .templates h1 {
-- 
cgit v1.2.3-70-g09d2


From 084769b40b5ab5dc8fa2f2dfa82d1ebc4ff41795 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 16:11:19 -0400
Subject: don't remove h1

---
 public/assets/javascripts/ui/site/LayoutsModal.js |  2 +-
 public/assets/stylesheets/app.css                 | 14 ++++++--------
 views/projects/list-projects.ejs                  |  8 ++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 8eaf081..ef6a36c 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -19,7 +19,7 @@ var LayoutsIndex = View.extend({
 			this.$form.hide()
 			this.$noTemplates.show()
 		}
-		this.$templates.empty()
+		this.$templates.children("span").remove()
 		data.forEach(function(room){
 			var $span = $("<span>")
 			$span.data("slug", room.slug)
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index f320db7..a8f8e51 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -361,29 +361,28 @@ iframe.embed {
   text-align: center;
   overflow: hidden;
   background-size: cover;
-  background-repeat: no-repeat;
 }
 .room .images {
   position: absolute;
   top: 0; left: 0;
-  z-index: -1;
+  z-index: 2;
   width: 100%;
   height: 100%;
   text-align: center;
   overflow: hidden;
 }
 .room .images img {
-  width: 50%;
+  width: 30%;
   position: absolute;
 }
 
 .room .images[data-mediacount='1'] img:nth-child(1) { left: 20%; top: 20%; }
 
-.room .images[data-mediacount='2'] img:nth-child(1) { left: 51%; bottom: 0%; width: auto; height: 100%; }
-.room .images[data-mediacount='2'] img:nth-child(2) { right: 51%; bottom: 0%; width: auto; height: 100%; }
+.room .images[data-mediacount='2'] img:nth-child(1) { left: 51%; bottom: 0%; width: auto; height: 30%; }
+.room .images[data-mediacount='2'] img:nth-child(2) { right: 51%; bottom: 0%; width: auto; height: 30%; }
 
 .room .images[data-mediacount='3'] img:nth-child(1) { right: 51%; bottom: 41%; }
-.room .images[data-mediacount='3'] img:nth-child(2) { left: 51%; bottom: 0%; width:auto; height:100%;}
+.room .images[data-mediacount='3'] img:nth-child(2) { left: 51%; bottom: 0%; width:auto; height:30%;}
 .room .images[data-mediacount='3'] img:nth-child(3) { right: 51%; top: 61%; }
 
 .room .images[data-mediacount='4'] img:nth-child(1) { right: 51%; bottom: 41%; }
@@ -702,8 +701,7 @@ border-left: 1px solid black;
 }
 .templates span .image {
   background-position: center;
-  background-size: contain;
-  background-repeat: no-repeat;
+  background-size: cover;
   background-color: #fff;
   width: 20vw;
   height: 15vw;
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index f469f5c..45b73e2 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -11,16 +11,16 @@
       [[ } ]]
 
 			<span class="room" style="background-color: rgb([[- project.color ]]);">
-        <span class="images" data-mediaCount="[[- Math.min(project.media.length, 1) ]]">
+        <span class="mask" style="background-image: url([[- project.photo ]]);">
+        </span>
+        <span class="images" data-mediaCount="[[- Math.min(project.media.length, 3) ]]">
           [[ mediaCount = 0 ]]
           [[ project.media.some(function(media){ ]]
             [[ if (media.media.type != "image") { return false } ]]
-            [[ if (++mediaCount > 1) { return true } ]]
+            [[ if (++mediaCount > 3) { return true } ]]
             <img src="[[- media.media.url ]]">
           [[ }) ]]
 			  </span>
-        <span class="mask" style="background-image: url([[- project.photo ]]);">
-        </span>
 			</span>
 
       <label>
-- 
cgit v1.2.3-70-g09d2


From 2b658ce6a00dc4f20ea77a50b8cca61f56629a71 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 16:14:24 -0400
Subject: templates-list

---
 public/assets/javascripts/ui/site/LayoutsModal.js | 3 ++-
 public/assets/stylesheets/app.css                 | 8 ++++----
 views/projects/layouts-modal.ejs                  | 6 ++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index ef6a36c..24b65e3 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -3,6 +3,7 @@ var LayoutsIndex = View.extend({
 
 	initialize: function(){
 		this.$templates = this.$(".templates")
+		this.$templatesList = this.$(".templates-list")
 		this.$noTemplates = this.$(".no-templates")
 		this.$form = this.$("form")
 	},
@@ -19,7 +20,7 @@ var LayoutsIndex = View.extend({
 			this.$form.hide()
 			this.$noTemplates.show()
 		}
-		this.$templates.children("span").remove()
+		this.$templatesList.empty()
 		data.forEach(function(room){
 			var $span = $("<span>")
 			$span.data("slug", room.slug)
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index a8f8e51..0fd0954 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -378,12 +378,12 @@ iframe.embed {
 
 .room .images[data-mediacount='1'] img:nth-child(1) { left: 20%; top: 20%; }
 
-.room .images[data-mediacount='2'] img:nth-child(1) { left: 51%; bottom: 0%; width: auto; height: 30%; }
-.room .images[data-mediacount='2'] img:nth-child(2) { right: 51%; bottom: 0%; width: auto; height: 30%; }
+.room .images[data-mediacount='2'] img:nth-child(1) { left: 51%; bottom: 0%; width: auto; height: 40%; }
+.room .images[data-mediacount='2'] img:nth-child(2) { right: 51%; bottom: 50%; width: auto; height: 40%; }
 
 .room .images[data-mediacount='3'] img:nth-child(1) { right: 51%; bottom: 41%; }
-.room .images[data-mediacount='3'] img:nth-child(2) { left: 51%; bottom: 0%; width:auto; height:30%;}
-.room .images[data-mediacount='3'] img:nth-child(3) { right: 51%; top: 61%; }
+.room .images[data-mediacount='3'] img:nth-child(2) { right: 51%; top: 61%; }
+.room .images[data-mediacount='3'] img:nth-child(3) { left: 51%; bottom: 0%; width:auto; height:30%;}
 
 .room .images[data-mediacount='4'] img:nth-child(1) { right: 51%; bottom: 41%; }
 .room .images[data-mediacount='4'] img:nth-child(2) { left: 51%; bottom: 61%; }
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 24a83b7..8754617 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -4,6 +4,8 @@
 		
 		<div class="templates">
 			<h1>Edit Room Layouts</h1>
+			<div class="templates-list">
+			</div>
 		</div>
 		<div class="no-templates">
 			There are no room layouts available. Please <a href="/layout/new">create a new one.</a>
@@ -20,6 +22,8 @@
 		
 		<div class="templates">
 			<h1>Your Projects</h1>
+			<div class="templates-list">
+			</div>
 		</div>
 		<div class="no-templates">
 		</div>
@@ -35,6 +39,8 @@
 		
     <h2>Choose Room Template</h2>
 		<div class="templates">
+			<div class="templates-list">
+			</div>
 		</div>
 		<div class="no-templates">
 			There are no room layouts available. Please <a href="/layout/new">create a new one.</a>
-- 
cgit v1.2.3-70-g09d2


From 5acbd9768fb84fae6f71f349350a8c3e8fb90135 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 16:16:39 -0400
Subject: templatesList

---
 public/assets/javascripts/ui/site/LayoutsModal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 24b65e3..99db2a3 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -34,7 +34,7 @@ var LayoutsIndex = View.extend({
       $span.append( $image )
       $span.append( $label )
 			
-			this.$templates.append($span)
+			this.$templatesList.append($span)
 		}.bind(this))
 		this.show()
 	}
-- 
cgit v1.2.3-70-g09d2


From 86153d1221e38615d0a7dea8a8029a184fb25ece Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 20:32:31 -0400
Subject: rooms editor in builder

---
 .../javascripts/mx/extensions/mx.movements.js      |  2 +-
 .../rectangles/engine/map/ui_minimap.js            |  2 --
 .../assets/javascripts/rectangles/models/wall.js   |  2 ++
 .../assets/javascripts/ui/editor/EditorToolbar.js  |  8 ++++++--
 public/assets/javascripts/ui/editor/EditorView.js  |  6 ++++++
 public/assets/javascripts/ui/site/LayoutsModal.js  |  5 +++++
 views/controls/builder/info.ejs                    |  2 +-
 views/controls/editor/toolbar.ejs                  | 23 +++++++++++-----------
 views/editor.ejs                                   |  1 +
 9 files changed, 34 insertions(+), 17 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 065c93b..0ce03db 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -113,7 +113,7 @@ MX.Movements = function (cam) {
 						  app.controller.mediaViewer.hide()
 						}
 						else {
-              map && map.toggle && map.toggle()
+              app.controller.toolbar.toggleMap()
 						}
 						break
 				}
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
index d7280b9..fabbdb9 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
@@ -7,7 +7,6 @@ Map.UI.Minimap = function(map){
 
 	base.creating = base.dragging = base.resizing = false
 
-/*
 	base.mouse = new mouse({
 		el: map.el,
 		down: down,
@@ -16,7 +15,6 @@ Map.UI.Minimap = function(map){
 		up: up,
 		rightclick: rightclick,
 	})
-*/
 
 	base.wheel = new wheel({
 		el: map.el,
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fcb2f5e..7ff9015 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -114,6 +114,8 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+
+						app.controller.pickWall(base, pos)
           }
 					else {
 						app.controller.pickWall(base, pos)
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 4f12a7b..8a707ec 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -19,8 +19,12 @@ var EditorToolbar = View.extend({
 	},
 
 	toggleMap: function(){
-		map.toggle()
-		// $("#minimap").toggleClass("hide");
+		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
+		this.resetControls()
+    $("[data-role='toggle-map-view']").toggleClass("inuse", state)
+		map.toggle(state)
+		$("#minimap").toggleClass("hide", state)
+		this.parent.info.toggle(state)
 	},
 	
 	toggleSettings: function(){
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index b35c872..6aff601 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -11,6 +11,7 @@ var EditorView = View.extend({
 	initialize: function(){
 		this.toolbar = new EditorToolbar ({ parent: this })
 		this.settings = new EditorSettings ({ parent: this })
+		this.info = new BuilderInfo ({ parent: this })
 		this.mediaViewer = new MediaViewer ({ parent: this })
 		this.mediaUpload = new MediaUpload ({ parent: this })
 		this.mediaEditor = new MediaEditor ({ parent: this })
@@ -27,6 +28,11 @@ var EditorView = View.extend({
 	},
 	
 	loadLayout: function(layout){
+	  if (layout == "empty") {
+	    this.readyLayout({})
+	    this.toolbar.toggleMap()
+      return
+	  }
 		layout = sanitize(layout)
 		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 99db2a3..73c63e8 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -48,6 +48,7 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 
 	events: {
 		"click .templates span": 'toggleActive',
+		"click [data-role='create-new-layout']": 'createNewLayout',
 		"submit form": 'newProject',
 	},
 	
@@ -70,6 +71,10 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		window.location.pathname = "/project/" + $layout.data("slug") + "/edit"
 	},
 	
+	createNewLayout: function(){
+	  window.location.pathname = "/layout/new"
+	},
+	
 	newProject: function(e){
 		e && e.preventDefault()
 		window.location.pathname = "/project/new"
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index d92d34c..7ef0b6a 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox active settings info active" id="builderInfo">
+<div class="vvbox settings info" id="builderInfo">
 	<div class="setting number">
 		<label for="room-width">width</label>
 		<input type="text" class="units" name="width" id="room-width">
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 85800f8..47d7c3c 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -4,10 +4,10 @@
 		data-role='open-media-viewer'
 		data-info="add media"
 		class="ion-ios7-photos-outline"></span>
-		<span
-			data-role='toggle-presets'
-			data-info="preset styles"
-			class="ion-ios7-briefcase-outline"></span>
+  <span
+    data-role='toggle-presets'
+    data-info="preset styles"
+    class="ion-ios7-briefcase-outline"></span>
 <!-- 
 	<span
 		data-role='resize-media'
@@ -26,13 +26,14 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
-
-		<span
-			data-role='toggle-text-editor'
-			data-info="add text to wall"
-			class="ion-ios7-compose-outline"></span>
-			
-
+  <span
+    data-role='toggle-text-editor'
+    data-info="add text to wall"
+    class="ion-ios7-compose-outline"></span>
+	<span
+		data-role='toggle-map-view'
+		data-info="toggle map view"
+		class="ion-ios7-world-outline"></span>
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
diff --git a/views/editor.ejs b/views/editor.ejs
index 330e69b..c0562e9 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -13,6 +13,7 @@
 
 		<div id="editorView">
 			[[ include controls/editor/toolbar ]]
+			[[ include controls/builder/info ]]
 			[[ include controls/editor/media-drawer ]]
 			[[ include controls/editor/media-editor ]]
 			[[ include controls/editor/wallpaper ]]
-- 
cgit v1.2.3-70-g09d2


From 031b75cdcaa994ad677f29e61932e4078ba96f4c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 20:56:38 -0400
Subject: hook up new template button which just loads an empty layout

---
 public/assets/javascripts/ui/site/LayoutsModal.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 73c63e8..5974fc3 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -48,7 +48,6 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 
 	events: {
 		"click .templates span": 'toggleActive',
-		"click [data-role='create-new-layout']": 'createNewLayout',
 		"submit form": 'newProject',
 	},
 	
@@ -71,10 +70,6 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		window.location.pathname = "/project/" + $layout.data("slug") + "/edit"
 	},
 	
-	createNewLayout: function(){
-	  window.location.pathname = "/layout/new"
-	},
-	
 	newProject: function(e){
 		e && e.preventDefault()
 		window.location.pathname = "/project/new"
@@ -117,6 +112,7 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 	action: "/api/layout",
 
 	events: {
+		"click [data-role='create-new-layout']": 'createNewLayout',
 		"click .templates span": 'choose',
 		"submit form": 'choose',
 	},
@@ -133,6 +129,10 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
  		var layout = $(e.currentTarget).data("slug")
 		if (! layout || ! layout.length) return
 		window.location.pathname = "/project/new/" + layout
-	}
+	},
+
+	createNewLayout: function(){
+	  window.location.pathname = "/project/new/empty"
+	},
 	
 })
-- 
cgit v1.2.3-70-g09d2


From 15692020fbc7bdfa66f9ecae0eaf844054c59e4a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 6 Aug 2015 19:11:23 -0400
Subject: plan restriction business logic

---
 public/assets/javascripts/ui/site/LayoutsModal.js | 14 ++++++++++++--
 server/index.js                                   |  2 +-
 server/lib/api/layouts.js                         | 11 ++++++++++-
 server/lib/middleware.js                          | 16 +++++++++++++++-
 4 files changed, 38 insertions(+), 5 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 5974fc3..639d55c 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -15,13 +15,23 @@ var LayoutsIndex = View.extend({
 	},
 
 	populate: function(data){
-		if (! data.length) {
+/*
+	  if (data.layoutCount > data.plan.basic_layout_limit) {
+	  }
+	  if (data.projectCount > data.plan.stock_project_limit) {
+	  }
+	  if (data.projectCount > data.plan.basic_project_limit) {
+	  }
+	  if (data.projectCount > data.plan.pro_project_limit) {
+	  }
+*/
+		if (! data.layouts.length) {
 			this.$templates.hide()
 			this.$form.hide()
 			this.$noTemplates.show()
 		}
 		this.$templatesList.empty()
-		data.forEach(function(room){
+		data.layouts.forEach(function(room){
 			var $span = $("<span>")
 			$span.data("slug", room.slug)
 			
diff --git a/server/index.js b/server/index.js
index 30cf69a..db9b051 100644
--- a/server/index.js
+++ b/server/index.js
@@ -139,7 +139,7 @@ site.route = function () {
 	app.get('/project/:slug/view', middleware.ensureProject, middleware.ensureIsCollaborator, views.reader)
 	app.get('/project/:slug/edit', middleware.ensureProject, middleware.ensureIsCollaborator, views.editor)
 
-	app.get('/api/layout', middleware.ensureAuthenticated, api.layouts.index)
+	app.get('/api/layout', middleware.ensureAuthenticated, middleware.ensureUserProjectsCount, middleware.ensureUserLayoutsCount, api.layouts.index)
 	app.get('/api/layout/:slug', middleware.ensureAuthenticated, api.layouts.show)
 	app.post('/api/layout/new', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.layouts.create)
 	app.post('/api/layout/edit', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.layouts.update)
diff --git a/server/lib/api/layouts.js b/server/lib/api/layouts.js
index 641e9e2..7e7976c 100644
--- a/server/lib/api/layouts.js
+++ b/server/lib/api/layouts.js
@@ -3,13 +3,22 @@
 var _ = require('lodash'),
 	util = require('../util'),
 	upload = require('../upload'),
+	middleware = require('../middleware'),
 	config = require('../../../config.json'),
 	Layout = require('../schemas/Layout');
 
 var layouts = {
 	index: function(req, res){
+	  // free layouts
+	  // user layouts
 		Layout.find({}, function(err, docs){
-			res.json(docs)
+			res.json({
+			  layouts: docs,
+			  plan: middleware.plans[ res.locals.user.plan_level || 0 ],
+			  user: res.locals.user,
+			  layoutCount: res.locals.layoutCount,
+			  projectCount: res.locals.projectCount,
+			})
 		})
 	},
 
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 35c520c..9d09a10 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -7,6 +7,7 @@ var passport = require('passport'),
 	User = require('./schemas/User'),
 	Collaborator = require('./schemas/Collaborator'),
 	Project = require('./schemas/Project'),
+	Layout = require('./schemas/Layout'),
 	Plan = require('./schemas/Plan');
 
 
@@ -63,7 +64,20 @@ var middleware = {
 		res.locals.opt = {}
 		next()
 	},
-  
+
+  ensureUserProjectsCount: function(req, res, next){
+    Project.count({ user_id: req.user.id }, function(err, count){
+      res.locals.projectCount = count || 0
+      next()
+    })
+  },
+  ensureUserLayoutsCount: function(req, res, next){
+    Layout.count({ user_id: req.user.id }, function(err, count){
+      res.locals.layoutCount = count || 0
+      next()
+    })
+  },
+
 	ensureProject: function (req, res, next) {
 		if (req.params.slug) {
 			Project.findOne({ slug: req.params.slug }, function(err, project){
-- 
cgit v1.2.3-70-g09d2


From 33e5644226649d277c6b84dc37fccdd5b7c6e86c Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Aug 2015 12:23:35 -0400
Subject: more accurate counts

---
 public/assets/javascripts/ui/site/LayoutsModal.js | 10 ++--
 server/lib/api/layouts.js                         |  4 +-
 server/lib/middleware.js                          | 60 +++++++++++++++++++++--
 server/lib/schemas/Plan.js                        |  2 +-
 server/lib/schemas/Project.js                     |  1 +
 server/lib/views/staff.js                         | 45 ++++++++++++++++-
 views/staff/_nav.ejs                              |  1 +
 views/staff/plans/_form.ejs                       |  6 +--
 views/staff/projects/index.ejs                    |  2 +-
 9 files changed, 113 insertions(+), 18 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 639d55c..f69b38f 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -16,13 +16,15 @@ var LayoutsIndex = View.extend({
 
 	populate: function(data){
 /*
-	  if (data.layoutCount > data.plan.basic_layout_limit) {
+	  if (data.layoutCounts.basic > data.plan.basic_layout_limit) {
 	  }
-	  if (data.projectCount > data.plan.stock_project_limit) {
+	  if (data.layoutCounts.pro > data.plan.pro_layout_limit) {
 	  }
-	  if (data.projectCount > data.plan.basic_project_limit) {
+	  if (data.projectCounts.stock > data.plan.stock_project_limit) {
 	  }
-	  if (data.projectCount > data.plan.pro_project_limit) {
+	  if (data.projectCounts.basic > data.plan.basic_project_limit) {
+	  }
+	  if (data.projectCounts.pro > data.plan.pro_project_limit) {
 	  }
 */
 		if (! data.layouts.length) {
diff --git a/server/lib/api/layouts.js b/server/lib/api/layouts.js
index 7e7976c..1c87fae 100644
--- a/server/lib/api/layouts.js
+++ b/server/lib/api/layouts.js
@@ -16,8 +16,8 @@ var layouts = {
 			  layouts: docs,
 			  plan: middleware.plans[ res.locals.user.plan_level || 0 ],
 			  user: res.locals.user,
-			  layoutCount: res.locals.layoutCount,
-			  projectCount: res.locals.projectCount,
+			  layoutCounts: res.locals.layoutCounts,
+			  projectCounts: res.locals.projectCounts,
 			})
 		})
 	},
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 9d09a10..fe4dc49 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -60,20 +60,48 @@ var middleware = {
     res.locals.ogUrl = "http://vvalls.com/"
     res.locals.ogDescription = "3D gallery space, fully customizable"
     res.locals.ogAuthor = "VValls"
-    res.locals.plans = plans
+    res.locals.plans = middleware.plans
 		res.locals.opt = {}
 		next()
 	},
 
   ensureUserProjectsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id }, function(err, count){
-      res.locals.projectCount = count || 0
+    var counts = { stock: 0, basic: 0, pro: 0 }
+    res.locals.projectCounts = counts
+    Project.count({ user_id: req.user.id, layout_type: 0 }, function(err, count){
+      res.locals.projectCounts.stock = count || 0
+      if (req.user.plan_level > 0) { return middleware.ensureBasicProjectsCount(req, res, next) }
+      else next()
+    })
+  },
+  ensureBasicProjectsCount: function(req, res, next){
+    Project.count({ user_id: req.user.id, layout_type: 1 }, function(err, count){
+      res.locals.projectCounts.basic = count || 0
+      if (req.user.plan_level > 1) { return middleware.ensureProProjectsCount(req, res, next) }
+      else next()
+    })
+  },
+  ensureProProjectsCount: function(req, res, next){
+    Project.count({ user_id: req.user.id, layout_type: 2 }, function(err, count){
+      res.locals.projectCounts.pro = count || 0
       next()
     })
   },
+
   ensureUserLayoutsCount: function(req, res, next){
-    Layout.count({ user_id: req.user.id }, function(err, count){
-      res.locals.layoutCount = count || 0
+    var counts = { basic: 0, pro: 0 }
+    res.locals.layoutCounts = counts
+    if (req.user.plan_level == 0) { return next() }
+
+    Layout.count({ user_id: req.user.id, layout_type: 1 }, function(err, count){
+      res.locals.layoutCounts.basic = count || 0
+      if (req.user.plan_level > 1) { return middleware.ensureProLayoutsCount(req, res, next) }
+      else next()
+    })
+  },
+  ensureProLayoutsCount: function(req, res, next){
+    Project.count({ user_id: req.user.id, layout_type: 2 }, function(err, count){
+      res.locals.layoutCounts.pro = count || 0
       next()
     })
   },
@@ -100,6 +128,28 @@ var middleware = {
 		}
 	},
 
+	ensureLayout: function (req, res, next) {
+		if (req.params.slug) {
+			Layout.findOne({ slug: req.params.slug }, function(err, layout){
+				if (err) {
+					console.error(err)
+					req.layout = null
+				}
+				else if (! project) {
+					req.layout = null
+				}
+				else {
+					req.layout = layout
+				}
+				next()
+			})
+		}
+		else {
+			req.layout = null
+			next()
+		}
+	},
+
   ensureIsCollaborator: function(req, res, next) {
     req.isCollaborator = false
     req.isOwner = false
diff --git a/server/lib/schemas/Plan.js b/server/lib/schemas/Plan.js
index 8a19b99..388ce69 100644
--- a/server/lib/schemas/Plan.js
+++ b/server/lib/schemas/Plan.js
@@ -31,7 +31,7 @@ var PlanSchema = new mongoose.Schema({
   permissions: {
     basic_editor: { type: Boolean, default: false },
     pro_editor: { type: Boolean, default: false },
-    solids: { type: Boolean, default: false },
+    sculpture: { type: Boolean, default: false },
     collaborators: { type: Boolean, default: false },
     no_logo: { type: Boolean, default: false },
   },
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index e9501fc..855d95a 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -39,6 +39,7 @@ var ProjectSchema = new mongoose.Schema({
 	created_at: { type: Date },
 	updated_at: { type: Date },
 	featured: { type: Boolean, default: false },
+	layout_type: { type: Number, default: 0 },
 });
 
 module.exports = exports = mongoose.model('project', ProjectSchema);
diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js
index 19b361d..6c97bbd 100644
--- a/server/lib/views/staff.js
+++ b/server/lib/views/staff.js
@@ -21,7 +21,7 @@ var staff = module.exports = {
     plans: "monthly_price yearly_price basic_layout_monthly_price basic_layout_yearly_price " +
            "pro_layout_monthly_price pro_layout_yearly_price " +
            "basic_layout_limit pro_layout_limit stock_project_limit basic_project_limit pro_project_limit",
-    plans_permissions: "basic_editor pro_editor solids collaborators no_logo",
+    plans_permissions: "basic_editor pro_editor sculpture collaborators no_logo",
 	},
 	
 	defaults: {
@@ -401,6 +401,13 @@ var staff = module.exports = {
       return project
 	  },
 	  
+	  layout: function(layout){
+      layout = layout.toObject()
+      layout.date = moment( layout.updated_at || layout.created_at ).format("M/DD/YYYY hh:mm a")
+      layout.user = {}
+      return layout
+	  },
+	  
 	  media: function(media){
       media = media.toObject()
       media.date = moment( media.updated_at || media.created_at ).format("M/DD/YYYY hh:mm a")
@@ -520,7 +527,41 @@ var staff = module.exports = {
 
       staff.projects.feature
     );
-    
+
+    //
+    // layouts
+
+    app.get('/staff/layouts',
+      middleware.ensureAuthenticated,
+      middleware.ensureIsStaff,
+      
+      staff.middleware.ensureLayoutsCount,
+
+      staff.middleware.ensureLayouts,
+      staff.middleware.ensureLayoutsUsers,
+
+      staff.layouts.index
+    );
+    app.get('/staff/layouts/:slug',
+      middleware.ensureAuthenticated,
+      middleware.ensureIsStaff,
+
+      middleware.ensureLayout,
+      staff.middleware.ensureLayout,
+      staff.middleware.ensureLayoutUser,
+
+      staff.layouts.show
+    );
+    app.put('/staff/layouts/:slug/feature',
+      middleware.ensureAuthenticated,
+      middleware.ensureIsStaff,
+
+      middleware.ensureLayout,
+      staff.middleware.ensureLayout,
+
+      staff.layouts.make_stock
+    );
+        
     //
     // media
     
diff --git a/views/staff/_nav.ejs b/views/staff/_nav.ejs
index a607638..3bb3b08 100644
--- a/views/staff/_nav.ejs
+++ b/views/staff/_nav.ejs
@@ -2,6 +2,7 @@
   <a href="/staff">home</a>
   <a href="/staff/users">users</a>
   <a href="/staff/projects">projects</a>
+  <a href="/staff/layouts">layouts</a>
   <a href="/staff/media">media</a>
   <a href="/staff/plans">plans</a>
 <!-- <a href="/staff/subscriptions">subscriptions</a> -->
diff --git a/views/staff/plans/_form.ejs b/views/staff/plans/_form.ejs
index 61be7e8..85375fa 100644
--- a/views/staff/plans/_form.ejs
+++ b/views/staff/plans/_form.ejs
@@ -124,9 +124,9 @@
 </li>
 
 <li>
-  <input name="permissions_solids" type="hidden" value="0">
-  <input id="plan_permissions_solids" name="permissions_solids" type="checkbox" value="1" [[ if (plan.permissions.solids) { ]]checked[[ } ]]>
-  <label for="plan_permissions_solids">3D Objects</label>
+  <input name="permissions_sculpture" type="hidden" value="0">
+  <input id="plan_permissions_sculpture" name="permissions_sculpture" type="checkbox" value="1" [[ if (plan.permissions.sculpture) { ]]checked[[ } ]]>
+  <label for="plan_permissions_sculpture">3D Objects</label>
 </li>
 
 <li>
diff --git a/views/staff/projects/index.ejs b/views/staff/projects/index.ejs
index e4ba469..1d309ce 100644
--- a/views/staff/projects/index.ejs
+++ b/views/staff/projects/index.ejs
@@ -7,7 +7,7 @@
   <hr>
 
 [[ include ../_pagination ]]
-[[ include ../_projects ]]
+[[ include ../_layouts ]]
 [[ include ../_pagination ]]
 
 [[ include ../_footer ]]
-- 
cgit v1.2.3-70-g09d2


From e0aebb7ef327f29c0ab8f5b75a24c5d823dfd90f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Aug 2015 18:30:51 -0400
Subject: lockout

---
 public/assets/javascripts/ui/site/LayoutsModal.js | 11 ++---------
 server/lib/api/layouts.js                         |  3 ---
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index f69b38f..b620b58 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -16,15 +16,8 @@ var LayoutsIndex = View.extend({
 
 	populate: function(data){
 /*
-	  if (data.layoutCounts.basic > data.plan.basic_layout_limit) {
-	  }
-	  if (data.layoutCounts.pro > data.plan.pro_layout_limit) {
-	  }
-	  if (data.projectCounts.stock > data.plan.stock_project_limit) {
-	  }
-	  if (data.projectCounts.basic > data.plan.basic_project_limit) {
-	  }
-	  if (data.projectCounts.pro > data.plan.pro_project_limit) {
+	  if (data.user.plan_level < 1 && data.projectCounts.free == 1) {
+	    // show lockout message
 	  }
 */
 		if (! data.layouts.length) {
diff --git a/server/lib/api/layouts.js b/server/lib/api/layouts.js
index 1c87fae..a3edc38 100644
--- a/server/lib/api/layouts.js
+++ b/server/lib/api/layouts.js
@@ -9,12 +9,9 @@ var _ = require('lodash'),
 
 var layouts = {
 	index: function(req, res){
-	  // free layouts
-	  // user layouts
 		Layout.find({}, function(err, docs){
 			res.json({
 			  layouts: docs,
-			  plan: middleware.plans[ res.locals.user.plan_level || 0 ],
 			  user: res.locals.user,
 			  layoutCounts: res.locals.layoutCounts,
 			  projectCounts: res.locals.projectCounts,
-- 
cgit v1.2.3-70-g09d2


From 18e8ca03b90f124968400ccc742744c3ed01547a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Aug 2015 18:36:25 -0400
Subject: cleanup

---
 public/assets/javascripts/ui/site/LayoutsModal.js |  2 +-
 server/lib/api/layouts.js                         | 17 +++++++------
 server/lib/middleware.js                          | 29 ++++-------------------
 3 files changed, 15 insertions(+), 33 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index b620b58..87251af 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -16,7 +16,7 @@ var LayoutsIndex = View.extend({
 
 	populate: function(data){
 /*
-	  if (data.user.plan_level < 1 && data.projectCounts.free == 1) {
+	  if (data.user.plan_level < 1 && data.projectCount == 1) {
 	    // show lockout message
 	  }
 */
diff --git a/server/lib/api/layouts.js b/server/lib/api/layouts.js
index a3edc38..f1db121 100644
--- a/server/lib/api/layouts.js
+++ b/server/lib/api/layouts.js
@@ -9,13 +9,16 @@ var _ = require('lodash'),
 
 var layouts = {
 	index: function(req, res){
-		Layout.find({}, function(err, docs){
-			res.json({
-			  layouts: docs,
-			  user: res.locals.user,
-			  layoutCounts: res.locals.layoutCounts,
-			  projectCounts: res.locals.projectCounts,
-			})
+		Layout.find({ is_stock: true }, function(err, stock_layouts){
+      Layout.find({ user_id: req.user._id }, function(err, user_layouts){
+        res.json({
+          layouts: stock_layouts,
+          user_layouts: user_layouts,
+          user: res.locals.user,
+          layoutCount: res.locals.layoutCount,
+          projectCount: res.locals.projectCount,
+        })
+      })
 		})
 	},
 
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index fe4dc49..94c4acd 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -68,22 +68,8 @@ var middleware = {
   ensureUserProjectsCount: function(req, res, next){
     var counts = { stock: 0, basic: 0, pro: 0 }
     res.locals.projectCounts = counts
-    Project.count({ user_id: req.user.id, layout_type: 0 }, function(err, count){
-      res.locals.projectCounts.stock = count || 0
-      if (req.user.plan_level > 0) { return middleware.ensureBasicProjectsCount(req, res, next) }
-      else next()
-    })
-  },
-  ensureBasicProjectsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id, layout_type: 1 }, function(err, count){
-      res.locals.projectCounts.basic = count || 0
-      if (req.user.plan_level > 1) { return middleware.ensureProProjectsCount(req, res, next) }
-      else next()
-    })
-  },
-  ensureProProjectsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id, layout_type: 2 }, function(err, count){
-      res.locals.projectCounts.pro = count || 0
+    Project.count({ user_id: req.user._id }, function(err, count){
+      res.locals.projectCount = count || 0
       next()
     })
   },
@@ -93,15 +79,8 @@ var middleware = {
     res.locals.layoutCounts = counts
     if (req.user.plan_level == 0) { return next() }
 
-    Layout.count({ user_id: req.user.id, layout_type: 1 }, function(err, count){
-      res.locals.layoutCounts.basic = count || 0
-      if (req.user.plan_level > 1) { return middleware.ensureProLayoutsCount(req, res, next) }
-      else next()
-    })
-  },
-  ensureProLayoutsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id, layout_type: 2 }, function(err, count){
-      res.locals.layoutCounts.pro = count || 0
+    Layout.count({ user_id: req.user._id }, function(err, count){
+      res.locals.layoutCount = count || 0
       next()
     })
   },
-- 
cgit v1.2.3-70-g09d2


From c781911322c84eb0c2aa4a00860016437d7b7cba Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 18:30:33 -0400
Subject: surface blueprints on new project modal

---
 .../rectangles/engine/map/tools/arrow.js           |   2 +
 .../rectangles/engine/map/tools/eraser.js          |   2 +
 .../rectangles/engine/map/tools/line.js            |   2 +-
 .../rectangles/engine/map/tools/ortho.js           |   5 +-
 .../rectangles/engine/map/tools/polyline.js        |   2 +
 .../rectangles/engine/map/tools/position.js        |   2 +
 .../rectangles/engine/map/tools/start.js           |   2 +-
 .../javascripts/ui/blueprint/BlueprintUploader.js  |   9 +-
 public/assets/javascripts/ui/site/LayoutsModal.js  | 190 +++++++++++++++++++--
 public/assets/stylesheets/app.css                  |   4 +-
 server/lib/api/layouts.js                          |  18 +-
 views/projects/layouts-modal.ejs                   |   3 +
 12 files changed, 211 insertions(+), 30 deletions(-)

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/rectangles/engine/map/tools/arrow.js b/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
index 2a73954..00478d4 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/arrow.js
@@ -1,3 +1,5 @@
+// Tool used to move corners of polylines
+
 var ArrowTool = MapTool.extend(function(base){
 	var exports = {}
 	
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/eraser.js b/public/assets/javascripts/rectangles/engine/map/tools/eraser.js
index 648cd11..8fc3687 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/eraser.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/eraser.js
@@ -1,3 +1,5 @@
+// Tool used to delete lines
+
 var EraserTool = MapTool.extend(function(base){
 	var exports = {}
 	exports.down = function(e, cursor){
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/line.js b/public/assets/javascripts/rectangles/engine/map/tools/line.js
index a8e2473..8175d66 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/line.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/line.js
@@ -1,4 +1,4 @@
-// This tool is used to define a very simple line between two points.
+// Tool is used to define a very simple line between two points.
 // It is used by the BlueprintScaler to specify a sample distance to scale.
 
 var LineTool = MapTool.extend(function(base){
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
index 918ac0d..6ced728 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/ortho.js
@@ -1,6 +1,7 @@
+// Tool to make a polyline where all walls are orthogonal
+
 var OrthoPolylineTool = MapTool.extend(function (base) {
-  // this will work like normal polyline except all walls will be orthogonal
-  
+
   var prev_point, horizontal = false, first_edge_is_horizontal = false
   
   var exports = {}
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
index 6716180..445ae26 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/polyline.js
@@ -1,3 +1,5 @@
+// Tool used to draw polylines with arbitrary angles
+
 var PolylineTool = MapTool.extend(function (base) {
   var exports = {}
   exports.down = function(e, cursor){
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/position.js b/public/assets/javascripts/rectangles/engine/map/tools/position.js
index a994f5a..f8365bc 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/position.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/position.js
@@ -1,3 +1,5 @@
+// Tool used to set position on the map and let you change the view by dragging.
+
 var PositionTool = MapTool.extend(function(base){
 	var exports = {
 	  recenterCursor: false,
diff --git a/public/assets/javascripts/rectangles/engine/map/tools/start.js b/public/assets/javascripts/rectangles/engine/map/tools/start.js
index cca387c..203a85f 100644
--- a/public/assets/javascripts/rectangles/engine/map/tools/start.js
+++ b/public/assets/javascripts/rectangles/engine/map/tools/start.js
@@ -1,4 +1,4 @@
-// This tool is used to set the start position on the map.
+// Tool is used to set the start position on the map.
 
 var StartPositionTool = MapTool.extend(function(base){
 	var exports = {}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index fbb71d5..fe1073a 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -37,8 +37,12 @@ var BlueprintUploader = UploadView.extend({
 		if (data && data.length) {
 		  this.$blueprints.show()
       data.forEach(this.append.bind(this))
-      this.hide()
-      if (this.nameToShow && this.nameToShow !== "new") {
+      if (this.nameToShow === "new") {
+        // don't pick anything..
+        this.show()
+      }
+      else if (! this.nameToShow) {
+        this.hide()
         data.some(function(el){
           if (el.slug == this.nameToShow) {
             this.parent.scaler.pick(el)
@@ -47,6 +51,7 @@ var BlueprintUploader = UploadView.extend({
         }.bind(this))
       }
       else {
+        this.hide()
         this.parent.scaler.pick(data[0])
       }
 		}
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 87251af..a9c6ef0 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -6,6 +6,10 @@ var LayoutsIndex = View.extend({
 		this.$templatesList = this.$(".templates-list")
 		this.$noTemplates = this.$(".no-templates")
 		this.$form = this.$("form")
+		
+		this.$userTemplatesList = this.$(".userTemplatesList")
+		this.$blueprintsList = this.$(".blueprintsList")
+		this.$newBlueprintButton = this.$("[data-role='create-new-blueprint']")
 	},
 
 	load: function(type){
@@ -15,11 +19,6 @@ var LayoutsIndex = View.extend({
 	},
 
 	populate: function(data){
-/*
-	  if (data.user.plan_level < 1 && data.projectCount == 1) {
-	    // show lockout message
-	  }
-*/
 		if (! data.layouts.length) {
 			this.$templates.hide()
 			this.$form.hide()
@@ -89,20 +88,89 @@ var LayoutsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 	action: "/api/layout",
 
 	events: {
-		"click .templates span": 'toggleActive',
+		"click .templates span": 'pick',
+		"click .userTemplates span": 'pick',
+		"click .blueprints span": 'pickBlueprint',
 		"submit form": 'newLayout',
 	},
 	
-	toggleActive: function(e){
+	pick: function(e){
 		e.preventDefault()
-		this.$(".templates .active").removeClass("active")
 		var $layout = $(e.currentTarget)
-		$layout.addClass("active")
+		window.location.pathname = "/layout/" + $layout.data("slug")
+	},
+
+	pick: function(e){
+		e.preventDefault()
+		var $blueprint = $(e.currentTarget)
+		$blueprint.addClass("active")
 		
-		// actually do
 		window.location.pathname = "/layout/" + $layout.data("slug")
 	},
-	
+
+	populate: function(data){
+/*
+	  if (data.user.plan_level < 1 && data.projectCount == 1) {
+	    // show lockout message
+	  }
+*/
+		if (! data.layouts.length) {
+			this.$templates.hide()
+			this.$form.hide()
+			this.$noTemplates.show()
+		}
+		this.$templatesList.empty()
+		data.layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+
+		data.user_layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$userTemplatesList.append($span)
+		}.bind(this))
+		
+		data.blueprints.forEach(function(blueprint){
+			var $span = $("<span>")
+			$span.data("slug", blueprint.slug)
+			
+			var $label = $("<label>")
+			$label.html( blueprint.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + blueprint.url + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$blueprintsList.append($span)
+		}.bind(this))
+		
+		this.show()
+	},
+
 	newLayout: function(e){
 		e && e.preventDefault()
 		window.location.pathname = "/layout/new"
@@ -118,8 +186,10 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 
 	events: {
 		"click [data-role='create-new-layout']": 'createNewLayout',
-		"click .templates span": 'choose',
-		"submit form": 'choose',
+		"click [data-role='create-new-blueprint']": 'createNewBlueprint',
+		"click .templates span": 'pick',
+		"click .userTemplates span": 'pick',
+		"click .blueprints span": 'pickBlueprint',
 	},
 	
 	toggleActive: function(e){
@@ -128,16 +198,104 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		$(e.currentTarget).addClass("active")
 	},
 	
-	choose: function(e){
+	pick: function(e){
 		e && e.preventDefault()
 // 		var layout = this.$(".templates .active").data("slug")
  		var layout = $(e.currentTarget).data("slug")
+ 		var isBlueprint = $(e.currentTarget).data("blueprint")
 		if (! layout || ! layout.length) return
-		window.location.pathname = "/project/new/" + layout
+		
+		if (isBlueprint) {
+      window.location.pathname = "/project/blueprint/" + layout
+		}
+		else {
+      window.location.pathname = "/project/new/" + layout
+		}
 	},
 
-	createNewLayout: function(){
+	createNewLayout: function(e){
+	  e.preventDefault()
 	  window.location.pathname = "/project/new/empty"
 	},
+
+	createNewBlueprint: function(s){
+	  e.preventDefault()
+	  window.location.pathname = "/blueprint/new"
+	},
+
+	populate: function(data){
+/*
+	  if (data.user.plan_level < 1 && data.projectCount == 1) {
+	    // show lockout message
+      this.$newBlueprintButton.hide()
+	  }
+*/
+		if (! data.layouts.length) {
+			this.$templates.hide()
+			this.$form.hide()
+			this.$noTemplates.show()
+		}
+		if (! data.blueprints.length) {
+		  this.$blueprintsList.parent().hide()
+    }
+		if (! data.user_layouts.length) {
+		  this.$userTemplatesList.parent().hide()
+    }
+
+		this.$templatesList.empty()
+		data.layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+
+		data.user_layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+		
+		data.blueprints.forEach(function(blueprint){
+		  if (! blueprint.slug) { return }
+		  
+			var $span = $("<span>")
+			$span.data("blueprint", true)
+			$span.data("slug", blueprint.slug)
+			
+			var $label = $("<label>")
+			$label.html( blueprint.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + blueprint.url + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+		
+		this.show()
+	},
+
 	
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 5ef8c18..a1bb466 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1157,7 +1157,9 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
 	height: 100%;
 	padding: 20px 0 40px 0;
 }
-.templates-list {
+.templates-list,
+.userTemplatesList,
+.blueprintsList {
 	display: inline-block;
 	width: 100%;
 	margin-bottom: 40px;
diff --git a/server/lib/api/layouts.js b/server/lib/api/layouts.js
index f1db121..c04f926 100644
--- a/server/lib/api/layouts.js
+++ b/server/lib/api/layouts.js
@@ -5,18 +5,22 @@ var _ = require('lodash'),
 	upload = require('../upload'),
 	middleware = require('../middleware'),
 	config = require('../../../config.json'),
+	Blueprint = require('../schemas/Blueprint'),
 	Layout = require('../schemas/Layout');
 
 var layouts = {
 	index: function(req, res){
 		Layout.find({ is_stock: true }, function(err, stock_layouts){
-      Layout.find({ user_id: req.user._id }, function(err, user_layouts){
-        res.json({
-          layouts: stock_layouts,
-          user_layouts: user_layouts,
-          user: res.locals.user,
-          layoutCount: res.locals.layoutCount,
-          projectCount: res.locals.projectCount,
+      Layout.find({ user_id: req.user._id, is_stock: false }, function(err, user_layouts){
+        Blueprint.find({ user_id: req.user._id }, function(err, blueprints){
+          res.json({
+            layouts: stock_layouts,
+            user_layouts: user_layouts,
+            blueprints: blueprints,
+            user: res.locals.user,
+            layoutCount: res.locals.layoutCount,
+            projectCount: res.locals.projectCount,
+          })
         })
       })
 		})
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 6f60d81..31ba7bf 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -43,7 +43,10 @@
 	    
 			<div class="templates-list">
 			</div>
+
 			<form>
+				<input data-role="create-new-blueprint" class="button_text" type="submit" value="trace a blueprint">
+				<br><br>
 				<input data-role="create-new-layout" class="button_text" type="submit" value="or make your own template">
 			</form>
 		</div>
-- 
cgit v1.2.3-70-g09d2


From c29a5363e3e4e0833e78958fe95b52811d0b0660 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 26 Aug 2015 18:42:13 -0400
Subject: surface blueprints on layouts modal

---
 public/assets/javascripts/ui/site/LayoutsIndex.js  |  85 ++++++++
 public/assets/javascripts/ui/site/LayoutsModal.js  | 221 ++-------------------
 .../assets/javascripts/ui/site/NewProjectModal.js  | 118 +++++++++++
 public/assets/stylesheets/app.css                  |   6 +-
 views/home.ejs                                     |   2 +-
 views/partials/scripts.ejs                         |   2 +
 views/projects/layouts-modal.ejs                   |   4 +-
 7 files changed, 226 insertions(+), 212 deletions(-)
 create mode 100644 public/assets/javascripts/ui/site/LayoutsIndex.js
 create mode 100644 public/assets/javascripts/ui/site/NewProjectModal.js

(limited to 'public/assets/javascripts/ui/site/LayoutsModal.js')

diff --git a/public/assets/javascripts/ui/site/LayoutsIndex.js b/public/assets/javascripts/ui/site/LayoutsIndex.js
new file mode 100644
index 0000000..f7272bb
--- /dev/null
+++ b/public/assets/javascripts/ui/site/LayoutsIndex.js
@@ -0,0 +1,85 @@
+
+var LayoutsIndex = View.extend({
+
+	initialize: function(){
+		this.$templates = this.$(".templates")
+		this.$templatesList = this.$(".templates-list")
+		this.$noTemplates = this.$(".no-templates")
+		this.$form = this.$("form")
+		
+		this.$userTemplatesList = this.$(".userTemplatesList")
+		this.$blueprintsList = this.$(".blueprintsList")
+		this.$newBlueprintButton = this.$("[data-role='create-new-blueprint']")
+	},
+
+	load: function(type){
+		this.$templates.children("span").remove()
+		
+		$.get(this.action, this.populate.bind(this))
+	},
+
+	populate: function(data){
+		if (! data.layouts.length) {
+			this.$templates.hide()
+			this.$form.hide()
+			this.$noTemplates.show()
+		}
+		this.$templatesList.empty()
+		data.layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+		this.show()
+	}
+
+})
+
+
+
+var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
+	el: ".mediaDrawer.projects",
+
+	action: "/api/project",
+
+	events: {
+		"click .templates span": 'toggleActive',
+		"submit form": 'newProject',
+	},
+	
+	populate: function(data){
+		if (! data.length) {
+			app.router.newProject()
+		}
+		else {
+			this.__super__.populate.call(this, data)
+		}
+	},
+	
+	toggleActive: function(e){
+		e.preventDefault()
+		this.$(".templates .active").removeClass("active")
+		var $layout = $(e.currentTarget)
+		$layout.addClass("active")
+				
+		// actually do
+		window.location.pathname = "/project/" + $layout.data("slug") + "/edit"
+	},
+	
+	newProject: function(e){
+		e && e.preventDefault()
+		window.location.pathname = "/project/new"
+	}
+
+})
+
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index a9c6ef0..0222077 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -1,224 +1,35 @@
-
-var LayoutsIndex = View.extend({
-
-	initialize: function(){
-		this.$templates = this.$(".templates")
-		this.$templatesList = this.$(".templates-list")
-		this.$noTemplates = this.$(".no-templates")
-		this.$form = this.$("form")
-		
-		this.$userTemplatesList = this.$(".userTemplatesList")
-		this.$blueprintsList = this.$(".blueprintsList")
-		this.$newBlueprintButton = this.$("[data-role='create-new-blueprint']")
-	},
-
-	load: function(type){
-		this.$templates.children("span").remove()
-		
-		$.get(this.action, this.populate.bind(this))
-	},
-
-	populate: function(data){
-		if (! data.layouts.length) {
-			this.$templates.hide()
-			this.$form.hide()
-			this.$noTemplates.show()
-		}
-		this.$templatesList.empty()
-		data.layouts.forEach(function(room){
-			var $span = $("<span>")
-			$span.data("slug", room.slug)
-			
-			var $label = $("<label>")
-			$label.html( room.name )
-			
-			var $image = $("<span>")
-			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
-			
-      $span.append( $image )
-      $span.append( $label )
-			
-			this.$templatesList.append($span)
-		}.bind(this))
-		this.show()
-	}
-
-})
-
-var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
-	el: ".mediaDrawer.projects",
-
-	action: "/api/project",
-
-	events: {
-		"click .templates span": 'toggleActive',
-		"submit form": 'newProject',
-	},
-	
-	populate: function(data){
-		if (! data.length) {
-			app.router.newProject()
-		}
-		else {
-			this.__super__.populate.call(this, data)
-		}
-	},
-	
-	toggleActive: function(e){
-		e.preventDefault()
-		this.$(".templates .active").removeClass("active")
-		var $layout = $(e.currentTarget)
-		$layout.addClass("active")
-				
-		// actually do
-		window.location.pathname = "/project/" + $layout.data("slug") + "/edit"
-	},
-	
-	newProject: function(e){
-		e && e.preventDefault()
-		window.location.pathname = "/project/new"
-	}
-
-})
-
-
 var LayoutsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 	el: ".mediaDrawer.layouts",
 
 	action: "/api/layout",
 
-	events: {
-		"click .templates span": 'pick',
-		"click .userTemplates span": 'pick',
-		"click .blueprints span": 'pickBlueprint',
-		"submit form": 'newLayout',
-	},
-	
-	pick: function(e){
-		e.preventDefault()
-		var $layout = $(e.currentTarget)
-		window.location.pathname = "/layout/" + $layout.data("slug")
-	},
-
-	pick: function(e){
-		e.preventDefault()
-		var $blueprint = $(e.currentTarget)
-		$blueprint.addClass("active")
-		
-		window.location.pathname = "/layout/" + $layout.data("slug")
-	},
-
-	populate: function(data){
-/*
-	  if (data.user.plan_level < 1 && data.projectCount == 1) {
-	    // show lockout message
-	  }
-*/
-		if (! data.layouts.length) {
-			this.$templates.hide()
-			this.$form.hide()
-			this.$noTemplates.show()
-		}
-		this.$templatesList.empty()
-		data.layouts.forEach(function(room){
-			var $span = $("<span>")
-			$span.data("slug", room.slug)
-			
-			var $label = $("<label>")
-			$label.html( room.name )
-			
-			var $image = $("<span>")
-			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
-			
-      $span.append( $image )
-      $span.append( $label )
-			
-			this.$templatesList.append($span)
-		}.bind(this))
-
-		data.user_layouts.forEach(function(room){
-			var $span = $("<span>")
-			$span.data("slug", room.slug)
-			
-			var $label = $("<label>")
-			$label.html( room.name )
-			
-			var $image = $("<span>")
-			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
-			
-      $span.append( $image )
-      $span.append( $label )
-			
-			this.$userTemplatesList.append($span)
-		}.bind(this))
-		
-		data.blueprints.forEach(function(blueprint){
-			var $span = $("<span>")
-			$span.data("slug", blueprint.slug)
-			
-			var $label = $("<label>")
-			$label.html( blueprint.name )
-			
-			var $image = $("<span>")
-			$image.addClass("image").css("background-image", "url(" + blueprint.url + ")")
-			
-      $span.append( $image )
-      $span.append( $label )
-			
-			this.$blueprintsList.append($span)
-		}.bind(this))
-		
-		this.show()
-	},
-
-	newLayout: function(e){
-		e && e.preventDefault()
-		window.location.pathname = "/layout/new"
-	}
-
-})
-
-
-var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
-	el: ".mediaDrawer.newProject",
-
-	action: "/api/layout",
-
 	events: {
 		"click [data-role='create-new-layout']": 'createNewLayout',
 		"click [data-role='create-new-blueprint']": 'createNewBlueprint',
 		"click .templates span": 'pick',
-		"click .userTemplates span": 'pick',
-		"click .blueprints span": 'pickBlueprint',
-	},
-	
-	toggleActive: function(e){
-		e.preventDefault()
-		this.$(".templates .active").removeClass("active")
-		$(e.currentTarget).addClass("active")
 	},
 	
 	pick: function(e){
-		e && e.preventDefault()
-// 		var layout = this.$(".templates .active").data("slug")
+		e.preventDefault()
  		var layout = $(e.currentTarget).data("slug")
  		var isBlueprint = $(e.currentTarget).data("blueprint")
+
 		if (! layout || ! layout.length) return
 		
 		if (isBlueprint) {
-      window.location.pathname = "/project/blueprint/" + layout
+      window.location.pathname = "/blueprint/" + layout
 		}
 		else {
-      window.location.pathname = "/project/new/" + layout
+      window.location.pathname = "/layout/" + layout
 		}
-	},
+  },
 
 	createNewLayout: function(e){
 	  e.preventDefault()
-	  window.location.pathname = "/project/new/empty"
+	  window.location.pathname = "/layout/new"
 	},
 
-	createNewBlueprint: function(s){
+	createNewBlueprint: function(e){
 	  e.preventDefault()
 	  window.location.pathname = "/blueprint/new"
 	},
@@ -227,7 +38,6 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 /*
 	  if (data.user.plan_level < 1 && data.projectCount == 1) {
 	    // show lockout message
-      this.$newBlueprintButton.hide()
 	  }
 */
 		if (! data.layouts.length) {
@@ -235,13 +45,6 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 			this.$form.hide()
 			this.$noTemplates.show()
 		}
-		if (! data.blueprints.length) {
-		  this.$blueprintsList.parent().hide()
-    }
-		if (! data.user_layouts.length) {
-		  this.$userTemplatesList.parent().hide()
-    }
-
 		this.$templatesList.empty()
 		data.layouts.forEach(function(room){
 			var $span = $("<span>")
@@ -276,11 +79,9 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		}.bind(this))
 		
 		data.blueprints.forEach(function(blueprint){
-		  if (! blueprint.slug) { return }
-		  
 			var $span = $("<span>")
-			$span.data("blueprint", true)
 			$span.data("slug", blueprint.slug)
+			$span.data("blueprint", true)
 			
 			var $label = $("<label>")
 			$label.html( blueprint.name )
@@ -297,5 +98,9 @@ var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		this.show()
 	},
 
-	
+	newLayout: function(e){
+		e && e.preventDefault()
+		window.location.pathname = "/layout/new"
+	}
+
 })
diff --git a/public/assets/javascripts/ui/site/NewProjectModal.js b/public/assets/javascripts/ui/site/NewProjectModal.js
new file mode 100644
index 0000000..31675ba
--- /dev/null
+++ b/public/assets/javascripts/ui/site/NewProjectModal.js
@@ -0,0 +1,118 @@
+var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({
+	el: ".mediaDrawer.newProject",
+
+	action: "/api/layout",
+
+	events: {
+		"click [data-role='create-new-layout']": 'createNewLayout',
+		"click [data-role='create-new-blueprint']": 'createNewBlueprint',
+		"click .templates span": 'pick',
+	},
+	
+	toggleActive: function(e){
+		e.preventDefault()
+		this.$(".templates .active").removeClass("active")
+		$(e.currentTarget).addClass("active")
+	},
+	
+	pick: function(e){
+		e && e.preventDefault()
+// 		var layout = this.$(".templates .active").data("slug")
+ 		var layout = $(e.currentTarget).data("slug")
+ 		var isBlueprint = $(e.currentTarget).data("blueprint")
+		if (! layout || ! layout.length) return
+		
+		if (isBlueprint) {
+      window.location.pathname = "/project/blueprint/" + layout
+		}
+		else {
+      window.location.pathname = "/project/new/" + layout
+		}
+	},
+
+	createNewLayout: function(e){
+	  e.preventDefault()
+	  window.location.pathname = "/project/new/empty"
+	},
+
+	createNewBlueprint: function(e){
+	  e.preventDefault()
+	  window.location.pathname = "/blueprint/new"
+	},
+
+	populate: function(data){
+/*
+	  if (data.user.plan_level < 1 && data.projectCount == 1) {
+	    // show lockout message
+      this.$newBlueprintButton.hide()
+	  }
+*/
+		if (! data.layouts.length) {
+			this.$templates.hide()
+			this.$form.hide()
+			this.$noTemplates.show()
+		}
+		if (! data.blueprints.length) {
+		  this.$blueprintsList.parent().hide()
+    }
+		if (! data.user_layouts.length) {
+		  this.$userTemplatesList.parent().hide()
+    }
+
+		this.$templatesList.empty()
+		data.layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+
+		data.user_layouts.forEach(function(room){
+			var $span = $("<span>")
+			$span.data("slug", room.slug)
+			
+			var $label = $("<label>")
+			$label.html( room.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + room.photo + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+		
+		data.blueprints.forEach(function(blueprint){
+		  if (! blueprint.slug) { return }
+		  
+			var $span = $("<span>")
+			$span.data("blueprint", true)
+			$span.data("slug", blueprint.slug)
+			
+			var $label = $("<label>")
+			$label.html( blueprint.name )
+			
+			var $image = $("<span>")
+			$image.addClass("image").css("background-image", "url(" + blueprint.url + ")")
+			
+      $span.append( $image )
+      $span.append( $label )
+			
+			this.$templatesList.append($span)
+		}.bind(this))
+		
+		this.show()
+	},
+
+	
+})
\ No newline at end of file
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index a1bb466..634ea60 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2784,7 +2784,7 @@ form input[type="submit"]:hover {
 	border:1px solid black;
 	cursor:pointer;
 }
-form p{
+form p {
 	display: block;
 	float: left;
 	font-size: 15px;
@@ -3361,6 +3361,10 @@ a[data-role="forgot-password"] {
 }
 
 
+[data-role="create-new-blueprint"] {
+  margin-bottom: 10px;
+}
+
 /* KEYBOARD SHORTCUTS */
 
 .keyboard { float: left; width: 50%; margin-top: 50px; }
diff --git a/views/home.ejs b/views/home.ejs
index 6d76f1c..14fc0e3 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -8,7 +8,7 @@
 	<div class="rapper page home">
 	[[ include partials/header ]]
 
-	<div class="hero" style="background-image:url(http://okfocus.s3.amazonaws.com/images/vvalls-video-still1.jpg)">
+	<div class="hero" style="background-image:url(http://okfocus.s3.amazonaws.com/images/vvalls-video-still2.jpg)">
 			<div class="holder">
 				<span class="circle">
 				<span class="videoTitle">Create 3D Rooms</span><br>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index af7fe96..bac4120 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -121,7 +121,9 @@
 <script type="text/javascript" src="/assets/javascripts/ui/site/UsernameTaken.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/site/PasswordForgot.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/site/PasswordReset.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/LayoutsIndex.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/site/LayoutsModal.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/NewProjectModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/site/EditProjectModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/site/EditProfileModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/site/EditSubscriptionModal.js"></script>
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 31ba7bf..0d648cd 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -7,7 +7,8 @@
 			<div class="templates-list">
 			</div>
 			<form>
-				<input data-role="create-new-layout" class="button_text" type="submit" value="New Layout">
+				<input data-role="create-new-blueprint" class="button_text" type="submit" value="Trace a Blueprint">
+				<input data-role="create-new-layout" class="button_text" type="submit" value="Make a Standard Layout">
 			</form>
 		</div>
 		<div class="no-templates">
@@ -46,7 +47,6 @@
 
 			<form>
 				<input data-role="create-new-blueprint" class="button_text" type="submit" value="trace a blueprint">
-				<br><br>
 				<input data-role="create-new-layout" class="button_text" type="submit" value="or make your own template">
 			</form>
 		</div>
-- 
cgit v1.2.3-70-g09d2