merge

6 files changed, 9 insertions, 6 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..5775ca5 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>
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
index 3f816f0..3ee4afc 100644
--- a/views/partials/footer.ejs
+++ b/views/partials/footer.ejs
@@ -12,7 +12,7 @@
 	
 	<span>
 		you are signed in as &rarr;
-		<a href="/profile/[[- user.username ]]">[[- user.displayName ]]</a>
+		<a href="/profile/[[- user.username ]]"><b>[[- user.displayName ]]</b></a>
 		[[ if (user.isStaff) { ]]
 		<a href="/staff">Staff Area</a>
 		[[ } ]]
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index 065385d..1b7b498 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -65,7 +65,7 @@
 	[[ if (profile && String(user._id) == String(profile._id)) { ]]
 	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a>
 	[[ } else if (! profile) { ]]
-	<a href="/profile" class="topLink">Profile</a>
+	<a href="/profile" class="topLink profileLink">Profile</a>
 	[[ } ]]
 	
 	[[ if (opt.editing) { ]]
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index 4e94a5e..6ff45cb 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -33,6 +33,7 @@
 	<link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>
 	<link href='/assets/stylesheets/app.css' rel='stylesheet' type='text/css'>
 	<link href='/assets/stylesheets/animate.css' rel='stylesheet' type='text/css'>
+	<link href='/assets/stylesheets/chardinjs.css' rel='stylesheet' type='text/css'>
 	<!--[if lt IE 9]>
 	<style>
 
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 1ce180a..4af9938 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -7,6 +7,7 @@
 <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/util.js"></script>
@@ -21,8 +22,10 @@
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.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/measurement.js"></script>
@@ -33,6 +36,7 @@
 <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/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>