From 43b211e416fb7154079586de7b75807bd1a5ac28 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 4 Nov 2014 15:00:00 -0500
Subject: use minotaur

---
 public/assets/javascripts/ui/editor/EditorSettings.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'public/assets/javascripts/ui/editor/EditorSettings.js')

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index b96943e..de60b53 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -5,6 +5,8 @@ var EditorSettings = FormView.extend({
 	createAction: "/api/project/new",
 	updateAction: "/api/project/edit",
 	destroyAction: "/api/project/destroy",
+	
+	useMinotaur: true,
   
 	events: {
 	  "mousedown": "stopPropagation",
-- 
cgit v1.2.3-70-g09d2


From 3d8490dacba1b3020b9e1dd926ce99edfee48375 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 4 Nov 2014 15:44:45 -0500
Subject: toggle map link in settings

---
 public/assets/javascripts/ui/editor/EditorSettings.js |  6 ++++++
 views/controls/editor/settings.ejs                    | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'public/assets/javascripts/ui/editor/EditorSettings.js')

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/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index 8443abb..197ad43 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>(go there)</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>
-- 
cgit v1.2.3-70-g09d2