From e06fa1dc74532463d64060e2ba21799848a8e47e Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Tue, 30 Sep 2014 17:46:54 -0400
Subject: stylez

---
 views/projects/layouts-modal.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views/projects/layouts-modal.ejs')

diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 34dc9af..24a83b7 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -33,7 +33,7 @@
 	<span class="close">X</span>
 	<div class="box">
 		
-    <h1>Choose Room Template</h1>
+    <h2>Choose Room Template</h2>
 		<div class="templates">
 		</div>
 		<div class="no-templates">
-- 
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 'views/projects/layouts-modal.ejs')

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 a947614e0c449795906d145ecbb478cdc3124a95 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Wed, 8 Oct 2014 16:23:47 -0400
Subject: slightly better modal

---
 public/assets/stylesheets/app.css | 18 +++++++++++-------
 views/projects/layouts-modal.ejs  | 14 ++++++++------
 2 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'views/projects/layouts-modal.ejs')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index aeb05a1..1328006 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -664,10 +664,14 @@ iframe.embed {
 }
 .templates {
 	overflow: auto;
-	max-height: 80%;
+	max-height: 100%;
+	width: 100%;
+	padding: 20px 0 40px 0;
+}
+.templates-list {
+	display: inline-block;
 	width: 100%;
 }
-
 .templates::-webkit-scrollbar {
     width: 5px;
     height: 5px;
@@ -687,11 +691,11 @@ border-left: 1px solid black;
 }
 
 .templates span {
-  display: block;
-  float: left;
-  margin: 2vw;
-  padding: 2vw;
-  cursor:pointer;
+	display: block;
+	float: left;
+	margin: 1vw 0;
+	padding: 2vw;
+	cursor: pointer;
 }
 .templates span .image {
   background-position: center;
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 8754617..dcc53e6 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -3,16 +3,17 @@
 	<div class="box">
 		
 		<div class="templates">
-			<h1>Edit Room Layouts</h1>
+			<h2>Edit Room Layouts</h2>
 			<div class="templates-list">
 			</div>
+			<form>
+				<input data-role="create-new-layout" class="button_text" type="submit" value="New Layout">
+			</form>
 		</div>
 		<div class="no-templates">
 			There are no room layouts available. Please <a href="/layout/new">create a new one.</a>
 		</div>
-		<form>
-			<input data-role="create-new-layout" class="button_text" type="submit" value="New Layout">
-		</form>
+
 	</div>
 </div>
 
@@ -21,7 +22,7 @@
 	<div class="box">
 		
 		<div class="templates">
-			<h1>Your Projects</h1>
+			<h2>Your Projects</h2>
 			<div class="templates-list">
 			</div>
 		</div>
@@ -37,8 +38,9 @@
 	<span class="close">X</span>
 	<div class="box">
 		
-    <h2>Choose Room Template</h2>
 		<div class="templates">
+			<h2>Select a Room Template</h2>
+	    
 			<div class="templates-list">
 			</div>
 		</div>
-- 
cgit v1.2.3-70-g09d2


From 0db06769ef542eb9d62b53383d0abeff852bc5db Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Wed, 8 Oct 2014 16:44:48 -0400
Subject: make your own

---
 views/projects/layouts-modal.ejs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'views/projects/layouts-modal.ejs')

diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index dcc53e6..6f60d81 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -43,6 +43,9 @@
 	    
 			<div class="templates-list">
 			</div>
+			<form>
+				<input data-role="create-new-layout" class="button_text" type="submit" value="or make your own template">
+			</form>
 		</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 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 'views/projects/layouts-modal.ejs')

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 'views/projects/layouts-modal.ejs')

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