get rid of menu options

8 files changed, 35 insertions, 19 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
index 072ff7e..44e416d 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js
@@ -213,7 +213,8 @@ Map.UI.Editor = function(map){
 		if (intersects.length) {
 			wheelState = wheelState || intersects[0].copy()
 			
-			intersects[0].height = clamp( ~~(intersects[0].height - deltaY), height_min, height_max )
+			intersects[0].height = clamp( ~~(intersects[0].height + deltaY * 2), height_min, height_max )
+		  app.tube("builder-pick-room", intersects[0])
 			
 			clearTimeout(wheelTimeout)
 			wheelTimeout = setTimeout(function(){
@@ -224,7 +225,7 @@ Map.UI.Editor = function(map){
         })
         Rooms.rebuild()
         wheelState = null
-			}, 500)
+			}, 250)
 		}
 		else {
 			map.set_zoom(map.zoom_exponent - deltaY/20)
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 4f07d1f..9c2f3d3 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -30,11 +30,11 @@ var EditorToolbar = View.extend({
 	},
 	
 	toggleMap: function(state){
-		if (typeof state != "boolean") {
-		  state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
-      this.resetControls()
-		}
-    $("[data-role='toggle-map-view']").toggleClass("inuse", state)
+// 		if (typeof state != "boolean") {
+// 		  state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
+//       this.resetControls()
+// 		}
+//     $("[data-role='toggle-map-view']").toggleClass("inuse", state)
 		map.toggle(state)
 		$("#minimap").toggleClass("hide", state)
 		this.parent.info.toggle(state)
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 842e871..b2f411d 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -3,8 +3,12 @@ var HelpCursor = View.extend({
 	el: "#helpCursor",
 	
 	messages: {
-	  start: "Welcome to Vvalls!",
-	  move: "Use the up and down keys to move around. Use left and right to pivot. WASD works too.",
+	  start: "Welcome to Vvalls!  Click one of the tools at right to learn how it works.",
+	  media: "This is where you pick media to go on the walls.  You can upload media, paste links, or use some of the found media.",
+	  presets: "These presets will affect on all the walls.  Click some of them to see the walls change.",
+	  wallpaper: "Drag the wallpaper onto the walls, floor, and ceiling.",
+	  colors: "",
+	  settings: "This is where you publish your project.",
 	},
 	shown: {},
 
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 205938f..54bb38e 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -2,7 +2,10 @@
 	<h4>Map Editor</h4>
 
   <div class="no-selection">
-    Click a room to select it, or click and drag to make a new room.
+    Click and drag to make a new room.
+    Click a room to select it.
+    <br><br>
+    Press ESC to toggle the map.
   </div>
   
 	
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 8b20464..4604a7a 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,6 +1,11 @@
 <div class="vvbox lightcontrol">
 	<h4>Edit Room Colors</h4>
-  <div id="color-picker">
+
+  <h4>Preset Colors</h4>
+  <div class="colors">
+  </div>
+
+  <div id="color-picker" style="display: none">
   </div>
   
 	<div class="slider">
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index 70e48e3..8dd1986 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -1,18 +1,14 @@
 <div class="vvbox" id="presets">
-  <h4>Preset Colors</h4>
-  <div class="colors">
-  </div>
-
   <h4>Preset Styles</h4>
   <div class="presets">
-    <span data-preset="wireframe">
-      Wireframe
+    <span data-preset="inverse">
+      Inverse
     </span>
     <span data-preset="shaded">
       Shaded
     </span>
-    <span data-preset="inverse">
-      Inverse
+    <span data-preset="wireframe">
+      Wireframe
     </span>
     <span data-preset="pfunk">
       P.Funk
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 57a98b9..1bb31b8 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -1,9 +1,11 @@
 
 <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='undo'
 		data-info="undo"
 		class="ion-reply"></span>
+ -->
 	<span
 		data-role='open-media-viewer'
 		data-info="add media"
@@ -30,6 +32,7 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
+<!-- 
   <span
     data-role='toggle-text-editor'
     data-info="add text to wall"
@@ -38,6 +41,7 @@
 		data-role='toggle-map-view'
 		data-info="toggle map view"
 		class="ion-ios7-world-outline"></span>
+ -->
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 5ca0390..accafa1 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -21,15 +21,18 @@
     <input type="text" placeholder="Enter Image URL" class="url">
  -->
   </div>
+  
   <div class="wallpaperRemove toolButton">
     <span class="ion-scissors"></span>
     <label>Remove Wallpaper</label>
   </div>
 
+<!--
   <div class="wallpaperResize toolButton">
     <span class="ion-arrow-resize"></span>
     <label>Resize Wallpaper</label>
   </div>
+-->
 
   <div class="wallpaperResizeControls">
     <span data-role="wallpaper-position" class="ion-arrow-expand"></span>