editing profile

3 files changed, 26 insertions, 12 deletions

diff --git a/views/partials/edit-profile.ejs b/views/partials/edit-profile.ejs
index a9a5a9a..1a288db 100644
--- a/views/partials/edit-profile.ejs
+++ b/views/partials/edit-profile.ejs
@@ -3,13 +3,19 @@
 	<div id="form_container">
 
 		<form enctype="multipart/form-data" method="post">
-				
+			<input type="hidden" name="_csrf" value="[[- token ]]">
 			<ul>
 				<li class="section_break">
 					<h3>Edit Profile</h3>
 				</li>
 				<li>
-					<label class="description" for="profile_displayName">Name:</label>
+					<label class="description" for="profile_displayName">Username:</label>
+					<div>
+					<div id="profile_username"></div>
+					</div>
+				</li>
+				<li>
+					<label class="description" for="profile_displayName">Display Name:</label>
 					<div>
 					<input id="profile_displayName" name="displayName" class="element text" type="text" maxlength="255">
 					</div>
@@ -21,6 +27,12 @@
 					</div> 
 				</li>
 				<li>
+					<label class="description" for="profile_website">Location:</label>
+					<div>
+						<input id="profile_location" name="location" class="element text medium" type="text" maxlength="255"> 
+					</div> 
+				</li>
+				<li>
 					<label class="description" for="profile_website">Website:</label>
 					<div>
 						<input id="profile_website" name="website" class="element text medium" type="text" maxlength="255"> 
@@ -29,13 +41,13 @@
 				<li>
 					<label class="description" for="profile_twitter">Twitter:</label>
 					<div>
-						<input id="profile_twitter" name="twitter" class="element text medium" type="text" maxlength="255">
+						<input id="profile_twitter" name="twitterName" class="element text medium" type="text" maxlength="255">
 					</div> 
 				</li>		
 				<li>
 					<label class="description" for="profile_facebook">Facebook:</label>
 					<div>
-						<input id="profile_facebook" name="facebook" class="element text medium" type="text" maxlength="255"> 
+						<input id="profile_facebook" name="facebookUrl" class="element text medium" type="text" maxlength="255"> 
 					</div> 
 				</li>		
 				<li>
@@ -43,10 +55,11 @@
 					<div>
 						<input id="profile_avatar" name="avatar" class="element file" type="file"/> 
 					</div>
-					<p class="guidelines" id="guide_1"><small>please choose a picture at least 500px wide</small></p> 
+					<p class="guidelines"><img id="load_avatar"><small>please choose a picture at least 500px wide</small></p> 
 				</li>		
+
 				<li class="section_break">
-					<h3>Edit Password</h3>
+					<h3>Change Password</h3>
 				</li>
 				<li>
 					<label class="description" for="profile_old_password">Old Password:</label>
@@ -55,9 +68,9 @@
 					</div> 
 				</li>		
 				<li>
-					<label class="description" for="profile_password">New Password:</label>
+					<label class="description" for="profile_new_password">New Password:</label>
 					<div>
-						<input id="profile_password" name="new_password" class="element text medium" type="password" maxlength="255">
+						<input id="profile_new_password" name="new_password" class="element text medium" type="password" maxlength="255">
 					</div> 
 				</li>		
 				<li>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index c706aa1..e0e98c2 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -2,7 +2,7 @@
 
 <span class="topLinks">
 [[ if (logged_in) { ]]
-	[[ if (profile && user._id == profile._id) { ]]
+	[[ if (profile && String(user._id) == String(profile._id)) { ]]
 	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Edit Profile <span class="icon-ios7-gear-outline"></span></a>
 	[[ } else if (! profile) { ]]
 	<a href="/profile" class="topLink">View Profile</a>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index fdb2229..5501c26 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -43,9 +43,10 @@
 <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/ui/ModalView.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/ModalFormView.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/MasterView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/ModalView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/ModalFormView.js"></script>
+
+<script type="text/javascript" src="/assets/javascripts/ui/Router.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/SignInModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/SignUpModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/NewProjectModal.js"></script>