From ff0b10665ed839f2ae5855b90cc8dd26d3ef740e Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Fri, 13 Jun 2014 01:23:27 -0400
Subject: bring in lightcontrol & wallpaper picker

---
 views/controls/editor/light-control.ejs |  6 +++---
 views/controls/editor/media-drawer.ejs  |  1 +
 views/controls/editor/settings.ejs      | 34 ++++++++++++++++-----------------
 views/partials/scripts.ejs              |  2 ++
 4 files changed, 23 insertions(+), 20 deletions(-)

(limited to 'views')

diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 782c400..ddd282b 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,10 +1,10 @@
 <div class="vvbox lightcontrol">
 	<div class="slider">
-		<input type="range" min="0" max="100" value="0" id="shadow-control" />
+		<input type="range" min="0" max="100" value="0" id="outline-hue" />
 		<h4>Outline Hue</h4>
 	</div>
 	<div class="slider">
-		<input type="range" min="0" max="100" value="100" id="brightness-control" />
+		<input type="range" min="0" max="100" value="100" id="wall-hue" />
 		<h4>Wall Hue</h4>
 	</div>
 	<div class="slider">
@@ -15,4 +15,4 @@
 		<input type="range" min="0" max="100" value="0" id="shadow-control" />
 		<h4>Shadow</h4>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 9667178..c3d7bd4 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -15,6 +15,7 @@
 </div>
 
 <div class="mediaDrawer fixed animate mediaViewer">
+	<span class="close">X</span>
 	<h2><a href="#" class="yourMedia active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
 	<h3 class="editBtn" id="deleteMedia">delete media</h3>
 	<div class="myMedia">
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index e21672c..27d24fc 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox settings">
+<div class="vvbox settings" id="editorSettings">
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
@@ -10,7 +10,7 @@
 	</div>
 
 	<div class="setting">
-		<input type="text" placeholder="room name" />
+		<input type="text" name="name" placeholder="room name" />
 	</div>
 	
 	<div class="setting">
@@ -20,23 +20,23 @@
 		<input type="text" placeholder="http://vvalls.com/t987" />
 	</div>
 	<div class="setting">
-	<div class="radio-group">
-		<input id="opt_1" class="radio-group__option" type="radio" name="opt" checked="checked">
-		<label class="radio-group__label" for="opt_1">
-			Everyone
-		</label>
-		<input id="opt_2" class="radio-group__option" type="radio" name="opt">
-		<label class="radio-group__label" for="opt_2">
-			Just for me
-		</label>
-	</div>
+		<div class="radio-group">
+			<input id="privacy_private" class="radio-group__option" type="radio" name="privacy" value="public" checked>
+			<label class="radio-group__label" for="privacy_private">
+				Everyone
+			</label>
+			<input id="privacy_public" class="radio-group__option" type="radio" name="privacy" value="private">
+			<label class="radio-group__label" for="privacy_public">
+				Just for me
+			</label>
+		</div>
 	</div>
 	<div class="setting">
-		<button>Save</button>
+		<button data-role="save-project">Save</button>
 	</div>
 	<div class="setting subButtons">
-		<a href="#">Clone</a>
-		<a href="#">Clear</a>
-		<a href="#" id="deleteRoom">Delete</a>
+		<a href="#" data-role="clear-project">Clear</a>
+		<a href="#" data-role="clone-project">Clone</a>
+		<a href="#" data-role="destroy-project">Delete</a>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 981acef..5cd158c 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -65,8 +65,10 @@
 
 <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/MediaUpload.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/SiteRouter.js"></script>
-- 
cgit v1.2.3-70-g09d2