merge

2 files changed, 98 insertions, 5 deletions

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>
+
 [[ } ]]