From 2e9c0d71512da037a29e823da2c9b935b024b9d2 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Wed, 11 Jun 2014 19:24:50 -0400
Subject: clone & clear

---
 server/lib/views.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'server')

diff --git a/server/lib/views.js b/server/lib/views.js
index bb9e5ae..125908f 100644
--- a/server/lib/views.js
+++ b/server/lib/views.js
@@ -26,7 +26,6 @@ views.builder = function (req, res) {
 	res.render('builder')
 }
 
-
 views.modal = function (req, res) {
 	res.render('modal', {
 	});
@@ -66,7 +65,7 @@ views.docs = function (req, res){
 }
 
 views.profile = function (req, res) {
-	var username = req.params[0] || req.user.username
+	var username = req.params[0] || (req.user && req.user.username)
 	if (username) {
 		User.findOne({ username: username }, function (err, user) {
 			user ? next(user) : done(err, {}, [])
-- 
cgit v1.2.3-70-g09d2


From 11d10502920b2f32ba8930f97babba1ddf39ba2e Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Wed, 11 Jun 2014 23:54:43 -0400
Subject: delete layouts

---
 public/assets/javascripts/ui/builder/BuilderSettings.js | 17 ++++++++++++++---
 public/assets/stylesheets/app.css                       |  1 +
 server/lib/api.js                                       |  3 ++-
 views/controls/builder/settings.ejs                     |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'server')

diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js
index f5bf51c..66bf84b 100644
--- a/public/assets/javascripts/ui/builder/BuilderSettings.js
+++ b/public/assets/javascripts/ui/builder/BuilderSettings.js
@@ -4,13 +4,14 @@ var BuilderSettings = FormView.extend({
 	
 	createAction: "/api/layouts/new",
 	updateAction: "/api/layouts/edit",
+	destroyAction: "/api/layouts/destroy",
 
 	events: {
 		"keydown [name=name]": 'enterSubmit',
 		"click [data-role='save-layout']": 'save',
 		"click [data-role='clone-layout']": 'clone',
 		"click [data-role='clear-layout']": 'clear',
-		"click [data-role='delete-layout']": 'delete',
+		"click [data-role='destroy-layout']": 'destroy',
 	},
 	
 	initialize: function(opt){
@@ -54,8 +55,18 @@ var BuilderSettings = FormView.extend({
 		Rooms.removeAll()
 	},
 	
-	delete: function(){
-		
+	destroy: function(){
+		var msg = "Are you sure you want to delete the layout " + sanitize(this.$name.val()) + "?"
+		ConfirmModal.confirm(msg, $.proxy(function(){
+			$.ajax({
+				url: this.destroyAction,
+				type: "delete",
+				data: { _id: this.$id.val(), _csrf: this.$csrf.val() },
+				success: function(data){
+					window.location.href = "/builder"
+				}
+			})
+		}, this))
 	},
 
 	toggle: function(){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 49dfd98..b785f54 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -462,6 +462,7 @@ h5{
   background-position: center;
   background-size: contain;
   background-repeat: no-repeat;
+  background-color: #fff;
   background-image: url(http://upload.wikimedia.org/wikipedia/commons/d/d9/Graceland_Memphis_TN_Floorplan_Basement.jpg);
   width: 20vw;
   height: 20vh;
diff --git a/server/lib/api.js b/server/lib/api.js
index f7be925..0c31d1d 100644
--- a/server/lib/api.js
+++ b/server/lib/api.js
@@ -208,7 +208,8 @@ var api = {
 
 		destroy: function(req, res){
 			var _id = req.body._id
-			if (! id || ! id.length) {
+			console.log(_id)
+			if (! _id || ! _id.length) {
 				res.json({ error: 404 })
 				return
 			}
diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs
index 0083b9f..dd2496b 100644
--- a/views/controls/builder/settings.ejs
+++ b/views/controls/builder/settings.ejs
@@ -33,7 +33,7 @@
 	<div class="setting subButtons">
 		<a href="#" data-role="clear-layout">Clear</a>
 		<a href="#" data-role="clone-layout">Clone</a>
-		<a href="#" data-role="delete-layout">Delete</a>
+		<a href="#" data-role="destroy-layout">Delete</a>
 	</div>
 
 </div>
-- 
cgit v1.2.3-70-g09d2