merge

8 files changed, 263 insertions, 48 deletions

diff --git a/views/partials/confirm-modal.ejs b/views/partials/confirm-modal.ejs
index 60fbd31..5b2ff46 100644
--- a/views/partials/confirm-modal.ejs
+++ b/views/partials/confirm-modal.ejs
@@ -1,5 +1,4 @@
 <div class="mediaDrawer fixed animate alert">
-	<span class="close">X</span>
 	<div class="box">
 		<form>
 			<span class="message"></span>
diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs
index a39f856..5720bc8 100644
--- a/views/partials/edit-profile.ejs
+++ b/views/partials/edit-profile.ejs
@@ -59,11 +59,10 @@
 					<br>
 					<br><img id="load_avatar">
 				</li>		
-
 				<li class="section_break">
-					<h3 class="link">Change Password</h3>
+					<h3 class="link" data-role="changePasswordToggle">Change Password</h3>
 				</li>
-				<div class="hidden">
+				<div class="hidden" data-role="changePasswordFields">
 				<li>
 					<label class="description" for="profile_old_password">Old Password:</label>
 					<div>
@@ -84,7 +83,7 @@
 				</li>
 				</div>
 				<li class="buttons">
-					<input id="saveForm" class="button_text" type="submit" value="Submit" />
+					<input id="saveForm" class="button_text" type="submit" value="Save Changes">
 				</li>
 				<div class="errors">
 					<div>There was a problem with your submission:</div>
diff --git a/views/partials/edit-subscription.ejs b/views/partials/edit-subscription.ejs
new file mode 100644
index 0000000..f3c3589
--- /dev/null
+++ b/views/partials/edit-subscription.ejs
@@ -0,0 +1,78 @@
+<div class="mediaDrawer fixed animate editSubscription">
+	<span class="close">X</span>
+	<div id="form_container">
+		<form>
+			<input type="hidden" name="_csrf" value="[[- token ]]">
+			<ul>
+				<li class="section_break">
+					<h3>Edit Subscription</h3>
+				</li>
+				<li class="freePlan">
+					You are currently using the free version of VValls.  For access to all of VValls features,
+					consider upgrading to a paid plan.
+					<br><br>
+					<div class="planList"></div>
+					<br><br><br>
+				</li>
+				<li class="paidPlan">
+					<div class="currentPlanLevel">
+						Your current plan level is <span data-role="planName"></span>
+					</div>
+					<div class="planMenu">
+						<h3>Select desired plan:</h3>
+						<div>
+							<input type="radio" id="chooseBasicPlan" data-role="basicPlanInput" name="planRadio" value="basic">
+							<label for="chooseBasicPlan" data-role="basicPlanName"></label>
+							$<span data-role="basicPlanCost"></span>/<span data-role="billingInterval"></span>
+						</div>
+						<div>
+							<input type="radio" id="chooseProPlan" data-role="proPlanInput" name="planRadio" value="pro">
+							<label for="chooseProPlan" data-role="proPlanName"></label>
+							$<span data-role="proPlanCost"></span>/<span data-role="billingInterval"></span>
+						</div>
+					</div>
+					<table class="planInfo">
+						<tr class="planRow">
+							<th><span data-role="planName"></span></th>
+							<td></td>
+							<td></td>
+							<td>$<span data-role="planCost"></span>/<span data-role="billingInterval"></span></td>
+						</tr>
+						<tr class="basicLayoutRow">
+							<th>Basic layouts</th>
+							<td><input type="number" min="0" max="100" step="1" data-role="basicLayoutInput"><span data-role="basicLayoutQuantity"></span></td>
+							<td>each $<span data-role="basicLayoutCost"></span>/<span data-role="billingInterval"></span></td>
+							<td>$<span data-role="basicLayoutTotal"></span>/<span data-role="billingInterval"></span></td>
+						</tr>
+						<tr class="proLayoutRow">
+							<th>Pro layouts</th>
+							<td><input type="number" min="0" max="100" data-role="proLayoutInput"><span data-role="proLayoutQuantity"></span></td>
+							<td>each $<span data-role="proLayoutCost"></span>/<span data-role="billingInterval"></span></td>
+							<td>$<span data-role="proLayoutTotal"></span>/<span data-role="billingInterval"></span></td>
+						</tr>
+						<tr class="totalRow">
+							<td></td>
+							<td></td>
+							<th>Total</th>
+							<td>$<span data-role="planTotal"></span>/<span data-role="billingInterval"></span></td>
+						</tr>
+					</table>
+					<div class="billingMenu">
+						<button data-role="showEditMenu">Edit Your Plan</button><br>
+						<button data-role="cancelSubscription">Cancel your subscription</button>
+					</div>
+					<div class="editMenu">
+						<div class="fineprint">
+							Your credit card will be charged the difference of XXXX for this month.
+							Your subscription will renew at XXXX at the start of your next billing cycle.
+							We thank you for your support!
+						</div>
+						<button data-role="saveChanges">Save Subscription</button>
+						<button data-role="closeMenu">Cancel</button>
+					</div>
+				</li>
+				<div class="gear"><span class="ion-gear-a"></span></div>
+			</ul>
+		</form>
+	</div>
+</div>
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
index 3f816f0..2d9fb59 100644
--- a/views/partials/footer.ejs
+++ b/views/partials/footer.ejs
@@ -1,18 +1,9 @@
 <div class="footer">
 
