From 1165ef5440e643252635aeea73a14cba0bb2e461 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 9 Jun 2014 16:14:49 -0400
Subject: documentation system

---
 views/partials/edit-profile.ejs |  6 ++--
 views/partials/footer.ejs       |  2 +-
 views/partials/meta.ejs         |  4 +--
 views/partials/scripts.ejs      |  1 +
 views/partials/sign-in.ejs      | 77 +++++++++++++++++++++++++++++++++++++++++
 views/partials/signin.ejs       | 77 -----------------------------------------
 6 files changed, 85 insertions(+), 82 deletions(-)
 create mode 100644 views/partials/sign-in.ejs
 delete mode 100644 views/partials/signin.ejs

(limited to 'views/partials')

diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs
index f5807ee..96e9da4 100644
--- a/views/partials/edit-profile.ejs
+++ b/views/partials/edit-profile.ejs
@@ -49,13 +49,15 @@
 					<div>
 						<input id="profile_facebook" name="facebookUrl" class="element text medium" type="text" maxlength="255"> 
 					</div> 
-				</li>		
+				</li>
 				<li>
 					<label class="description" for="profile_avatar">Upload Avatar:</label>
 					<div>
 						<input id="profile_avatar" name="avatar" class="element file" type="file"> 
 					</div>
-					<p class="guidelines"><img id="load_avatar"><small>please choose a picture at least 500px wide</small></p> 
+					<p class="guidelines"><small>please choose a picture at least 500px wide</small></p> 
+					<br>
+					<br><img id="load_avatar">
 				</li>		
 
 				<li class="section_break">
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
index df48cf3..a40a873 100644
--- a/views/partials/footer.ejs
+++ b/views/partials/footer.ejs
@@ -1,7 +1,7 @@
 <div class="footer">
 
 	<a href="/about">About</a>
-	<a href="/faq">FAQ</a>
+	<a href="/about/faq">FAQ</a>
 
 	<span>©2014 VVALLS Inc.</span>
 
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index d1397c6..ceaaba1 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -11,8 +11,8 @@
 	<link rel="image_src" href=""/>
 	<meta property="og:url" content=""/>
 	<meta property="og:site_name" content="" />
-	<link rel="icon" href="favicon.ico" type="image/x-icon">
-	<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
+	<link rel="icon" href="/favicon.ico" type="image/x-icon">
+	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
 	<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 5501c26..02b11a7 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -52,5 +52,6 @@
 <script type="text/javascript" src="/assets/javascripts/ui/NewProjectModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/EditProjectModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/EditProfileModal.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/DocumentModal.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/app.js"></script>
diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs
new file mode 100644
index 0000000..3341aec
--- /dev/null
+++ b/views/partials/sign-in.ejs
@@ -0,0 +1,77 @@
+[[ if (! logged_in) { ]]
+
+<div class="mediaDrawer fixed animate signin">
+	<span class="close">X</span>
+	<div class="box">
+		<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>
+			<li>
+				<label class="description" for="usernameInput">Username:</label>
+				<div>
+					<input id="usernameInput" name="username" class="element text medium" type="text" maxlength="255" value=""/> 
+				</div>
+			</li> 
+			<li>
+				<label class="description" for="passwordInput">Password:</label>
+				<div>
+					<input id="passwordInput" name="password" class="element text medium" type="password" maxlength="255" value=""/> 
+				</div> 
+			</li>
+			<li class="buttons">
+				<input id="saveForm" class="button_text" type="submit" value="Submit" />
+			</li>
+			<div class="errors">
+				<div>There was a problem with your submission:</div>
+				<div class="errorList"></div>
+			</div>
+			<br><br>
+			<a data-role="show-signup-modal" href="#">Make a new account</a>
+		</form>
+	</div>
+</div>
+
+<div class="mediaDrawer fixed animate signup">
+	<span class="close">X</span>
+	<div class="box">
+		<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>
+			<li>
+				<label class="description" for="usernameInput">Username:</label>
+				<div>
+					<input id="usernameInput" name="username" class="element text medium" type="text" maxlength="255"> 
+				</div>
+			</li>
+			<li>
+				<label class="description" for="emailInput">Email:</label>
+				<div>
+					<input id="emailInput" name="email" class="element text medium" type="text" maxlength="255"> 
+				</div>
+			</li> 
+			<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="button_text" 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>
+
+[[ } ]]
diff --git a/views/partials/signin.ejs b/views/partials/signin.ejs
deleted file mode 100644
index 3341aec..0000000
--- a/views/partials/signin.ejs
+++ /dev/null
@@ -1,77 +0,0 @@
-[[ if (! logged_in) { ]]
-
-<div class="mediaDrawer fixed animate signin">
-	<span class="close">X</span>
-	<div class="box">
-		<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>
-			<li>
-				<label class="description" for="usernameInput">Username:</label>
-				<div>
-					<input id="usernameInput" name="username" class="element text medium" type="text" maxlength="255" value=""/> 
-				</div>
-			</li> 
-			<li>
-				<label class="description" for="passwordInput">Password:</label>
-				<div>
-					<input id="passwordInput" name="password" class="element text medium" type="password" maxlength="255" value=""/> 
-				</div> 
-			</li>
-			<li class="buttons">
-				<input id="saveForm" class="button_text" type="submit" value="Submit" />
-			</li>
-			<div class="errors">
-				<div>There was a problem with your submission:</div>
-				<div class="errorList"></div>
-			</div>
-			<br><br>
-			<a data-role="show-signup-modal" href="#">Make a new account</a>
-		</form>
-	</div>
-</div>
-
-<div class="mediaDrawer fixed animate signup">
-	<span class="close">X</span>
-	<div class="box">
-		<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>
-			<li>
-				<label class="description" for="usernameInput">Username:</label>
-				<div>
-					<input id="usernameInput" name="username" class="element text medium" type="text" maxlength="255"> 
-				</div>
-			</li>
-			<li>
-				<label class="description" for="emailInput">Email:</label>
-				<div>
-					<input id="emailInput" name="email" class="element text medium" type="text" maxlength="255"> 
-				</div>
-			</li> 
-			<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="button_text" 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>
-
-[[ } ]]
-- 
cgit v1.2.3-70-g09d2