18 files changed, 281 insertions, 30 deletions
diff --git a/views/builder.ejs b/views/builder.ejs
index 61e84c3..afb8c66 100644
--- a/views/builder.ejs
+++ b/views/builder.ejs
@@ -12,6 +12,7 @@
 		[[ include partials/header ]]
 		
 		<div id="builderView">
+			[[ include controls/builder/info ]]
 			[[ include controls/builder/toolbar ]]
 			[[ include controls/builder/settings ]]
 		</div>
@@ -20,7 +21,6 @@
 		<div id="minimap" class="vvbox">
 			<span class="el"></span>
 		</div>
-	-->
 
 		<select id="palette">
 			<option>colors</option>
@@ -31,6 +31,7 @@
 			<option>white</option>
 			<option>black</option>
 		</select>
+	-->
 
 		<div id="hud">
 			<div id="map" style="display: block">
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
new file mode 100644
index 0000000..d92d34c
--- /dev/null
+++ b/views/controls/builder/info.ejs
@@ -0,0 +1,35 @@
+<div class="vvbox active settings info active" id="builderInfo">
+	<div class="setting number">
+		<label for="room-width">width</label>
+		<input type="text" class="units" name="width" id="room-width">
+	</div>
+	<div class="setting number">
+		<label for="room-depth">depth</label>
+		<input type="text" class="units" name="depth" id="room-depth">
+	</div>
+	<div class="setting number twoline">
+		<label for="room-height">ceiling height</label>
+		<input type="text" class="units" name="height" id="room-height">
+	</div>
+	<div class="setting number halflines">
+		<label for="room-x">x</label>
+		<input type="text" class="units" name="x" id="room-x">
+		<label for="room-y">y</label>
+		<input type="text" class="units" name="y" id="room-y">
+	</div>
+
+	<div class="setting number twoline">
+		<label for="builder-units">units</label>
+		<select id="builder-units" name="units">
+			<option value="px">pixels</option>
+			<option value="ft">foot</option>
+			<option value="m">meter</option>
+		</select>
+	</div>
+
+	<div class="setting number twoline">
+		<label for="viewHeight">camera height</label>
+		<input type="text" class="units" name="viewHeight" id="viewHeight">
+	</div>
+
+</div>
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
new file mode 100644
index 0000000..5db1fb2
--- /dev/null
+++ b/views/controls/editor/media-editor.ejs
@@ -0,0 +1,50 @@
+<div class="vvbox settings" id="mediaEditor">
+	<input type="hidden" name="_csrf" value="[[- token ]]">
+	<input type="hidden" name="_id" value="new">
+
+	<div class="setting">
+		<input type="text" name="name" placeholder="media title">
+	</div>
+	
+	<div class="setting">
+		<textarea name="description" placeholder="short description"></textarea>
+	</div>
+	
+	<div class="video setting">
+		<span class="playButton" data-role="play-media">
+			<span class="on icon-play"></span>
+			<span class="off icon-pause"></span>
+		</span>
+<!-- 
+		ion-volume-high
+		ion-volume-mute
+ -->
+	</div>
+	<div class="video setting">
+		<input type="checkbox" name="autoplay" value="1" id="video_autoplay">
+		<label for="video_autoplay">Autoplay</label>
+		<input type="checkbox" name="loop" value="1" id="video_loop">
+		<label for="video_loop">Loop</label>
+		<input type="checkbox" name="mute" value="1" id="video_mute">
+		<label for="video_mute">Mute</label>
+	</div>
+	<div class="video setting">
+		<label for="video-keyframe">Initial Still</label>
+		<br>
+		<input type="range" min="0" max="1" value="0" step="0.01" name="keyframe" id="video-keyframe">
+	</div>
+
+	<div class="image setting">
+		Dimensions<br>
+		<input type="text" name="width" placeholder="width" class="number">
+		<input type="text" name="height" placeholder="height" class="number">
+		<select name="units">
+			<option value="inch">inch</option>
+			<option value="cm">cm</option>
+		</select>
+	</div>
+
+	<div class="setting subButtons">
+		<a href="#" data-role="destroy-media">Delete</a>
+	</div>
+</div>
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index a7d6213..6f46be3 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -10,15 +10,13 @@
 	</div>
 
 	<div class="setting">
