summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-10-15 22:35:48 -0400
committerJulie Lala <jules@okfoc.us>2014-10-15 22:35:48 -0400
commit9ae4f45f24e3e79aeb32e0a128ee798381b80569 (patch)
treed82f9f35caaf497f83414348c20934cfcad99fd3
parent6ad93b573ed6e9b4b339fa0d746bf21b8f827fdb (diff)
more help text
-rw-r--r--public/assets/javascripts/defaults.js2
-rw-r--r--public/assets/javascripts/rectangles/engine/rooms/builder.js2
-rw-r--r--public/assets/javascripts/ui/editor/HelpCursor.js8
-rw-r--r--public/assets/javascripts/ui/editor/MediaViewer.js5
-rw-r--r--public/assets/javascripts/ui/editor/Presets.js4
-rwxr-xr-xpublic/assets/stylesheets/app.css2
6 files changed, 15 insertions, 8 deletions
diff --git a/public/assets/javascripts/defaults.js b/public/assets/javascripts/defaults.js
index 9ba0b4d..12aed62 100644
--- a/public/assets/javascripts/defaults.js
+++ b/public/assets/javascripts/defaults.js
@@ -3,7 +3,7 @@ app.defaults = {
units: app.units = "ft",
footResolution: 36,
meterResolution: 100,
- wallOpacity: 0.95,
+ wallOpacity: 0.98,
outlineWidth: 2,
colors: {
wall: [255,255,255],
diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 33333fb..c95734b 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -280,7 +280,7 @@
return el
}
this.make_wall = function (klass) {
- // klass += ".backface-hidden"
+ klass += ".backface-hidden"
var el = new MX.Object3D(".face" + (klass || ""))
el.width = el.height = el.scaleX = el.scaleY = el.scaleZ = 1
el.z = el.y = el.x = 0
diff --git a/public/assets/javascripts/ui/editor/HelpCursor.js b/public/assets/javascripts/ui/editor/HelpCursor.js
index 8bfaef8..9b6807e 100644
--- a/public/assets/javascripts/ui/editor/HelpCursor.js
+++ b/public/assets/javascripts/ui/editor/HelpCursor.js
@@ -5,9 +5,11 @@ var HelpCursor = View.extend({
active: false,
messages: {
- 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.",
+ start: "Welcome to Vvalls! Click one of the tools at right to learn about it.",
+ media: "This is where you pick media to go on the walls. You can upload media and paste links.",
+ addmedia: "Great, now click a wall to place this image.",
+ resize: "Drag the image to position it, or use the dots to resize.",
+ presets: "These are some basic presets to get you started. Click em! :-)",
wallpaper: "Drag the wallpaper onto the walls, floor, and ceiling.",
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.",
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index e196e41..8cae4a4 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -77,6 +77,7 @@ var MediaViewer = ModalView.extend({
this.__super__.hide.call(this)
this.deleteArmed(false)
this.parent.mediaUpload.hide()
+ this.parent.cursor.message('start')
},
load: function(){
@@ -232,7 +233,8 @@ var MediaViewer = ModalView.extend({
}
this.hide()
-
+ this.parent.cursor.message('addmedia')
+
var $ants = $('.ants');
var $floatingImg = $('.floatingImg');
@@ -267,6 +269,7 @@ var MediaViewer = ModalView.extend({
$(window).off('mousedown', _hideCursor)
app.off('cancel-scenery', _hideCursor)
$floatingImg.parent().removeClass('edit')
+ app.controller.cursor.message('resize')
}
$(window).on('mousemove', _followCursor)
$(window).on('mousedown', _hideCursor)
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
index 35b5b58..4edc957 100644
--- a/public/assets/javascripts/ui/editor/Presets.js
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -39,11 +39,11 @@ var Presets = View.extend({
},
toggle: function(state){
- this.$el.toggleClass("active", state);
+ this.$el.toggleClass("active", state)
+ this.parent.cursor.message(state ? "presets" : "start")
},
show: function(){
- this.parent.cursor.message("presets")
this.toggle(true)
},
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 250ae67..1ab1198 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1676,6 +1676,7 @@ input[type="range"]::-webkit-slider-thumb {
cursor:pointer;
border-bottom: 1px transparent solid;
}
+.presets span:hover,
.presets span.active {
text-decoration: underline;
}
@@ -1728,6 +1729,7 @@ input[type="range"]::-webkit-slider-thumb {
padding: 4px;
font-weight: 500;
z-index: 22;
+ display: none;
}
.settings.info {