-	<a href="/about">About</a>
-	<a href="/about/faq">FAQ</a>
-	<a href="/about/terms">Terms</a>
-	<a href="/about/privacy">Privacy</a>
-
-	<span>©2014 VVALLS Inc.</span>
-
 	[[ if (logged_in) { ]]
-	<br><br>
-	
 	<span>
-		you are signed in as &rarr;
-		<a href="/profile/[[- user.username ]]">[[- user.displayName ]]</a>
+		signed in as 
+		<a href="/profile/[[- user.username ]]"><b>[[- user.displayName ]]</b></a>
 		[[ if (user.isStaff) { ]]
 		<a href="/staff">Staff Area</a>
 		[[ } ]]
@@ -20,4 +11,21 @@
 	</span>
 	[[ } ]]
 
+  <br><br>
+  
+	<a href="/about">About</a>
+	<a href="/about/howto">How To</a>
+
+	[[ if (logged_in && user.plan_level > 0) { ]]
+		<a href="/profile/billing">Billing</a>
+	[[ } else { ]]
+		<a href="/about/brochure">Subscribe</a>
+	[[ } ]]
+	<a href="/about/terms">Terms</a>
+	<a href="/about/privacy">Privacy</a>
+	<a href="mailto:hello@vvalls.com">Contact</a>
+  <br><br>
+	<span>&copy; 2016 Dot Dash 3, Inc.</span>
+	<a href="http://okfoc.us/">Site by OKFocus</a>
+
 </div>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index a48c5e1..ce9ffae 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -1,4 +1,51 @@