-		<input type="text" name="name" placeholder="room name" />
+		<input type="text" name="name" placeholder="room name">
 	</div>
 	
 	<div class="setting">
 		<textarea name="description" placeholder="short description"></textarea>
 	</div>
-	<div class="setting">
-		<input type="text" placeholder="http://vvalls.com/t987" />
-	</div>
+
 	<div class="setting">
 		<div class="radio-group">
 			<input id="privacy_private" class="radio-group__option" type="radio" name="privacy" value="public" checked>
diff --git a/views/controls/editor/video-toolbar.ejs b/views/controls/editor/video-toolbar.ejs
deleted file mode 100644
index d4364a2..0000000
--- a/views/controls/editor/video-toolbar.ejs
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="edit menu edit-video">
-	<span class="icon-volume-mute toggled" data-info="mute"></span>
-	<span class="icon-ios7-compose-outline edit-text-toggle" data-info="edit wall text"></span>
-	<span class="icon-ios7-reload" data-info="loop"></span>
-	<span class="icon-ios7-arrow-forward" data-info="autoplay"></span>
-	<span class="icon-ios7-trash-outline" data-info="delete video"></span>
-</div>
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 82460b7..144e419 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -1,10 +1,4 @@
 <div class="vvbox wallpaper">
-	<span class="paper1"></span>
-	<span class="paper2"></span>
-	<span class="paper3"></span>
-	<span class="paper4"></span>
-	<span class="paper5"></span>
-	<span class="paper6"></span>
-	<span class="paper7"></span>
-	<span class="paper8"></span>
-</div>
-\ No newline at end of file
+</div>
+
+<div class="floatingSwatch"></div>
diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs
new file mode 100644
index 0000000..ca03ec8
--- /dev/null
+++ b/views/controls/reader/media-player.ejs
@@ -0,0 +1,19 @@
+<div class="vvbox settings" id="mediaPlayer">
+
+	<span class="playButton video" data-role="play-media">
+		<span class="on icon-play"></span>
+		<span class="off icon-pause"></span>
+	</span>
+
+	<span class="muteButton video" data-role="mute-media">
+		<span class="on icon-volume-high"></span>
+		<span class="off icon-volume-mute"></span>
+	</span>
+
+	<span class="name"></span>
+	
+	<div class="author"></div>
+	<div class="description"></div>
+	<div class="dimensions"></div>
+	
+</div>
diff --git a/views/editor.ejs b/views/editor.ejs
index a79eb9a..5d1e052 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -13,8 +13,8 @@
 
 		<div id="editorView">
 			[[ include controls/editor/toolbar ]]
-			[[ include controls/editor/video-toolbar ]]
 			[[ include controls/editor/media-drawer ]]
+			[[ include controls/editor/media-editor ]]
 			[[ include controls/editor/wallpaper ]]
 			[[ include controls/editor/light-control ]]
 			[[ include controls/editor/settings ]]
