merge

9 files changed, 60 insertions, 37 deletions

diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 205938f..2762207 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, 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/color-control.ejs
index 8b20464..8ce6e85 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/color-control.ejs
@@ -1,5 +1,9 @@
-<div class="vvbox lightcontrol">
+<div class="vvbox colorcontrol">
 	<h4>Edit Room Colors</h4>
+
+  <div class="colors">
+  </div>
+
   <div id="color-picker">
   </div>
   
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index d800426..d1e2c99 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -1,28 +1,43 @@
-<span class="fileUpload">
-	<input type="hidden" name="_csrf" value="[[- token ]]">
-	<form>
-		<span class="ion-ios7-upload-outline upload-icon"></span><br>
-		Upload File
-		<input type="file" accept="image/*" class="file" multiple>
-	</form>
-	<small>~ or ~</small><br>
-	<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
-</span>
-
 <div class="ants">
 	<div class="leftborder"></div>
 	<img class="floatingImg">
 </div>
 
+<span class="close" id="fixed_close">X</span>
+
 <div class="mediaDrawer fixed animate mediaViewer">
-	<span class="close">X</span>
-	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
+	<h2>
+	  <a href="#" class="userToggle active">Your Media</a>
+	  – <a href="#" class="foundToggle">Found Media</a>
+<!--
+	  – <a href="#" class="wallpaperToggle">Wallpaper</a>
+ -->
+	</h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
 
 	<div class="myMedia">
 	  <div class="noMedia">You have no media yet.  Upload some!</div>
+	  <span class="container"></span>
+		<a href="#" class="viewMore btn">view more</a>
 	</div>
+
+	<span class="fileUpload">
+		<input type="hidden" name="_csrf" value="[[- token ]]">
+		<form>
+			<span class="ion-ios7-upload-outline upload-icon"></span><br>
+			Upload File
+			<input type="file" accept="image/*" class="file" multiple>
+		</form>
+		<small>~ or ~</small><br>
+		<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
+	</span>
 	
 	<div class="foundMedia">
-	</div>
+	  <span class="container"></span>
+ 	</div>
+ 	
+ 	<div class="wallpaperMedia">
+	  <span class="container"></span>
+ 	</div>
+ 	
 </div>
\ No newline at end of file
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index a41c527..02e9d42 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -1,17 +1,6 @@
 <div class="vvbox" id="presets">
   <h4>Preset Styles</h4>
   <div class="presets">
-    <span data-preset="wireframe">
-      Wireframe
-    </span>
-    <span data-preset="shaded">
-      Shaded
-    </span>
-    <span data-preset="inverse">
-      Inverse
-    </span>
-    <span data-preset="pfunk">
-      P.Funk
-    </span>
   </div>
+  <input type="text" class="url" placeholder="enter a url">
 </div>
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index 5b3b553..8443abb 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -1,13 +1,18 @@
+<span id="helpCursor"></span>
+
 <div class="vvbox settings" id="editorSettings">
 	<h4>Room Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
-	<div class="setting">
-		<a href="#" class="modalLink" id="startpoint">
+	<div class="setting" id="startpoint">
+		<a href="#" class="modalLink">
 			<span class="ion-ios7-navigate-outline"></span>
-			<span id="startText">Select Startpoint</span>
-			<span id="moveText">Move to Desired Point</span></a>
+			<span id="startText">Set Startpoint</span>
+			<span id="moveText">Move to Desired Point <span class="done">done</span></span>
+			<span id="confirmText">Startpoint Confirmed</span>
+		</a>
+    <a href="#" class="modalLink" id="goText"><span>(go there)</span></span>
 	</div>
 	<div class="setting">
 	  <a href="#" class="modalLink" data-role='show-collaborators'>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 57a98b9..7b08db6 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"
@@ -27,9 +29,10 @@
 		data-info="add wallpaper"
 		class="ion-ios7-keypad-outline"></span>
 	<span
-		data-role='toggle-light-control'
+		data-role='toggle-color-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 ac025b5..39a109b 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -12,24 +12,26 @@
   
   <div class="wallpaperUpload toolButton">
     <form>
-
       <span class="ion-ios7-upload-outline upload-icon"></span>
-      <label>Upload wallpaper</label>
+      <label>Upload Wallpaper</label>
       <input type="file" accept="image/*" class="file" multiple>
     </form>
 <!-- 
     <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>
diff --git a/views/editor.ejs b/views/editor.ejs
index c0562e9..29db917 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -17,7 +17,7 @@
 			[[ include controls/editor/media-drawer ]]
 			[[ include controls/editor/media-editor ]]
 			[[ include controls/editor/wallpaper ]]
-			[[ include controls/editor/light-control ]]
+			[[ include controls/editor/color-control ]]
 			[[ include controls/editor/text-editor ]]
 			[[ include controls/editor/collaborators ]]
 			[[ include controls/editor/settings ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 07ee7a5..c9b4c95 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -102,7 +102,8 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorToolbar.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/editor/LightControl.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/HelpCursor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/ColorControl.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/Collaborators.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>