-<a href="/" class="logo"><img src="/assets/img/logo4.svg"></a>
+<div id="header">
+<a href="/" class="logo">
+	<svg version="1.1"
+		 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+		 x="0px" y="0px" width="117px" height="44px" viewBox="-0.896 -0.441 117 44"
+		 overflow="visible" enable-background="new -0.896 -0.441 117 44" xml:space="preserve">
+	<defs>
+	</defs>
+	<path d="M0.54,38.759c0-1.44,0.66-3.72,1.56-6.18c1.38-3.84,3.42-8.22,4.5-11.16c0.48-1.32,0.78-2.34,0.78-2.88
+		c0-0.72-0.24-1.02-0.72-1.02c-1.38,0-4.74,5.16-5.4,6.24c-0.36,0.6-0.48,0.78-0.78,0.78c-0.3,0-0.48-0.06-0.48-0.36
+		c0-0.18,0.18-0.84,0.66-1.62c0.9-1.44,2.22-3.6,3.9-5.28c1.44-1.5,3.12-2.64,4.74-2.64c1.38,0,1.92,1.32,1.92,2.7
+		c0,1.02-0.42,2.58-1.02,4.32c-1.26,3.72-3.359,8.521-4.68,12.18c-0.66,1.92-1.14,3.54-1.14,4.62c0,1.38,0.48,2.459,1.979,2.459
+		c6.48,0,13.56-14.639,13.56-17.759c0-1.2-0.3-1.92-0.6-2.58c-0.42-0.9-0.9-1.62-0.9-3.18c0-1.86,0.84-2.76,1.8-2.76
+		c0.9,0,1.98,1.08,1.98,3.66c0,9.179-9.6,24.66-17.58,24.66c-2.82,0-4.08-1.561-4.08-4.141V38.759z"/>
+	<path d="M23.879,38.759c0-1.44,0.66-3.72,1.56-6.18c1.38-3.84,3.42-8.22,4.5-11.16c0.48-1.32,0.78-2.34,0.78-2.88
+		c0-0.72-0.24-1.02-0.72-1.02c-1.38,0-4.74,5.16-5.4,6.24c-0.36,0.6-0.48,0.78-0.78,0.78c-0.3,0-0.48-0.06-0.48-0.36
+		c0-0.18,0.18-0.84,0.66-1.62c0.9-1.44,2.22-3.6,3.9-5.28c1.44-1.5,3.12-2.64,4.74-2.64c1.38,0,1.92,1.32,1.92,2.7
+		c0,1.02-0.42,2.58-1.02,4.32c-1.26,3.72-3.36,8.521-4.68,12.18c-0.66,1.92-1.14,3.54-1.14,4.62c0,1.38,0.48,2.459,1.98,2.459
+		c6.479,0,13.559-14.639,13.559-17.759c0-1.2-0.3-1.92-0.6-2.58c-0.42-0.9-0.9-1.62-0.9-3.18c0-1.86,0.84-2.76,1.8-2.76
+		c0.9,0,1.979,1.08,1.979,3.66c0,9.179-9.6,24.66-17.579,24.66c-2.82,0-4.08-1.561-4.08-4.141V38.759z"/>
+	<path d="M44.339,37.799c0-5.22,2.76-10.92,6.36-15.299c3.66-4.44,8.159-7.5,11.759-7.5c2.7,0,3.78,1.44,3.9,1.44
+		s0.48-0.96,0.66-1.44c0.18-0.48,0.3-0.6,1.02-0.6h1.74c0.359,0,0.6,0.06,0.6,0.42c0,0.18-0.119,0.6-0.24,0.9
+		c-1.919,5.82-3.839,11.64-5.819,17.519c-1.14,3.48-1.26,4.381-1.26,5.041c0,0.659,0.3,0.84,0.66,0.84c0.54,0,1.68-1.141,3.72-4.26
+		c1.5-2.28,1.26-2.94,1.86-2.94c0.3,0,0.42,0.181,0.42,0.479c0,0.84-1.38,3.541-3.24,6c-1.8,2.52-4.14,4.8-6.12,4.8
+		c-1.38,0-1.62-0.96-1.62-2.159c0-0.961,0.24-2.101,0.72-3.66c0.54-1.98,1.5-4.62,2.82-8.52l-0.12-0.12
+		c-2.16,3.3-9.36,14.459-14.1,14.459c-2.76,0-3.72-2.159-3.72-5.339V37.799z M65.338,18.839c0-1.8-1.08-2.76-2.76-2.76
+		c-3,0-6.6,3.72-9.48,8.22c-2.82,4.5-4.919,9.839-4.919,13.019c0,1.561,0.54,2.641,1.86,2.641c2.22,0,6.06-4.26,9.3-9
+		c3.3-4.74,6-10.02,6-12.06V18.839z"/>
+	<path d="M72.178,39.839c0-1.08,0.479-3.479,1.2-6.479c1.74-7.02,4.979-17.52,6.6-23.64c0.66-2.46,1.08-4.2,1.08-4.8
+		c0-0.78-0.24-1.32-1.62-1.44c-1.14-0.12-1.38-0.3-1.38-0.78c0.061-0.42,0.779-0.66,1.8-0.66c2.58,0,4.2-0.78,5.16-1.38
+		c0.6-0.36,0.96-0.66,1.14-0.66c0.3,0,0.42,0.12,0.42,0.48c0,0.3-0.6,1.56-1.14,3.479c-5.04,17.759-7.38,25.799-8.46,29.698
+		c-0.84,3.061-0.96,3.84-0.96,4.681c0,0.6,0.3,1.02,0.78,1.02c0.84,0,1.619-0.659,3.479-3.72c1.08-1.74,1.92-4.199,2.46-4.199
+		c0.301,0,0.42,0.239,0.42,0.539c0,0.42-0.84,2.521-2.16,4.74c-1.739,3-4.319,6.24-6.719,6.24c-1.681,0-2.101-1.32-2.101-3.061
+		V39.839z"/>
+	<path d="M85.497,39.839c0-1.08,0.48-3.479,1.2-6.479c1.739-7.02,4.979-17.52,6.6-23.64c0.66-2.46,1.08-4.2,1.08-4.8
+		c0-0.78-0.24-1.32-1.62-1.44c-1.14-0.12-1.38-0.3-1.38-0.78c0.06-0.42,0.78-0.66,1.8-0.66c2.58,0,4.2-0.78,5.16-1.38
+		c0.6-0.36,0.96-0.66,1.14-0.66c0.3,0,0.42,0.12,0.42,0.48c0,0.3-0.6,1.56-1.14,3.479c-5.04,17.759-7.38,25.799-8.46,29.698
+		c-0.84,3.061-0.96,3.84-0.96,4.681c0,0.6,0.301,1.02,0.78,1.02c0.84,0,1.62-0.659,3.479-3.72c1.08-1.74,1.92-4.199,2.46-4.199
+		c0.3,0,0.42,0.239,0.42,0.539c0,0.42-0.84,2.521-2.159,4.74c-1.74,3-4.32,6.24-6.721,6.24c-1.68,0-2.1-1.32-2.1-3.061V39.839z"/>
+	<path d="M111.416,34.619c0,2.34-0.96,4.439-2.46,5.939c-1.68,1.68-4.02,2.64-6.479,2.64c-1.86,0-3.84-0.78-5.04-1.56
+		c-0.6-0.42-1.02-0.84-1.02-1.2c0-0.96,0.359-3.12,0.959-5.819c0.42-1.98,0.48-2.34,1.08-2.34c0.541,0,0.601,0.359,0.601,2.16
+		c0,3.84,1.2,7.319,4.92,7.319c2.34,0,4.2-2.46,4.2-4.74c0-2.819-1.561-4.979-3.24-6.96c-1.68-1.979-3.24-4.08-3.24-6.899
+		c0-4.38,3.24-8.76,7.859-8.76c3,0,5.82,1.38,5.82,2.1c0,1.14-0.301,2.4-0.66,3.9c-0.72,2.76-0.779,3.06-1.38,3.06
+		c-0.899,0-0.78-1.92-1.08-3.84c-0.3-1.86-1.08-3.78-3.6-3.78c-2.34,0-4.08,2.04-4.08,4.439s1.62,4.44,3.24,6.6
+		c1.8,2.34,3.6,4.68,3.6,7.68V34.619z"/>
+	</svg>
+	
+</a>
 
 <div id="minotaur">
   <span class="label"></span>
