merge

9 files changed, 54 insertions, 38 deletions

diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs
index dd2496b..aae67d0 100644
--- a/views/controls/builder/settings.ejs
+++ b/views/controls/builder/settings.ejs
@@ -4,7 +4,7 @@
 
 	<div class="setting">
 		<a href="#" id="startpoint">
-			<span class="icon-ios7-navigate-outline"></span>
+			<span class="ion-ios7-navigate-outline"></span>
 			<span id="startText">Select Startpoint</span>
 			<span id="moveText">Move to Desired Point</span></a>
 	</div>
diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs
index a00249c..8b2e9b8 100644
--- a/views/controls/builder/toolbar.ejs
+++ b/views/controls/builder/toolbar.ejs
@@ -2,33 +2,33 @@
 	<span
 		data-role='toggle-map-view'
 		data-info="toggle map view"
-		class="icon-ios7-photos-outline"></span>
+		class="ion-ios7-photos-outline"></span>
 <!--
 	<span
 		data-role='create-mode'
 		data-info="draw"
-		class="icon-plus"></span>
+		class="ion-plus"></span>
 	<span
 		data-role='move-mode'
 		data-info="move"
-		class="icon-arrow-move"></span>
+		class="ion-arrow-move"></span>
 	<span
 		data-role='resize-mode'
 		data-info="resize"
-		class="icon-arrow-resize"></span>
+		class="ion-arrow-resize"></span>
 -->
 	<span
 		data-role='destroy-mode'
 		data-info="delete"
-		class="icon-ios7-trash-outline"></span>
+		class="ion-ios7-trash-outline"></span>
 <!--
 	<span
 		data-role='undo'
 		data-info="undo"
-		class="icon-reply"></span>
+		class="ion-reply"></span>
 -->
 	<span
 		data-role='toggle-layout-settings'
 		data-info="save layout"
-		class="icon-ios7-compose-outline"></span>
+		class="ion-ios7-compose-outline"></span>
 </div>
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index fdf95a7..8f42d8d 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -23,18 +23,18 @@
   </div>
 
   <h4>Preset Styles</h4>
-  <div class="color-swatches defaults">
-    <span>
+  <div class="presets">
+    <span data-preset="wireframe">
       Wireframe
     </span>
-    <span>
+    <span data-preset="shaded">
       Shaded
     </span>
-    <span>
-      P.Funk
+    <span data-preset="inverse">
+      Inverse
     </span>
-    <span>
-      SeaPunk
+    <span data-preset="pfunk">
+      P.Funk
     </span>
   </div>
 </div>
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 3d95fb9..10a160e 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -1,7 +1,7 @@
 <span class="fileUpload">
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<form>
-		<span class="icon-ios7-upload-outline upload-icon"></span><br>
+		<span class="ion-ios7-upload-outline upload-icon"></span><br>
 		Upload File
 		<input type="file" accept="image/*" class="file" multiple>
 	</form>
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 305a602..f5e3b5b 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 icon-play"></span>
-			<span class="off icon-pause"></span>
+			<span class="on ion-play"></span>
+			<span class="off ion-pause"></span>
 		</span>
 <!-- 
 		ion-volume-high
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index ad62b55..5b3b553 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -5,13 +5,13 @@
 
 	<div class="setting">
 		<a href="#" class="modalLink" id="startpoint">
-			<span class="icon-ios7-navigate-outline"></span>
+			<span class="ion-ios7-navigate-outline"></span>
 			<span id="startText">Select Startpoint</span>
 			<span id="moveText">Move to Desired Point</span></a>
 	</div>
 	<div class="setting">
 	  <a href="#" class="modalLink" data-role='show-collaborators'>
-      <span class="icon-ios7-plus-outline"></span>
+      <span class="ion-ios7-plus-outline"></span>
       Add Collaborators
 	  </a>
 	</div>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index f9d91af..2fad418 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -3,39 +3,39 @@
 	<span
 		data-role='open-media-viewer'
 		data-info="add media"
-		class="icon-ios7-photos-outline"></span>
+		class="ion-ios7-photos-outline"></span>
 <!-- 
 	<span
 		data-role='resize-media'
 		data-info="resize media"
-		class="icon-arrow-resize"></span>
+		class="ion-arrow-resize"></span>
 	<span
 		data-role='destroy-media'
 		data-info="delete media"
-		class="icon-ios7-trash-outline"></span>
+		class="ion-ios7-trash-outline"></span>
 	<span
 		data-role='toggle-text-editor'
 		data-info="edit wall text"
-		class="icon-ios7-compose-outline"></span>
+		class="ion-ios7-compose-outline"></span>
  -->
 	<span
 		data-role='toggle-wallpaper-panel'
 		data-info="add wallpaper"
-		class="icon-ios7-keypad-outline"></span>
+		class="ion-ios7-keypad-outline"></span>
 	<span
 		data-role='toggle-light-control'
 		data-info="edit room colors"
-		class="icon-ios7-sunny-outline"></span>
+		class="ion-ios7-sunny-outline"></span>
 
 [[ if (user.username == "test12343") { ]]
 	<span
 		data-role='toggle-text-editor'
 		data-info="add text to wall"
-		class="icon-ios7-compose-outline"></span>
+		class="ion-ios7-compose-outline"></span>
 [[ } ]]
 		
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
-		class="icon-key"></span>
+		class="ion-key"></span>
 </div>
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 95cf827..d54b9c1 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -1,14 +1,19 @@
 <div class="vvbox wallpaper">
 	<h4>Add Wallpaper</h4>
 	<!-- IF NO WALL PAPER -->
-	<span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span>
+	<span class="txt" style="margin-bottom:7px">Add custom wallpaper to walls. Begin by uploading a pattern. Or try one of these -> </span>
 	
-  <div class="swatches"></div>
+  <span class="swatches">
+  	  <span class="swatch"></span>
+			<span class="swatch"></span>
+			<span class="swatch"></span>
+			<span class="swatch"></span>
+  </span>
   
-  <div class="wallpaperUpload">
+  <div class="wallpaperUpload toolButton">
     <form>
 
-      <span class="icon-ios7-upload-outline upload-icon"></span>
+      <span class="ion-ios7-upload-outline upload-icon"></span>
       <label>Upload wallpaper</label>
       <input type="file" accept="image/*" class="file" multiple>
     </form>
@@ -16,10 +21,21 @@
     <input type="text" placeholder="Enter Image URL" class="url">
  -->
   </div>
-  <div class="wallpaperRemove">
-    <img src="/assets/img/scissors.png">
+  <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>
+    <input data-role="wallpaper-scale" type="range" min="0.01" max="8.0" step="0.1" value="1.0">
+  </div>
+
 </div>
 
 <div class="floatingSwatch"></div>
diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs
index ca03ec8..0ca89c5 100644
--- a/views/controls/reader/media-player.ejs
+++ b/views/controls/reader/media-player.ejs
@@ -1,13 +1,13 @@
 <div class="vvbox settings" id="mediaPlayer">
 
 	<span class="playButton video" data-role="play-media">
-		<span class="on icon-play"></span>
-		<span class="off icon-pause"></span>
+		<span class="on ion-play"></span>
+		<span class="off ion-pause"></span>
 	</span>
 
 	<span class="muteButton video" data-role="mute-media">
-		<span class="on icon-volume-high"></span>
-		<span class="off icon-volume-mute"></span>
+		<span class="on ion-volume-high"></span>
+		<span class="off ion-volume-mute"></span>
 	</span>
 
 	<span class="name"></span>