From e37702d371b459847a43f7c6f953dff31684d823 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 12 Jun 2014 17:19:11 -0400
Subject: media viewer appears

---
 views/controls/editor/media-drawer.ejs |  2 +-
 views/controls/editor/toolbar.ejs      | 35 +++++++++++++++++++++++++++-------
 views/partials/scripts.ejs             |  2 ++
 3 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'views')

diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index af9ea71..f5debec 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -13,7 +13,7 @@
 	<img class="floatingImg">
 </div>
 
-<div class="mediaDrawer fixed animate">
+<div class="mediaDrawer fixed animate mediaViewer">
 	<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/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 37f8114..f380cc8 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -1,9 +1,30 @@
 <div class="edit menu vvbox" id="editorToolbar">
-	<span class="icon-ios7-photos-outline addMedia" data-info="add media"></span>
-	<span class="icon-arrow-resize" data-info="resize media"></span>
-	<span class="icon-ios7-keypad-outline" data-info="add wallpaper"></span>
-	<span class="icon-ios7-sunny-outline" data-info="light control"></span>
-	<span class="icon-ios7-trash-outline delete-image-toggle" data-info="delete images"></span>
-	<span class="icon-ios7-compose-outline edit-text-toggle" data-info="edit wall text"></span>
-	<span class="icon-key" data-info="room settings"></span>
+	<span
+		data-role='open-media-viewer'
+		data-info="add media"
+		class="icon-ios7-photos-outline"></span>
+	<span
+		data-role='resize-media'
+		data-info="resize media"
+		class="icon-arrow-resize"></span>
+	<span
+		data-role='toggle-wallpaper-panel'
+		data-info="add wallpaper"
+		class="icon-ios7-keypad-outline"></span>
+	<span
+		data-role='toggle-light-control'
+		data-info="light control"
+		class="icon-ios7-sunny-outline"></span>
+	<span
+		data-role='delete-media'
+		data-info="delete media"
+		class="icon-ios7-trash-outline"></span>
+	<span
+		data-role='edit-wall-text'
+		data-info="edit wall text"
+		class="icon-ios7-compose-outline"></span>
+	<span
+		data-role='toggle-project-settings'
+		data-info="room settings"
+		class="icon-key"></span>
 </div>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 3b3ee8f..a67b80c 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -64,6 +64,8 @@
 
 <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/MediaUpload.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.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