diff --git a/views/mail/password.html.ejs b/views/mail/password.html.ejs
new file mode 100644
index 0000000..f266488
--- /dev/null
+++ b/views/mail/password.html.ejs
@@ -0,0 +1,25 @@
+<html>
+<body>
+
+<p>
+	Hey there,
+</p>
+
+<p>
+	We received a request to reset the password associated with this email address.
+</p>
+
+<p>
+	Click the link below to make a new password:
+</p>
+
+<p>
+	<a href="http://vvalls.com/auth/password?nonce=[[- passwordNonce ]]">http://vvalls.com/auth/password?nonce=[[- passwordNonce ]]</a>
+</p>
+
+<p>
+	If this was requested in error, please disregard this message.
+</p>
+
+</body>
+</html>
diff --git a/views/mail/password.text.ejs b/views/mail/password.text.ejs
new file mode 100644
index 0000000..67e4b60
--- /dev/null
+++ b/views/mail/password.text.ejs
@@ -0,0 +1,11 @@
+
+Hey there,
+
+We received a request to reset the password associated with this email address.
+
+Click the link below to make a new password:
+
+http://vvalls.com/auth/password?nonce=[[- passwordNonce ]]
+
+If this was requested in error, please disregard this message.
+
diff --git a/views/mail/welcome.html.ejs b/views/mail/welcome.html.ejs
new file mode 100644
index 0000000..8b7194b
--- /dev/null
+++ b/views/mail/welcome.html.ejs
@@ -0,0 +1,17 @@
+<html>
+<body>
+
+<p>
+	<a href="http://vvalls.com/"><img src="http://vvalls.com/img/logo.svg"></a>
+</p>
+
+<p>
+	Welcome to Vvalls, [[- username ]]
+</p>
+
+<p>
+	<a href="http://vvalls.com/">www.vvalls.com</a>
+</p>
+
+</body>
+</html>
diff --git a/views/mail/welcome.text.ejs b/views/mail/welcome.text.ejs
new file mode 100644
index 0000000..cab9c15
--- /dev/null
+++ b/views/mail/welcome.text.ejs
@@ -0,0 +1,4 @@
+
+Welcome to Vvalls, [[- username ]]
+
+http://www.posthang.com
diff --git a/views/modal.ejs b/views/modal.ejs
index 4550aff..7ca869c 100644
--- a/views/modal.ejs
+++ b/views/modal.ejs
@@ -8,7 +8,7 @@
 	<div class="rapper page" style="height: 100%;">
 	[[ include partials/header ]]
 
-	<div style="height: 70%; clear: both;"></div>
+	<div style="height: 70%; clear: both;" id="content"></div>
 
 	[[ include partials/confirm-modal ]]	
 	[[ include partials/sign-in ]]	
@@ -19,5 +19,6 @@
 </div>
 </body>
 [[ include partials/scripts ]]
+<script id="opt" type="text/json">[[- JSON.stringify(opt) ]]</script>
 <script>window.isModalView = true</script>
 </html>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 39d27e2..2173cd5 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -48,6 +48,9 @@
 <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/primitives/mx.image.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/ui/lib/View.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script>
@@ -60,25 +63,36 @@
 
 <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/LayoutsModal.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/DocumentModal.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/ProfileView.js"></script>
 
+<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderSettings.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderToolbar.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderInfo.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/MediaEditor.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/WallpaperPicker.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/reader/ReaderView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/reader/MediaPlayer.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/_router.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/app.js"></script>
+
+<!-- external dependencies -->
+<script src="http://www.youtube.com/player_api"></script>
+<script src="http://a.vimeocdn.com/js/froogaloop2.min.js"></script>
+\ No newline at end of file
diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs
index 3341aec..8268b2a 100644
--- a/views/partials/sign-in.ejs
+++ b/views/partials/sign-in.ejs
@@ -6,7 +6,7 @@
 		<form id="signIn" method="post">
 			<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>
-			<b class="info">– or the ol' fashion way –</b>
+			<b class="signin-tagline">– or the ol' fashion way –</b>
 			<li>
 				<label class="description" for="usernameInput">Username:</label>
 				<div>
@@ -27,7 +27,8 @@
 				<div class="errorList"></div>
 			</div>
 			<br><br>
-			<a data-role="show-signup-modal" href="#">Make a new account</a>
+			<a data-role="show-signup-modal" href="#">Make a new account</a><br>
+			<a data-role="forgot-password" href="#">Forgot your password?</a>
 		</form>
 	</div>
 </div>
@@ -38,7 +39,7 @@
 		<form id="signUp" method="post">
 			<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>
-			<b class="info">– or the ol' fashion way –</b>
+			<b class="signin-tagline">– or the ol' fashion way –</b>
 			<li>
 				<label class="description" for="usernameInput">Username:</label>
 				<div>
@@ -74,4 +75,82 @@
 	</div>
 </div>
 
