merge

11 files changed, 36 insertions, 22 deletions

diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs
index 69e5b64..b658bf6 100644
--- a/views/controls/editor/collaborators.ejs
+++ b/views/controls/editor/collaborators.ejs
@@ -1,7 +1,9 @@
 <div class="collaborators fixed mediaDrawer animate">
 	<span class="close">X</span>
-	
-  <div>
+
+  <div class="rap">
+		<div class="holder">
+			<div class="inner vvbox">
     <h2>Collaborators</h2>
 
     <p>
@@ -21,9 +23,9 @@
 
     <ul id="collaborator-list">
     </ul>
-
   </div>
-
+  </div>
+</div>
 </div>
 
 <script type="text/html" id="collaborator-template">
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 92807e1..586194b 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -1,4 +1,5 @@
-<div class="edit menu vvbox" id="editorToolbar">
+
+<div class="edit menu vvbox" id="editorToolbar" data-intro="This is the main toolbar. Add and select media, Apply wallpaper, change room name etc." data-position="left">
 	<span
 		data-role='open-media-viewer'
 		data-info="add media"
diff --git a/views/editor.ejs b/views/editor.ejs
index e029225..24f617c 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -22,7 +22,7 @@
 			[[ include controls/editor/settings ]]
 		</div>
 
-		<div id="minimap" class="vvbox">
+		<div id="minimap" class="vvbox" data-intro="Mini-map shows your position and orientation in a room. Navigate with WASD keys or drag here." data-position="top">
 			<span class="el"></span>
 		</div>
 
@@ -30,6 +30,8 @@
 			<div id="map" style="display: block">
 			</div>
 		</div>
+		
+		<img src="/assets/img/keys.png" id="keyhint">
 
 	</div>
 
diff --git a/views/home.ejs b/views/home.ejs
index 76b6cea..a6f5a88 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -62,9 +62,10 @@
 	</div>
 	
 	<h1>Room Showcase</h1>
-	
-
-	
+	<img src="https://s3.amazonaws.com/uploads.hipchat.com/14935/55226/twq38ErgSnriaOq/vvalls-thumbnail-options2.gif" style="border-top:1px solid;width:100%">
+	<!--
+	[[ include projects/list-projects ]]
+	-->
 	<a href="#loadmore" class="viewMore btn">View More</a>
 
 	[[ include partials/confirm-modal ]]	
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>
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index a9f9523..a12f237 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -6,6 +6,7 @@
 
 			<span class="room">
         <span class="images">
+          <img src="[[- project.photo ]]">
           [[ mediaCount = 0 ]]
           [[ project.media.some(function(media){ ]]
             [[ if (media.media.type != "image") { return false } ]]
@@ -13,14 +14,18 @@
             <img src="[[- media.media.url ]]">
           [[ }) ]]
 			  </span>
-				[[ if (String(user._id) == String(project.user_id)) { ]]
-				<a href="/project/[[- project.slug ]]/edit"><div class="editBtn">edit</div></a>
-				[[ } ]]
+
 				<div class="holder">
-				<a href="/project/[[- project.slug ]]" class="roomName">
-					[[- project.name ]]<br>
-					[[- project.date ]]
-				</a>
+			 	 [[ if (String(user._id) == String(project.user_id)) { ]]
+         <a href="/project/[[- project.slug ]]/edit">
+					 [[- project.name ]]<br>
+				 	 [[- project.date ]]
+				 </a>
+				 [[ } else  { ]]
+					<a href="/project/[[- project.slug ]]" class="roomName">
+						[[- project.name ]]<br>
+						[[- project.date ]]
+					[[ } ]]
 				</div>
 			</span>