@@ -6,21 +53,33 @@
 
 <span class="topLinks">
 [[ if (logged_in) { ]]
-
 	[[ if (user.isStaff) { ]]
 		<a href="/layout" data-role="show-layouts-modal" class="topLink">Layouts</a>
 	[[ } ]]
 
-	<a href="/project" data-role="show-projects-modal" class="topLink">Projects</a>
+	<!--<a href="/project" data-role="show-projects-modal" class="topLink">Projects</a>-->
+	
+	<a href="#"  data-role="new-project-modal">New Project</a>
+	
 
 	[[ if (profile && String(user._id) == String(profile._id)) { ]]
 	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a>
+<!-- 
+	<a href="/profile" data-role="edit-subscription-modal" class="topLink editSubscription">Subscription</a>
+ -->
 	[[ } else if (! profile) { ]]
-	<a href="/profile" class="topLink">Profile</a>
+	<a href="/profile" class="topLink profileLink">Profile</a>
 	[[ } ]]
-
+	
+	[[ if (opt.editing) { ]]
+	<a href="#" class="ion-help-circled" id="help-button"></a>
+	[[ } ]]
+	
 [[ } else { ]]
 	<a href="/signup" data-role="show-signup-modal" class="signUp topLink">Sign Up</a>
-	<a href="/login" data-role="show-signin-modal" class="signIn topLink">Sign In</a>
+	<a href="/signin" data-role="show-signin-modal" class="signIn topLink">Sign In</a>
 [[ } ]]
 </span>
+</div>
+
+<span class="close" id="fixed_close">X</span>
\ No newline at end of file
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index 9916b34..673ab64 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -17,19 +17,19 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-	<meta name="keywords" content=""/>
-	<meta name="description" content="" />
-	<meta name="author" content="" />
-	<link rel="shortcut icon" href="/favicon.ico"/>
-	<meta property="og:title" content=""/>
-	<meta property="og:type" content="website"/>
-	<meta property="og:image" content="" />
-	<link rel="image_src" href=""/>
-	<meta property="og:url" content=""/>
-	<meta property="og:site_name" content="" />
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable = no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="description" content="[[- ogDescription ]]" />
+	<meta name="author" content="[[- ogAuthor ]]" />
+	<link rel="shortcut icon" href="/favicon.ico" />
+	<meta property="og:title" content="[[- ogTitle ]]" />
+	<meta property="og:type" content="website" />
+	<meta property="og:image" content="[[- ogImage ]]" />
+	<meta property="og:url" content="[[- ogUrl ]]" />
+	<meta property="og:site_name" content="vvalls" />
 	<link rel="icon" href="/favicon.ico" type="image/x-icon">
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+	<link href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900,100italic,300italic,400italic,700italic,900italic' rel='stylesheet' type='text/css'>
 	<link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>
 	<link href='/assets/stylesheets/app.css' rel='stylesheet' type='text/css'>
 	<!--[if lt IE 9]>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 7d56b2e..da3f0ba 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -1,44 +1,64 @@
