merge

8 files changed, 65 insertions, 14 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 1ab9c73..c838b8b 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -70,6 +70,9 @@ Map.UI.Editor = function(map){
 
 			Rooms.remove(room)
 			app.tube("builder-destroy-room", room)
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
 			return
 		}
 		else if (intersects.length) {
@@ -178,6 +181,9 @@ Map.UI.Editor = function(map){
         
         Rooms.rebuild()
 				app.tube("builder-pick-room", room)
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
 			}
 		}
     if (base.resizing || base.dragging) {
@@ -196,6 +202,9 @@ Map.UI.Editor = function(map){
         redo: base.dragging.copy()
       })
       Rooms.rebuild()
+
+      // TODO: watch individual scenery object here
+      Minotaur.watch( app.router.editorView.settings )
     }
 
 		var intersects = Rooms.filter(function(r){
@@ -231,6 +240,10 @@ Map.UI.Editor = function(map){
           redo: intersects[0].copy()
         })
         Rooms.rebuild()
+
+        // TODO: watch individual scenery object here
+        Minotaur.watch( app.router.editorView.settings )
+
         wheelState = null
 			}, 250)
 		}
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index d5a8e7f..7337357 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -73,12 +73,13 @@ var SiteRouter = Router.extend({
 		
 		this.route()
 		
-		/*
 		if (is_mobile) {
-			$(".topLinks").hide()
-			$(".share").hide()
+      // $(".topLinks").hide()
+      // $(".share").hide()
+      $('.projectItem').each(function(){
+        this.href = this.href.replace(/\/edit$/, "")
+      })
 		}
-		*/
 		
 		$("body").removeClass("loading")
 	},
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index de60b53..2b29961 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -17,6 +17,7 @@ var EditorSettings = FormView.extend({
 		"click [data-role='clone-project']": 'clone',
 		"click [data-role='clear-project']": 'clear',
 		"click [data-role='destroy-project']": 'destroy',
+		"click [data-role='toggle-map']": 'toggleMap',
     "click #startText": "setStartPosition",
     "click #moveText": "confirmStartPosition",
     "click #confirmText": "setStartPosition",
@@ -83,6 +84,11 @@ var EditorSettings = FormView.extend({
 	  this.parent.collaborators.show()
 	},
 	
+	toggleMap: function(e){
+	  e.preventDefault()
+	  app.controller.toolbar.toggleMap()
+	},
+	
 	clone: function(e){
 		e.preventDefault()
 
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 2303d3e..90454be 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -783,6 +783,21 @@ iframe.embed {
 .profilepage .about h2:nth-child(2){
 	margin:34px 0;
 }
+.profilepage .about h2 a.homeLink {
+  background: white;
+  border: 1px solid black;
+  padding: 10px;
+}
+.profilepage .about h2 a.homeLink:hover {
+  background: black;
+  border: 1px solid black;
+  color: white;
+}
+.profilepage .about h3 {
+  font-size: 13px;
+  font-weight: 300;
+  text-align: center;
+}
 .about {
 	background-color: #ffffff;background-image:url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHdpZHRoPScyODkuNScgaGVpZ2h0PScyODkuNScgdmlld0JveD0nMCAwIDI4OS41IDI4OS41Jz4KCTxkZWZzPgoJCTxwYXR0ZXJuIGlkPSdibHVlc3RyaXBlJyBwYXR0ZXJuVW5pdHM9J3VzZXJTcGFjZU9uVXNlJyB4PScwJyB5PScwJyB3aWR0aD0nNTcuOScgaGVpZ2h0PSc1Ny45JyB2aWV3Qm94PScwIDAgMTE1LjggMTE1LjgnID4KCQk8cmVjdCB3aWR0aD0nMTEwJScgaGVpZ2h0PScxMTAlJyBmaWxsPScjZmZmZmZmJy8+CgkJCTxwYXRoIGQ9J00xLDFoMTE1Ljh2MTE1LjhoLTExNS44di0xMTUuOCcgZmlsbC1vcGFjaXR5PScwJyBzdHJva2Utd2lkdGg9JzAuOCcgc3Ryb2tlLWRhc2hhcnJheT0nMCwxLDEnIHN0cm9rZT0nI2NjY2NjYycvPgoJCTwvcGF0dGVybj4gCgkJPGZpbHRlciBpZD0nZnV6eicgeD0nMCcgeT0nMCc+CgkJCTxmZVR1cmJ1bGVuY2UgdHlwZT0ndHVyYnVsZW5jZScgcmVzdWx0PSd0JyBiYXNlRnJlcXVlbmN5PScuMiAuMycgbnVtT2N0YXZlcz0nNScgc3RpdGNoVGlsZXM9J3N0aXRjaCcvPgoJCQk8ZmVDb2xvck1hdHJpeCB0eXBlPSdzYXR1cmF0ZScgaW49J3QnIHZhbHVlcz0nMCcvPgoJCTwvZmlsdGVyPgoJPC9kZWZzPgoJPHJlY3Qgd2lkdGg9JzEwMCUnIGhlaWdodD0nMTAwJScgZmlsbD0ndXJsKCNibHVlc3RyaXBlKScvPgo8cmVjdCB3aWR0aD0nMTAwJScgaGVpZ2h0PScxMDAlJyBmaWx0ZXI9J3VybCgjZnV6eiknIG9wYWNpdHk9JzAnLz4KPC9zdmc+Cg==');
 	background-attachment: fixed;
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index 0d8f325..cd17382 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -14,13 +14,21 @@
 		</a>
     <a href="#" class="modalLink" id="goText"><span><u>view current</u></span></span>
 	</div>
+	
 	<div class="setting">
 	  <a href="#" class="modalLink" data-role='show-collaborators'>
       <span class="ion-ios7-plus-outline"></span>
       Add Collaborators
 	  </a>
 	</div>
-
+	
+	<div class="setting">
+	  <a href="#" class="modalLink" data-role='toggle-map'>
+      <span class="ion-map"></span>
+      Edit map
+    </a>
+	</div>
+	
 	<div class="setting">
 		<input type="text" name="name" placeholder="room name">
 	</div>
diff --git a/views/home.ejs b/views/home.ejs
index 56ac3f9..0a55336 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -32,7 +32,7 @@
 			</span>
 			<span>
 				<h3>Plan Your Art Show</h3>
-				<words>Whether you're and artist or curator, VValls makes visualizing art within a physical space much easier. With VValls you can build 3D rooms and put your add art to the walls. Map out how your next gallery show will look without having to drill into sheetrock.</words>
+				<words>Whether you're an artist or curator, VValls makes visualizing art within a physical space much easier. With VValls you can build 3D rooms and add art to the walls. Map out how your next gallery show will look without having to nail into sheetrock.</words>
 			</span>
 		</div>
 	</div>
@@ -43,7 +43,7 @@
 			</span>
 			<span>
 				<h3>Defy The Status Quo</h3>
-				<words>There is no platform on the internet quite like VValls. VValls opens up the possibilities of expression online. Go crazy, make other worldly rooms.</words>
+				<words>There is no platform on the internet quite like VValls. Built using advanced HTML5 techniques, VValls opens up the possibilities of expression online. Go crazy, make otherworldly rooms.</words>
 			</span>
 		</div>
 		</div>
diff --git a/views/profile.ejs b/views/profile.ejs
index 1be0702..272deb7 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -58,14 +58,16 @@
 			</h2>
 			
 			[[ if (isOwnProfile) { ]]
-    	<h2>
-				You don't have any projects yet.
-			</h2>
-			<h2>
-				<a href="#"class="btn" data-role="new-project-modal">Create a New Project</a>
-			</h2>
+        <h2>
+          You don't have any projects yet.
+        </h2>
+        <h2>
+          <a href="#"class="btn" data-role="new-project-modal">Create a New Project</a>
+        </h2>
+			[[ } else { ]]
+			  <h2><a href="/" class="homeLink">Learn more about VValls</a></h2>
+			  <h3>This person has no projects.</h3>
 			[[ } ]]
-			
 		</div>
 	[[ } ]]
 		</div>
diff --git a/views/reader.ejs b/views/reader.ejs
index b110ffd..e86bab1 100644
--- a/views/reader.ejs
+++ b/views/reader.ejs
@@ -16,6 +16,12 @@
 			[[ include controls/reader/about-room ]]
 			[[ include controls/reader/media-player ]]
 		</div>
+
+<!-- 
+		<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>
+ -->
 	</div>
 	[[ } ]]