+<div class="mediaDrawer fixed animate passwordForgot">
+	<span class="close">X</span>
+	<div class="box">
+		<form id="forgotPw" method="post" autocomplete="off">
+			<input type="hidden" name="_csrf" value="[[- token ]]">
+			<li>
+				Forgot your password?  Enter the email address you used to sign up
+				and we can reset it for you.
+			</li>
+			<li>
+				<label class="description" for="emailInput">Email:</label>
+				<div>
+					<input id="emailInput" name="email" class="element text medium" type="text" maxlength="255" value="" autocomplete="off" spellcheck="false"> 
+				</div>
+			</li> 
+			<li class="buttons">
+				<input id="saveForm" class="bb button" type="submit" value="Submit">
+			</li>
+			<div class="errors">
+				<div>There was a problem with your submission:</div>
+				<div class="errorList"></div>
+			</div>
+		</form>
+	</div>
+</div>
+
+<div class="mediaDrawer fixed animate passwordReset">
+	<div class="box">
+		<form id="resetPassword" method="post">
+			<input type="hidden" name="_csrf" value="[[- token ]]">
+			<input type="hidden" name="nonce">
+			Please reset your password.
+			<br><br>
+			<li>
+				<label class="description" for="passwordInput1">Password:</label>
+				<div>
+					<input id="passwordInput1" name="password" class="element text medium" type="password" maxlength="255">
+				</div> 
+			</li>
+			<li>
+				<label class="description" for="passwordInput2">Again!</label>
+				<div>
+					<input id="passwordInput2" class="element text medium" type="password" maxlength="255">
+				</div> 
+			</li>
+			<li class="buttons">
+				<input id="saveForm" class="bb button" type="submit" value="Submit" />
+			</li>
+			<div class="errors">
+				<div class="errorList"></div>
+			</div>
+		</form>
+	</div>
+</div>
+
+<div class="mediaDrawer fixed animate usernameTaken">
+	<div class="box">
+		<form id="usernameTaken" method="post" autocomplete="off">
+			We're sorry, the username <b id="usernameThatIsTaken"></b> is already being used.
+			<br><br>
+			Please choose another username.
+			<br><br>
+			<li>
+				<label class="description" for="usernameInput">Username:</label>
+				<div>
+					<input id="usernameInput" name="username" class="element text medium" type="text" maxlength="255" value="" autocomplete="off" spellcheck="false"> 
+				</div>
+			</li>
+			<li class="buttons">
+				<input id="saveForm" class="bb button" type="submit" value="Submit">
+			</li>
+			<div class="errors">
+				<div class="errorList"></div>
+			</div>
+		</form>
+	</div>
+</div>
+
 [[ } ]]
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 75b2641..97f1e61 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -5,6 +5,9 @@
 		<div class="templates">
 			<h1>Edit Room Layouts</h1>
 		</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>
@@ -18,6 +21,8 @@
 		<div class="templates">
 			<h1>Your Projects</h1>
 		</div>
+		<div class="no-templates">
+		</div>
 		<form>
 			<input class="button_text" type="submit" value="New Project">
 		</form>
@@ -31,6 +36,9 @@
 		<div class="templates">
 			<h1>Choose Room Template</h1>
 		</div>
+		<div class="no-templates">
+			There are no room layouts available. Please <a href="/layout/new">create a new one.</a>
+		</div>
 		<form>
 			<input class="button_text" type="submit" value="Create Project">
 		</form>
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 443e26d..2c12af0 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -4,12 +4,13 @@
 	<table>
 		<tr>
 
-		[[ projects.forEach(function(project) { ]]
+		[[ projects.forEach(function(project, i) { ]]
 			<td class="border room1">
+				<iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe>
 				[[ if (profile._id == project.user_id) { ]]
 				<div class="editBtn">edit</div>
 				[[ } ]]
-				<a href="/project/[[- project.slug ]]" class="roomName">[[- project.name ]]</a>
+				<a href="/project/[[- project.slug ]]" class="roomName">[[- project.name ]]<br>[[- project.date ]]</a>
 			</td>
 		[[ }) ]]
 
diff --git a/views/reader.ejs b/views/reader.ejs
index c389431..44fb2dd 100644
--- a/views/reader.ejs
+++ b/views/reader.ejs
@@ -13,6 +13,7 @@
 
 		<div id="editorView">
 			[[ include controls/reader/about-room ]]
+			[[ include controls/reader/media-player ]]
 		</div>
 	</div>