From c3603c8ff63322b26ae126f079e1a11c98c46f4d Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Sat, 11 Oct 2014 14:54:54 -0400
Subject: play button

---
 views/controls/editor/media-editor.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'views')

diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index f5e3b5b..1f4f720 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -13,8 +13,8 @@
 	
 	<div class="video setting">
 		<span class="playButton" data-role="play-media">
-			<span class="on ion-play"></span>
-			<span class="off ion-pause"></span>
+			<span class="on ion-ios7-play-outline"></span>
+			<span class="off ion-ios7-pause-outline"></span>
 		</span>
 <!-- 
 		ion-volume-high
-- 
cgit v1.2.3-70-g09d2


From f73f5c517d08581d8d1c687a42e9ef9e5598662a Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Sun, 12 Oct 2014 11:43:41 -0400
Subject: undo button on toolbar

---
 public/assets/javascripts/rectangles/engine/rooms/builder.js |  2 +-
 public/assets/javascripts/ui/editor/EditorToolbar.js         | 12 ++++++++++++
 public/assets/stylesheets/app.css                            |  2 +-
 views/controls/editor/toolbar.ejs                            |  6 +++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'views')

diff --git a/public/assets/javascripts/rectangles/engine/rooms/builder.js b/public/assets/javascripts/rectangles/engine/rooms/builder.js
index 4619eb1..33333fb 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/builder.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/builder.js
@@ -293,7 +293,7 @@
         this.el = this.rect = this.face = null
 			}
 
-			// possible if walls are opaque
+			// preferable if walls are opaque
 			// el.el.classList.add("backface-hidden")
 
 			return el
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 8a707ec..0b1da0b 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -4,6 +4,7 @@ var EditorToolbar = View.extend({
 
 	events: {
 	  "mousedown": 'stopPropagation',
+		"click [data-role='undo']": 'undo',
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
@@ -18,6 +19,17 @@ var EditorToolbar = View.extend({
 		this.parent = opt.parent
 	},
 
+	undo: function(e){
+		if (e.shiftKey) {
+			var canRedo = UndoStack.redo()
+			console.log("can redo", canRedo)
+		}
+		else {
+			var canUndo = UndoStack.undo()
+			console.log("can undo", canUndo)
+		}
+	},
+	
 	toggleMap: function(){
 		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
 		this.resetControls()
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 271f13a..849c994 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1647,7 +1647,7 @@ input[type="range"]::-webkit-slider-thumb {
   border-bottom: 1px transparent solid;
 }
 .presets span.active {
-  border-bottom: 1px dotted;
+	text-decoration: underline;
 }
 .color-swatches span {
 	display: inline-block;
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 47d7c3c..57a98b9 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -1,10 +1,14 @@
 
 <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"
 		class="ion-ios7-photos-outline"></span>
-  <span
+	<span
     data-role='toggle-presets'
     data-info="preset styles"
     class="ion-ios7-briefcase-outline"></span>
-- 
cgit v1.2.3-70-g09d2