From 583d213f22be93a1363c24ac2cdf9f083833703f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 14:47:47 -0400
Subject: projectList item formatting

---
 views/projects/list-projects.ejs | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'views')

diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index a12f237..f469f5c 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -4,31 +4,31 @@
 
 		[[ projects.forEach(function(project, i) { ]]
 
-			<span class="room">
-        <span class="images">
-          <img src="[[- project.photo ]]">
+      [[ if (String(user._id) == String(project.user_id)) { ]]
+      <a href="/project/[[- project.slug ]]/edit">
+      [[ } else { ]]
+      <a href="/project/[[- project.slug ]]" class="roomName">
+      [[ } ]]
+
+			<span class="room" style="background-color: rgb([[- project.color ]]);">
+        <span class="images" data-mediaCount="[[- Math.min(project.media.length, 1) ]]">
           [[ mediaCount = 0 ]]
           [[ project.media.some(function(media){ ]]
             [[ if (media.media.type != "image") { return false } ]]
-            [[ if (++mediaCount > 3) { return true } ]]
+            [[ if (++mediaCount > 1) { return true } ]]
             <img src="[[- media.media.url ]]">
           [[ }) ]]
 			  </span>
-
-				<div class="holder">
-			 	 [[ if (String(user._id) == String(project.user_id)) { ]]
-         <a href="/project/[[- project.slug ]]/edit">
-					 [[- project.name ]]<br>
-				 	 [[- project.date ]]
-				 </a>
-				 [[ } else  { ]]
-					<a href="/project/[[- project.slug ]]" class="roomName">
-						[[- project.name ]]<br>
-						[[- project.date ]]
-					[[ } ]]
-				</div>
+        <span class="mask" style="background-image: url([[- project.photo ]]);">
+        </span>
 			</span>
 
+      <label>
+        [[- project.name ]]<br>
+        Created &ndash; [[- project.date ]]
+      </label>
+
+      </a>
 		[[ }) ]]
 	</div>
 
-- 
cgit v1.2.3-70-g09d2


From 18807004461e3d0c0e3483a0acaccf879df33884 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Wed, 8 Oct 2014 15:53:23 -0400
Subject: no projects thingy

---
 public/assets/stylesheets/app.css | 50 +++++++++++++++++++++++++++++++++++----
 views/profile.ejs                 | 20 ++++++++++++----
 2 files changed, 62 insertions(+), 8 deletions(-)

(limited to 'views')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 60c66f8..76196be 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -10,7 +10,7 @@ body,textarea,input {
 	font-family: 'Lato', sans-serif;
 }
 input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
