From f0a0e5ab14affb88e65db1839ac809d34adf7f9a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 14 Jul 2014 18:04:21 -0400
Subject: play button and stuff on the viewer

---
 views/controls/reader/about-media.ejs  | 16 ----------------
 views/controls/reader/media-player.ejs | 14 ++++++++++++++
 views/partials/scripts.ejs             |  3 +--
 views/reader.ejs                       |  1 +
 4 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 views/controls/reader/about-media.ejs
 create mode 100644 views/controls/reader/media-player.ejs

(limited to 'views')

diff --git a/views/controls/reader/about-media.ejs b/views/controls/reader/about-media.ejs
deleted file mode 100644
index c6365ad..0000000
--- a/views/controls/reader/about-media.ejs
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="vvbox" id="aboutMedia">
-
-	<span class="name"></span><br>
-	<span class="author"></span><br>
-	<span class="description"></span><br>
-	<span class="dimensions"></span><br>
-	
-	<div class="video">
-		<span class="play">
-			<span class="ion-play"></span>
-			<span class="ion-pause"></span>
-		</span>
-		<input type="range" min="0" max="1" name="keyframe">
-	</div>
-
-</div>
diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs
new file mode 100644
index 0000000..71f69a8
--- /dev/null
+++ b/views/controls/reader/media-player.ejs
@@ -0,0 +1,14 @@
+<div class="vvbox settings" id="mediaPlayer">
+
+	<span class="playButton video">
+		<span class="icon-play"></span>
+		<span class="icon-pause"></span>
+	</span>
+
+	<span class="name"></span>
+	
+	<div class="author"></div>
+	<div class="description"></div>
+	<div class="dimensions"></div>
+	
+</div>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 40bb306..47a027e 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -38,8 +38,6 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/image.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/youtube.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/vimeo.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/ui_editor.js"></script>
@@ -88,6 +86,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/reader/ReaderView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/reader/MediaPlayer.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/_router.js"></script>
 
diff --git a/views/reader.ejs b/views/reader.ejs
index c389431..44fb2dd 100644
--- a/views/reader.ejs
+++ b/views/reader.ejs
@@ -13,6 +13,7 @@
 
 		<div id="editorView">
 			[[ include controls/reader/about-room ]]
+			[[ include controls/reader/media-player ]]
 		</div>
 	</div>
 
-- 
cgit v1.2.3-70-g09d2