+[[ if (config.env.production) { ]]
+<script type="text/javascript" src="/assets/javascripts/app.min.js"></script>
+[[ } else { ]]
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script>
-<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/lodash/lodash.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js"></script>
+<!-- <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script> -->
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/marked/lib/marked.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script>
+<!-- <script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script> -->
+<!-- <script type="text/javascript" src="/assets/javascripts/vendor/chardinjs.min.js"></script> -->
 <script type="text/javascript" src="/assets/javascripts/vendor/sha1.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/dataUriToBlob.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/froogaloop.js"></script>
 <script type="text/javascript" src="/assets/javascripts/util.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/mx/mx.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movements.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movementsMobile.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.orbitCamera.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.image.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.video.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.youtube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.soundcloud.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.point.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.polyline.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/_env.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/constants.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/debug.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/measurement.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/sort.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/uid.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/undostack.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/surface.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/tree.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/room.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/wall.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/models/floor.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_rooms.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/rooms/_walls.js"></script>
@@ -50,34 +70,64 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/_scenery.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/move.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/resize.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/randomize.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/sound.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/audio.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/image.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
 
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/_sculpture.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/move.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/resize.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/_object.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/sculpture/types/image.js"></script>
+
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/polyline.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/ortho.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/shapelist.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/shapes/regionlist.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_editor.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_minimap.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/draw.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui/editor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui/minimap.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui/ortho.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/_base.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/arrow.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/line.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/eraser.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/ortho.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/polyline.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/position.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/tools/start.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/lib/View.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ModalView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/FormView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/UploadView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/AnimatedView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/ToggleableView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ErrorModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/Parser.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/LabColorPicker.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/site/SignInModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/site/SignUpModal.js"></script>
 <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>
 <script type="text/javascript" src="/assets/javascripts/ui/site/DocumentModal.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/site/HomeView.js"></script>
@@ -89,24 +139,41 @@
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderToolbar.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderInfo.js"></script>
 
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintInfo.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintSettings.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintEditor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintScaler.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintToolbar.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUploader.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintNotice.js"></script>
+
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorToolbar.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/editor/LightControl.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/HelpCursor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/ColorControl.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/Collaborators.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaTumblr.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/Presets.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/SculptureEditor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/TextEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/reader/ReaderView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/reader/ShareView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/reader/EmbedView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/reader/MediaPlayer.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/reader/Tracker.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/_router.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/app.js"></script>
 <script type="text/javascript" src="/assets/javascripts/defaults.js"></script>
+[[ } ]]
 
-<!-- external dependencies -->
-<script src="http://www.youtube.com/player_api"></script>
-<script src="http://a.vimeocdn.com/js/froogaloop2.min.js"></script>
+<script type="text/javascript" src="http://www.youtube.com/player_api"></script>
+<script type="text/javascript" src="https://w.soundcloud.com/player/api.js"></script>
diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs
index 98f0acc..0d36a1d 100644
--- a/views/partials/sign-in.ejs
+++ b/views/partials/sign-in.ejs
@@ -3,9 +3,12 @@
 <div class="mediaDrawer fixed animate signin">
 	<span class="close">X</span>
 	<div class="box">
+		
 		<form id="signIn" method="post">
+			<h2>Sign in</h2>
+			
 			<input type="hidden" name="_csrf" value="[[- token ]]">
-			<a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign in with Facebook</span></a>
+			<a href="/auth/facebook" class="facebook"><b class="ion-social-facebook"></b><span>Sign in with Facebook</span></a>
 			<b class="signin-tagline">– or with your email –</b>
 			<li>
 				<label class="description" for="usernameInput">Username:</label>
@@ -37,8 +40,10 @@
 	<span class="close">X</span>
 	<div class="box">
 		<form id="signUp" method="post">
+			<h2>Sign up</h2>
+			
 			<input type="hidden" name="_csrf" value="[[- token ]]">
-			<a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign up with Facebook</span></a>
+			<a href="/auth/facebook" class="facebook"><b class="ion-social-facebook"></b><span>Sign up with Facebook</span></a>
 			<b class="signin-tagline">– or with your email –</b>
 			<li>
 				<label class="description" for="usernameInput">Username:</label>