From 513a272520222784d67dc22c1ac833aa47a9c844 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 16 Oct 2014 00:58:28 -0400
Subject: rename light control to color control

---
 views/controls/editor/color-control.ejs | 28 ++++++++++++++++++++++++++++
 views/controls/editor/light-control.ejs | 28 ----------------------------
 views/controls/editor/toolbar.ejs       |  2 +-
 views/editor.ejs                        |  2 +-
 views/partials/scripts.ejs              |  2 +-
 5 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 views/controls/editor/color-control.ejs
 delete mode 100644 views/controls/editor/light-control.ejs

(limited to 'views')

diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
new file mode 100644
index 0000000..040808e
--- /dev/null
+++ b/views/controls/editor/color-control.ejs
@@ -0,0 +1,28 @@
+<div class="vvbox colorcontrol">
+	<h4>Edit Room Colors</h4>
+
+  <div class="colors">
+  </div>
+
+  <div id="color-picker" style="display: none">
+  </div>
+  
+	<div class="slider">
+		<input type="range" min="0" max="110" value="0" id="brightness-control" />
+	</div>
+
+  <div class="color-swatches">
+    <span>
+      <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
+    </span>
+    <span class="active">
+      <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
+    </span>
+    <span>
+      <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
+    </span>
+    <span>
+      <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
+    </span>
+  </div>
+</div>
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
deleted file mode 100644
index 99d68f5..0000000
--- a/views/controls/editor/light-control.ejs
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="vvbox lightcontrol">
-	<h4>Edit Room Colors</h4>
-
-  <div class="colors">
-  </div>
-
-  <div id="color-picker" style="display: none">
-  </div>
-  
-	<div class="slider">
-		<input type="range" min="0" max="110" value="0" id="brightness-control" />
-	</div>
-
-  <div class="color-swatches">
-    <span>
-      <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
-    </span>
-    <span class="active">
-      <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
-    </span>
-    <span>
-      <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
-    </span>
-    <span>
-      <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
-    </span>
-  </div>
-</div>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 1bb31b8..7b08db6 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -29,7 +29,7 @@
 		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>
 <!-- 
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 05f4b58..c9b4c95 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -103,7 +103,7 @@
 <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/HelpCursor.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/editor/LightControl.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>
-- 
cgit v1.2.3-70-g09d2