From dd6b2cc2cdd97b6163d115e5415736bccbffa831 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 15 Oct 2014 12:36:52 -0400
Subject: get rid of menu options

---
 views/controls/builder/info.ejs         |  5 ++++-
 views/controls/editor/light-control.ejs |  7 ++++++-
 views/controls/editor/presets.ejs       | 12 ++++--------
 views/controls/editor/toolbar.ejs       |  4 ++++
 views/controls/editor/wallpaper.ejs     |  3 +++
 5 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'views')

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>
-- 
cgit v1.2.3-70-g09d2