From 9a2cfe7da6808a04b7c668075e9e9598ddb5ae04 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 11 Jul 2014 17:07:05 -0400
Subject: basic media editor

---
 views/controls/editor/media-editor.ejs | 30 +++++++++++++++++++-----------
 views/editor.ejs                       |  2 +-
 views/partials/scripts.ejs             |  3 ++-
 3 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'views')

diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 95aabb5..483fa72 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox settings" id="editorMediaSettings">
+<div class="vvbox settings" id="mediaEditor">
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
@@ -15,24 +15,32 @@
 			<span class="ion-play"></span>
 			<span class="ion-pause"></span>
 		</span>
-		
 <!-- 
 		ion-volume-high
 		ion-volume-mute
  -->
-		
-		<input type="checkbox" name="autoplay" value="1"> Autoplay
-		<input type="checkbox" name="loop" value="1"> Loop
-		<input type="checkbox" name="mute" value="1"> Mute
-		<input type="range" min="0" max="1" name="keyframe"> Initial Still
+	</div>
+	<div class="video setting">
+		<input type="checkbox" name="autoplay" value="1" id="video_autoplay">
+		<label for="video_autoplay">Autoplay</label>
+		<input type="checkbox" name="loop" value="1" id="video_loop">
+		<label for="video_loop">Loop</label>
+		<input type="checkbox" name="mute" value="1" id="video_mute">
+		<label for="video_mute">Mute</label>
+	</div>
+
+	<div class="video setting">
+		Initial Still
+		<br>
+		<input type="range" min="0" max="1" value="0" step="0.01" name="keyframe">
 	</div>
 
 	<div class="image setting">
-		Dimensions
-		<input type="text" name="width"> Width
-		<input type="text" name="height"> Height
+		Dimensions<br>
+		<input type="text" name="width" placeholder="width" class="number">
+		<input type="text" name="height" placeholder="height" class="number">
 		<select name="units">
-			<option value="inches">in</option>
+			<option value="inch">inch</option>
 			<option value="cm">cm</option>
 		</select>
 	</div>
diff --git a/views/editor.ejs b/views/editor.ejs
index a79eb9a..5d1e052 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -13,8 +13,8 @@
 
 		<div id="editorView">
 			[[ include controls/editor/toolbar ]]
-			[[ include controls/editor/video-toolbar ]]
 			[[ include controls/editor/media-drawer ]]
+			[[ include controls/editor/media-editor ]]
 			[[ include controls/editor/wallpaper ]]
 			[[ include controls/editor/light-control ]]
 			[[ include controls/editor/settings ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 6dd4480..40bb306 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -78,13 +78,14 @@
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderToolbar.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderView.js"></script>
 
+<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/MediaEditor.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/reader/ReaderView.js"></script>
 
-- 
cgit v1.2.3-70-g09d2