-	background:white;
+	background:white!important;
 }
 *, *:before, *:after {
   moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
@@ -437,7 +437,7 @@ iframe.embed {
 .page h1 {
 	font-size: 80px;
 	font-weight: 100;
-	padding: 60px 0 25px 0;
+	padding: 20px 0 25px 0;
 	float: left;
 	width: 100%;
 	border-top: 1px solid;
@@ -476,6 +476,8 @@ iframe.embed {
 	width: 100%;
 	padding: 80px 0;
 	background: #f9f9f9;
+	float: left;
+	clear: both;
 }
 
 .footer a, .footer span{
@@ -614,11 +616,49 @@ iframe.embed {
 
 .profilepage .bio span:last-of-type:after { display: none; }
 
+.profilepage .about h2 {
+	text-align: center;
+	font-weight: 300;
+	font-size: 32px;
+}
+.profilepage .about h2:nth-child(2){
+	margin:34px 0;
+}
+.about {
+	background-color: #ffffff;background-image:url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScyODkuNScgaGVpZ2h0PScyODkuNScgdmlld0JveD0nMCAwIDI4OS41IDI4OS41Jz4KCTxkZWZzPgoJCTxwYXR0ZXJuIGlkPSdibHVlc3RyaXBlJyBwYXR0ZXJuVW5pdHM9J3VzZXJTcGFjZU9uVXNlJyB4PScwJyB5PScwJyB3aWR0aD0nNTcuOScgaGVpZ2h0PSc1Ny45JyB2aWV3Qm94PScwIDAgMTE1LjggMTE1LjgnID4KCQk8cmVjdCB3aWR0aD0nMTEwJScgaGVpZ2h0PScxMTAlJyBmaWxsPScjZmZmZmZmJy8+CgkJCTxwYXRoIGQ9J00xLDFoMTE1Ljh2MTE1LjhoLTExNS44di0xMTUuOCcgZmlsbC1vcGFjaXR5PScwJyBzdHJva2Utd2lkdGg9JzAuOCcgc3Ryb2tlLWRhc2hhcnJheT0nMCwxLDEnIHN0cm9rZT0nI2NjY2NjYycvPgoJCTwvcGF0dGVybj4gCgkJPGZpbHRlciBpZD0nZnV6eicgeD0nMCcgeT0nMCc+CgkJCTxmZVR1cmJ1bGVuY2UgdHlwZT0ndHVyYnVsZW5jZScgcmVzdWx0PSd0JyBiYXNlRnJlcXVlbmN5PScuMiAuMycgbnVtT2N0YXZlcz0nNScgc3RpdGNoVGlsZXM9J3N0aXRjaCcvPgoJCQk8ZmVDb2xvck1hdHJpeCB0eXBlPSdzYXR1cmF0ZScgaW49J3QnIHZhbHVlcz0nMCcvPgoJCTwvZmlsdGVyPgoJPC9kZWZzPgoJPHJlY3Qgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScgZmlsbD0ndXJsKCNibHVlc3RyaXBlKScvPgo8cmVjdCB3aWR0aD0nMTAwJScgaGVpZ2h0PScxMDAlJyBmaWx0ZXI9J3VybCgjZnV6eiknIG9wYWNpdHk9JzAnLz4KPC9zdmc+Cg==');
+	background-attachment: fixed;
+	
+}
+.profilepage .about h2 .btn {
+	border: 1px solid;
+	font-weight: 500;
+	padding: 10px;
+	font-size: 18px;
+}
+.profilepage .about h2 .btn:hover {
+	background:black;
+	color:white;
+}
 .templates {
 	overflow: auto;
 	max-height: 80%;
 	width: 100%;
 }
+
+.templates::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+}
+
+.templates::-webkit-scrollbar-thumb {
+background-color: white;
+border-left: 1px solid black;
+}
+
+.templates::-webkit-scrollbar-track {
+	background-color: transparent;
+}
+
 .no-templates {
 	display: none;
 }
@@ -628,8 +668,8 @@ iframe.embed {
   background-size: contain;
   background-repeat: no-repeat;
   background-color: #fff;
-  width: 20vw;
-  height: 20vw;
+	width: 15vw;
+	height: 14vw;
   display: inline-block;
   margin: 4vw;
   background-color: #ddd;
@@ -1899,6 +1939,8 @@ form div.hidden {
 }
 form h3.link {
 	content:"?";
+	margin-top: 0;
+	padding: 0 0 10px 0;
 }
 form h3.link:after {
 	content:"?";
diff --git a/views/profile.ejs b/views/profile.ejs
index d977844..adc9562 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -41,7 +41,7 @@
 				[[ } ]]
 			</div>
 			</div>
-	</div>
+
 
 	[[ if (projects.length) { ]]
 		<h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1>
@@ -50,11 +50,23 @@
 
     <a href="#" class="viewMore btn">view more</a>
   [[ } else { ]]
+	
     <h1>Welcome to VVALLS</h1>
-    <br><br>
-    You don't have any projects yet.  To get started click "New Project" up at the top of the screen.
+    <div class="projectList about">
+    	<h2>
+				VValls lets you create awesome 3D rooms. 
+			</h2>
+			
+    	<h2>
+				You don't have any projects yet.
+			</h2>
+			<h2>
+				<a href="#"class="btn">Create a New Project</a>
+			</h2>
+			
+		</div>
 	[[ } ]]
-	
+		</div>
 	[[ include partials/edit-profile ]]
 	[[ include projects/layouts-modal ]]	
 	[[ include projects/edit-project ]]
-- 
cgit v1.2.3-70-g09d2


From 32710444724fa6271d7d1d86a917be3b7457217c Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Wed, 8 Oct 2014 15:54:05 -0400
Subject: data role

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

(limited to 'views')

diff --git a/views/profile.ejs b/views/profile.ejs
index adc9562..5ff2eb0 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -61,7 +61,7 @@
 				You don't have any projects yet.
 			</h2>
 			<h2>
-				<a href="#"class="btn">Create a New Project</a>
+				<a href="#"class="btn" data-role="new-project-modal">Create a New Project</a>
 			</h2>
 			
 		</div>
-- 
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 'views')

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 'views')

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')

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 5b12dd422167c5aaf210d49d57b78312eb209b94 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 16:41:54 -0400
Subject: images in a stack

---
 public/assets/javascripts/ui/site/ProjectList.js | 20 ++++++++++++++++++--
 public/assets/stylesheets/app.css                | 13 ++++++++++---
 views/projects/list-projects.ejs                 |  6 +++---
 3 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'views')

diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js
index 993d805..149cd41 100644
--- a/public/assets/javascripts/ui/site/ProjectList.js
+++ b/public/assets/javascripts/ui/site/ProjectList.js
@@ -4,13 +4,28 @@ var ProjectList = View.extend({
 	el: ".projectList",
 
 	events: {
-		"mouseenter .room": 'spinOn',
-		"mouseleave .room": 'spinOff',
+		"mouseenter .room": 'enter',
+		"mouseleave .room": 'leave',
 	},
 	
 	initialize: function(){
 	},
 	
+	timeout: null,
+	enter: function(){
+    clearTimeout(this.timeout)
+    this.advance()
+	},
+	
+	leave: function(){
+    clearTimeout(this.timeout)
+	},
+	
+	advance: function(){
+    this.timeout = setTimeout(this.advance.bind(this), 500)
+	}
+	
+/*
 	spinOn: function(e){
 		var iframe = $(e.currentTarget).find("iframe").get('0')
 		if (! iframe) return
@@ -22,5 +37,6 @@ var ProjectList = View.extend({
 		if (! iframe) return
 		iframe.contentWindow.postMessage("spin-off", window.location.origin)
 	}
+*/
 
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 1328006..35ed951 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -360,17 +360,23 @@ iframe.embed {
 .room .images {
   position: absolute;
   top: 0; left: 0;
-  z-index: 2;
+  z-index: -1;
   width: 100%;
   height: 100%;
   text-align: center;
   overflow: hidden;
 }
-.room .images img {
-  width: 30%;
+.room .images div {
   position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-size: cover;
+  background-position: center center;
 }
 
+/*
 .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: 40%; }
@@ -384,6 +390,7 @@ iframe.embed {
 .room .images[data-mediacount='4'] img:nth-child(2) { left: 51%; bottom: 61%; }
 .room .images[data-mediacount='4'] img:nth-child(3) { right: 51%; top: 61%; }
 .room .images[data-mediacount='4'] img:nth-child(4) { left: 51%; top: 41%; }
+*/
 
 .page .btn {
 	clear: both;
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 45b73e2..c47dee0 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -13,12 +13,12 @@
 			<span class="room" style="background-color: rgb([[- project.color ]]);">
         <span class="mask" style="background-image: url([[- project.photo ]]);">
         </span>
-        <span class="images" data-mediaCount="[[- Math.min(project.media.length, 3) ]]">
+        <span class="images" data-mediaCount="[[- Math.min(project.media.length, 4) ]]">
           [[ mediaCount = 0 ]]
           [[ project.media.some(function(media){ ]]
             [[ if (media.media.type != "image") { return false } ]]
-            [[ if (++mediaCount > 3) { return true } ]]
-            <img src="[[- media.media.url ]]">
+            [[ if (++mediaCount > 4) { return true } ]]
+            <div style="background-image:url([[- media.media.url ]])"></div>
           [[ }) ]]
 			  </span>
 			</span>
-- 
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')

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 1258966c2879faffc7148b2d58ebc91985c6afc2 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 18:10:27 -0400
Subject: no media warning

---
 public/assets/javascripts/ui/editor/MediaUpload.js | 1 -
 public/assets/javascripts/ui/editor/MediaViewer.js | 4 ++++
 views/controls/editor/media-drawer.ejs             | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'views')

diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 669248e..3f425c3 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -42,7 +42,6 @@ var MediaUpload = UploadView.extend({
 			}
 			
 			media._csrf = $("[name=_csrf]").val()
-			console.log(media)
 			
 			var request = $.ajax({
 				type: "post",
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index b51d8f2..1414e16 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -20,6 +20,7 @@ var MediaViewer = ModalView.extend({
 		this.$foundMedia = this.$(".foundMedia")
 		this.$foundToggle = this.$(".foundToggle")
 		this.$deleteMedia = this.$("#deleteMedia")
+		this.$noMedia = this.$(".noMedia")
   },
 
 	foundToggle: function(){
@@ -103,9 +104,11 @@ var MediaViewer = ModalView.extend({
 		  data.forEach(function(media){
 		    this.add(media, this.$myMedia)
 		  }.bind(this))
+		  this.$noMedia.hide()
       this.$deleteMedia.show()
 		}
 		else {
+		  this.$noMedia.show()
 		  this.$deleteMedia.hide()
 		}
 		this.__super__.show.call(this)
@@ -176,6 +179,7 @@ var MediaViewer = ModalView.extend({
 
 			if ($(".myMedia .mediaContainer").length == 0) {
         this.$deleteMedia.hide()
+        this.$noMedia.show()
         this.deleteArmed(false)
 			}
 			return
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 10a160e..dedfbb0 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -20,6 +20,7 @@
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
 
 	<div class="myMedia">
+	  <div class="noMedia">You have no media yet.  Upload some!</div>
 	</div>
 	
 	<div class="foundMedia">
-- 
cgit v1.2.3-70-g09d2


From b86a0ac642a2623fd9d8346c2691ef5a2d290b56 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Wed, 8 Oct 2014 18:15:31 -0400
Subject: favicon

---
 public/assets/stylesheets/app.css      |  29 ++++++++++++++++++-----------
 public/favicon.ico                     | Bin 0 -> 32988 bytes
 views/controls/editor/media-drawer.ejs |   2 +-
 views/home.ejs                         |   2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 public/favicon.ico

(limited to 'views')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d384dea..3aafc7d 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -246,6 +246,11 @@ h5 {
 	display: inline-block;
 }
 
+.projectList {
+	border-top: 1px solid;
+}
+
+
 .projectList.about {
 	text-align: left;
 	border-top: 1px solid;
@@ -415,18 +420,15 @@ iframe.embed {
 }
 
 .page .projectList label {
-	font-weight: 100;
+	font-weight: 600;
 	font-size: 12px;
 	color: black;
-	padding: 5px;
 	text-decoration: none;
 	display: inline-block;
 	cursor: pointer;
 	border: 1px solid transparent;
-	text-transform: uppercase;
-	font-family: monospace;
 	line-height: 18px;
-	letter-spacing: 1px;
+	padding:0 5px;
 }
 
 .page .room .holder a:hover {
@@ -1080,10 +1082,13 @@ border-left: 1px solid black;
 .mediaDrawer {
   -webkit-transform:translateY(-100%);
   transform:translateY(-100%);
-  background:rgba(255,255,255,0.9);
+  background:white;
   text-align:center;
   overflow-x: hidden;
 }
+.editing .mediaDrawer {
+	background:rgba(255,255,255,0.95);
+}
 .mediaDrawer.active {
   -webkit-transform:translateY(0%);
   transform:translateY(0%);
@@ -1203,7 +1208,7 @@ border-left: 1px solid black;
   border: 1px solid #ccc;
   font-size: 15px;
   padding: 5px;
-  width: 220px;
+  width: 290px;
   text-align: center;
   border-radius: 20px;
 }
@@ -1295,8 +1300,6 @@ border-left: 1px solid black;
   color:white;
 }
 
-.deleteArmed .mediaContainer {
-}
 
 .deleteArmed .mediaContainer:hover {
   background:#FF3B30;
@@ -1352,12 +1355,11 @@ border-left: 1px solid black;
 
 
 .mediaContainer {
-  border: 1px solid white;
   display: inline-block;
   width: 25%;
   margin: 4%;
   vertical-align: top;
-  border:1px solid white;
+  border:1px solid transparent;
   padding:2%;
 }
 .mediaContainer:hover {
@@ -2447,6 +2449,11 @@ a[data-role="forgot-password"] {
 	width: 50%;
 	height: 180px;
 	}
+	.profilepage .about h2 {
+	text-align: center;
+	font-weight: 500;
+	font-size: 17px;
+	}
 	.projectList.about {
 	text-align: center;
 	padding: 20px 0;
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..19c9da3
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 10a160e..22ae43f 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -6,7 +6,7 @@
 		<input type="file" accept="image/*" class="file" multiple>
 	</form>
 	<small>~ or ~</small><br>
-	<input type="text" placeholder="Enter Vimeo or YouTube Link" class="url">
+	<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
 </span>
 
 <div class="ants">
diff --git a/views/home.ejs b/views/home.ejs
index 51d5a92..659e1bc 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -23,7 +23,7 @@
 			</div>
 	</div>
 	
-	<h1>Whats VValls For?</h1>
+	<h1>What's VValls For?</h1>
 	
 	<div class="projectList about">
 		<div class="item wow bounceInLeft">
-- 
cgit v1.2.3-70-g09d2


From 4d4add72dec5d5f1db96430fe2de21c09451ebea Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 9 Oct 2014 17:26:24 -0400
Subject: feature projects, show featured projects on homepage, fix profile
 sort

---
 public/assets/javascripts/ui/site/StaffView.js | 23 ++++++++++++++
 public/assets/stylesheets/app.css              |  3 ++
 server/lib/schemas/Project.js                  |  1 +
 server/lib/views/index.js                      | 42 +++++++++++++++++---------
 server/lib/views/staff.js                      | 15 +++++++++
 views/home.ejs                                 |  5 ++-
 views/staff/projects/show.ejs                  | 13 ++++++++
 7 files changed, 84 insertions(+), 18 deletions(-)

(limited to 'views')

diff --git a/public/assets/javascripts/ui/site/StaffView.js b/public/assets/javascripts/ui/site/StaffView.js
index fdf39d2..0398f71 100644
--- a/public/assets/javascripts/ui/site/StaffView.js
+++ b/public/assets/javascripts/ui/site/StaffView.js
@@ -3,14 +3,19 @@ var StaffView = View.extend({
   
   events: {
     "click #toggle-staff": "toggleStaff",
+    "click #toggle-featured": "toggleFeatured",
   },
 
 	initialize: function() {
 		this.$toggleStaff = $("#toggle-staff")
+		this.$toggleFeatured = $("#toggle-featured")
 		this.$mediaEmbed = $("#media-embed")
     if (this.$toggleStaff.length && this.$toggleStaff.data().isstaff) {
       this.$toggleStaff.html("Is Staff")
     }
+    if (this.$toggleFeatured.length && this.$toggleFeatured.data().featured) {
+      this.$toggleFeatured.html("Featured Project")
+    }
     if (this.$mediaEmbed.length) {
       var media = this.$mediaEmbed.data()
       this.$mediaEmbed.html( Parser.tag( media ) )
@@ -44,6 +49,24 @@ var StaffView = View.extend({
         }.bind(this)
       })
     }.bind(this))
+  },
+
+  toggleFeatured: function(){
+    var state = ! this.$toggleFeatured.data().featured
+    $.ajax({
+      type: "put",
+      dataType: "json",
+      url: window.location.href + "/feature",
+      data: {
+        state: state,
+        _csrf: $("#_csrf").val(),
+      },
+      success: function(data){
+        this.$toggleFeatured.data("featured", data.state)
+        this.$toggleFeatured.html(data.state ? "Featured Project" : "Feature this project")
+        $("#isFeaturedProject").html(data.state ? "yes" : "no")
+      }.bind(this)
+    })
   },	
 
 })
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9a2f6f8..85d14eb 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -357,6 +357,9 @@ iframe.embed {
 	background-color: #ddd;
   background-size: cover;
 }
+.projectList a:hover .room .mask {
+  background-color: rgba(238,238,238,0.1);
+}
 .room .images {
   position: absolute;
   top: 0; left: 0;
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index abf34fb..dd50da6 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -35,6 +35,7 @@ var ProjectSchema = new mongoose.Schema({
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },
 	updated_at: { type: Date },
+	featured: { type: Boolean, default: false },
 });
 
 module.exports = exports = mongoose.model('project', ProjectSchema);
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 3f3880f..1b547ef 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -79,10 +79,20 @@ views.modal = function (req, res) {
 
 views.home = function (req, res) {
 	if (req.user) {
-		Project.find({ privacy: false })
+		Project.find({ featured: true })
 		  .sort('-created_at')
-		  .limit(20)
+		  .limit(6)
 		  .exec(function(err, projects){
+        projects = projects.map(function(project){
+          project = project.toObject()
+          project.date = moment(project.updated_at).format("M/DD/YYYY")
+          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+            project.color = [238,238,238]
+          } else {
+            project.color = project.colors.wall
+          }
+          return project
+        })
 				res.render('home', { projects: projects || [] })
 			})
 	}
@@ -135,19 +145,21 @@ views.profile = function (req, res) {
 		if ( ! (req.user && req.user._id && req.user._id == user._id) ) {
 			criteria.privacy = false
 		}
-		Project.find(criteria, function(err, projects){
-			projects = projects.map(function(project){
-				project = project.toObject()
-				project.date = moment(project.updated_at).format("M/DD/YYYY")
-				if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
-				  project.color = [238,238,238]
-				} else {
-				  project.color = project.colors.wall
-				}
-				return project
-			})
-			done(err, user, projects)
-		})
+		Project.find(criteria)
+		  .sort('-created_at')
+      .exec(function(err, projects){
+        projects = projects.map(function(project){
+          project = project.toObject()
+          project.date = moment(project.updated_at).format("M/DD/YYYY")
+          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+            project.color = [238,238,238]
+          } else {
+            project.color = project.colors.wall
+          }
+          return project
+        })
+        done(err, user, projects)
+      })
 	}
 	
 	function done(err, user, projects){
diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js
index 41877c8..da09d83 100644
--- a/server/lib/views/staff.js
+++ b/server/lib/views/staff.js
@@ -389,6 +389,15 @@ var staff = module.exports = {
 
       staff.projects.show
     );
+    app.put('/staff/projects/:slug/feature',
+      middleware.ensureAuthenticated,
+      middleware.ensureIsStaff,
+
+      middleware.ensureProject,
+      staff.middleware.ensureProject,
+
+      staff.projects.feature
+    );
     
     //
     // media
@@ -505,6 +514,12 @@ var staff = module.exports = {
         res.render('staff/projects/show_404')
       }
     },
+    feature: function(req, res){
+      res.locals.project.featured = req.body.state == "true"
+      res.locals.project.save(function(err, project){
+        res.json({ state: project.featured })
+      })
+    },
   },
   
   media: {
diff --git a/views/home.ejs b/views/home.ejs
index 51d5a92..7ec8c1e 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -62,10 +62,9 @@
 	</div>
 	
 	<h1>Room Showcase</h1>
-	<img src="https://s3.amazonaws.com/uploads.hipchat.com/14935/55226/twq38ErgSnriaOq/vvalls-thumbnail-options2.gif" style="border-top:1px solid;width:100%">
-	<!--
+
 	[[ include projects/list-projects ]]
-	-->
+
 	<a href="#loadmore" class="viewMore btn">View More</a>
 
 	[[ include partials/confirm-modal ]]	
diff --git a/views/staff/projects/show.ejs b/views/staff/projects/show.ejs
index 687f0c2..1034b31 100644
--- a/views/staff/projects/show.ejs
+++ b/views/staff/projects/show.ejs
@@ -41,8 +41,21 @@
         "[[- project.description ]]"
       </td>
     </tr>
+    <tr>
+      <th>
+        featured?
+      </th>
+      <td id="isFeaturedProject">
+        [[- project.featured ? "yes" : "no" ]]
+      </td>
+    </tr>
   </table>
 
+  <br><br>
+  <div id="actions">
+    <button id="toggle-featured" data-featured="[[- !! project.featured ]]">Feature this Project</button>
+  </div>
+  
   <br>
   <br>
   <table id="iframe-embed" class="projectList">
-- 
cgit v1.2.3-70-g09d2


From 0ec3787487db41dd5f5b904b70f61fac3b7da491 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 9 Oct 2014 23:16:50 -0400
Subject: some css, set bg to white when noclipping into void

---
 public/assets/javascripts/rectangles/engine/rooms/_walls.js |  2 +-
 public/assets/javascripts/rectangles/engine/rooms/mover.js  | 13 ++++---------
 public/assets/stylesheets/app.css                           |  3 +++
 public/assets/stylesheets/staff.css                         |  9 ++++++---
 server/lib/views/index.js                                   |  4 ++--
 views/docs.ejs                                              |  2 --
 views/home.ejs                                              |  2 +-
 7 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'views')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index 71ddde9..7ff472d 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -137,7 +137,7 @@
 
         $("#header").toggleClass("black", luminance < 128)
         $("body").css("background-color", rgbColor)
-        
+                
         Walls.colors.wall = rgb
         Walls.list.forEach(function(wall){
           wall.outline(rgbaColor, null)
diff --git a/public/assets/javascripts/rectangles/engine/rooms/mover.js b/public/assets/javascripts/rectangles/engine/rooms/mover.js
index 5c7b4af..98f80c5 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/mover.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/mover.js
@@ -21,13 +21,6 @@ Rooms.mover = new function(){
 	base.update = function(pos){
 		var radius = scene.camera.radius
 		
-		if (base.noclip) {
-			cam.x = pos.x
-			cam.y = pos.y
-			cam.z = pos.z
-			return
-		}
-		
 		cam.y = pos.y
 
 		// if we were in a room already..
@@ -42,14 +35,15 @@ Rooms.mover = new function(){
 			// check if we've breached one of the walls.. clamp position if so
 			var collision = base.room.collidesDisc(pos.x, pos.z, radius)
 
-			if (collision) {
+			if (collision && ! base.noclip) {
 				cam.x = (collision & LEFT_RIGHT) ? base.room.rect.x.clampDisc(pos.x, radius) : pos.x
 				cam.z = (collision & FRONT_BACK) ? base.room.rect.y.clampDisc(pos.z, radius) : pos.z
 				return
 			}
 
 			// in this case, we appear to have left the room..
-			$(".face.active").removeClass("active")
+			// $(".face.active").removeClass("active")
+			$("body").css("background-color", "transparent")
 			base.room = null
 		}
 
@@ -65,6 +59,7 @@ Rooms.mover = new function(){
 		// did we actually enter a room?
 		if (intersects.length) {
 			base.room = intersects[0]
+			$("body").css("background-color", rgb_string( Walls.colors.wall ))
       app.tube("change-room", { room: base.room })
 		}
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6aab60c..a15ea39 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -482,6 +482,9 @@ iframe.embed {
 	width: 100%;
 	border-top: 1px solid;
 }
+.page h1:nth-child(2) {
+	margin-top: 40px;
+}
 
 .page p {
 	margin: 20px;
diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css
index aa21f9b..c75a9b1 100644
--- a/public/assets/stylesheets/staff.css
+++ b/public/assets/stylesheets/staff.css
@@ -28,15 +28,16 @@ nav {
   text-align: left;
 }
 nav a {
-  padding-left: 20px;
+  margin-left: 20px;
 }
 hr {
   border: 1px solid #bbb;
-  margin: 5px auto 10px;
+  margin: 10px auto 10px;
+  background: transparent;
 }
 .body {
   width: 80%;
-  margin: 0 auto;
+  margin: 40px auto;
 }
 .json {
   display: none;
@@ -63,6 +64,8 @@ hr {
 .staff {
   font-size: 15px;
 }
+.staff .body a {
+}
 .staff .editLinks a {
   color: #00f;
 }
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 1b547ef..fe2c988 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -86,7 +86,7 @@ views.home = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
@@ -151,7 +151,7 @@ views.profile = function (req, res) {
         projects = projects.map(function(project){
           project = project.toObject()
           project.date = moment(project.updated_at).format("M/DD/YYYY")
-          if (project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
             project.color = [238,238,238]
           } else {
             project.color = project.colors.wall
diff --git a/views/docs.ejs b/views/docs.ejs
index 5662133..665190d 100644
--- a/views/docs.ejs
+++ b/views/docs.ejs
@@ -8,8 +8,6 @@
 <div class="rapper page docs">
 	[[ include partials/header ]]
 
-	<br clear="all">
-	
 	[[ if (! isNew) { ]]
 		<h1>[[- doc.displayName ]]</h1>
 
diff --git a/views/home.ejs b/views/home.ejs
index e02ab0c..16b00e7 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -10,7 +10,7 @@
 	</script>
 </head>
 <body class="loading">
-	<div class="rapper page">
+	<div class="rapper page home">
 	[[ include partials/header ]]
 
 	<div class="hero" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)">
-- 
cgit v1.2.3-70-g09d2