more help text

9 files changed, 43 insertions, 35 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index ac361a7..e47739b 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -121,6 +121,9 @@ var EditorSettings = FormView.extend({
 		
  	  $(".inuse").removeClass("inuse")
 		$("[data-role='toggle-project-settings']").toggleClass("inuse", state)
+    if (state) {
+      this.parent.cursor.show("settings")
+    }
 	},
 
 	enterSubmit: function (e) {
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index b2f411d..4a6e616 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -7,8 +7,8 @@ var HelpCursor = View.extend({
 	  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.",
+	  colors: "Use these colors to change the color of the walls, floor, and ceiling.",
+	  settings: "This is where you publish your project. Give it a name, hit save, and you'll have a URL you can share with your friends.",
 	},
 	shown: {},
 
@@ -21,7 +21,7 @@ var HelpCursor = View.extend({
   },
 
   show: function(name){
-    if (name) this.showMessage(name)
+    this.showMessage(name)
     this.$el.show()
   },
 
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 34a5a51..bb4454a 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -5,14 +5,28 @@ var LightControl = View.extend({
   events: {
     "mousedown": "stopPropagation",
     "click .color-swatches span": "select",
-    "input #shadow-control": "updateShadow",
     "mousedown #brightness-control": "beginBrightness",
     "input #brightness-control": "updateBrightness",
-    "input #outline-hue": "updateShadow",
-    "input #wall-hue": "updateShadow",
   },
+
+	colors: [
+		[255,94,58],
+		[255,149,0],
+		[255,219,76],
+		[76,217,100],
+		[52,170,220],
+		[29,98,240],
+		[198,68,252],
+		[0,0,0],
+		[74,74,74],
+		[125,126,127],
+		[209,211,212],
+		[235,235,235],
+		[255,255,255],
+	],
   
-  initialize: function(){
+  initialize: function(opt){
+    this.parent = opt.parent
 
     this.colorPicker = new LabColorPicker(this, 180, 180)
     this.$("#color-picker").append( this.colorPicker.canvas )
@@ -27,6 +41,15 @@ var LightControl = View.extend({
       ceiling: this.$("#ceiling-color"),
     }
     this.$brightnessControl = this.$("#brightness-control")
+
+    this.$colors = this.$(".colors")
+    this.colors.forEach(function(color){
+    	var $swatch = $("<span>")
+    	$swatch.css("background-color","rgb(" + color + ")")
+    	$swatch.data('color', color)
+    	this.$colors.append($swatch)
+    }.bind(this))
+    
   },
 
   modes: [ "wall", "outline", "floor", "ceiling" ],
@@ -54,6 +77,7 @@ var LightControl = View.extend({
   },
   
   show: function(){
+    this.parent.cursor.show("colors")
     this.toggle(true)
   },
   
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index b270be5..df77fb1 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -68,6 +68,7 @@ var MediaViewer = ModalView.extend({
 			this.loadTrending()
 		}
 		else {
+		  this.parent.cursor.show("media")
 			this.__super__.show.call(this)
 		}
 	},
@@ -146,6 +147,7 @@ var MediaViewer = ModalView.extend({
 		}
 		else  {
 			this.loaded = true
+      this.parent.cursor.show("media")
 			this.__super__.show.call(this)
 		}
 	},
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index 1e70aa2..6222e33 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -7,22 +7,6 @@ var Presets = View.extend({
     "click .swatches span": "selectColor",
 	},
 	
-	colors: [
-		[255,94,58],
-		[255,149,0],
-		[255,219,76],
-		[76,217,100],
-		[52,170,220],
-		[29,98,240],
-		[198,68,252],
-		[0,0,0],
-		[74,74,74],
-		[125,126,127],
-		[209,211,212],
-		[235,235,235],
-		[255,255,255],
-	],
-
   presets: {
     wireframe: {
       wall: [255,255,255],
@@ -52,13 +36,6 @@ var Presets = View.extend({
   
   initialize: function(opt){
     this.parent = opt.parent
-    this.$colors = this.$(".colors")
-    this.colors.forEach(function(color){
-    	var $swatch = $("<span>")
-    	$swatch.css("background-color","rgb(" + color + ")")
-    	$swatch.data('color', color)
-    	this.$colors.append($swatch)
-    }.bind(this))
   },
 
   toggle: function(state){
@@ -66,6 +43,7 @@ var Presets = View.extend({
   },
   
   show: function(){
+    this.parent.cursor.show("presets")
     this.toggle(true)
   },
   
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 6bf2542..541ab31 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -28,6 +28,7 @@ var WallpaperPicker = UploadView.extend({
   loaded: false,
 	show: function(){
 		if (! this.loaded) {
+      this.parent.cursor.show("wallpaper")
 			this.load()
 		}
 		else {
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 0140dc6..250ae67 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1485,10 +1485,11 @@ border-left: 1px solid black;
 	padding-bottom: 6px;
 }
 
-#presets .colors {
+.vvbox .colors {
+  max-width: 170px;
 	margin-bottom: 5px;
 }
-#presets .colors span {
+.vvbox .colors span {
 	display: inline-block;
 	font-size: 0;
 	width: 20px;
@@ -1498,7 +1499,7 @@ border-left: 1px solid black;
 	cursor: pointer;
 	transition: transform 0.2s;
 }
-#presets .colors span:hover {
+.vvbox .colors span:hover {
 	transform: translateX(3px) translateY(-3px);
 }
 
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 54bb38e..2762207 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -3,7 +3,7 @@
 
   <div class="no-selection">
     Click and drag to make a new room.
-    Click a room to select it.
+    Click a room to select, move or resize 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 4604a7a..99d68f5 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,7 +1,6 @@
 <div class="vvbox lightcontrol">
 	<h4>Edit Room Colors</h4>
 
-  <h4>Preset Colors</h4>
   <div class="colors">
   </div>