media editor

6 files changed, 51 insertions, 26 deletions

diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index e86856c..add1ea1 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -32,7 +32,7 @@ var ReaderView = View.extend({
 		var base = this
 		
 		$(window).on('message', function(event){
-			if (event.origin !== window.location.origin) {
+			if (event.originalEvent.origin !== window.location.origin) {
 				return
 			}
 			var message = event.originalEvent.data
diff --git a/public/assets/javascripts/ui/site/ProfileView.js b/public/assets/javascripts/ui/site/ProfileView.js
index 41f04ef..8661bcd 100644
--- a/public/assets/javascripts/ui/site/ProfileView.js
+++ b/public/assets/javascripts/ui/site/ProfileView.js
@@ -1,20 +1,19 @@
 
 var ProfileView = View.extend({
 
-	initialize: function(){
+	initialize: function() {
 	},
 
-	load: function(){
+	load: function() {
 		var classes = ['one', 'two', 'three', 'four',
 		               'five', 'six', 'seven', 'eight',
 		               'nine', 'ten', 'eleven', 'twelve',
 		               'thirteen'];
 		$(".bio").addClass(choice(classes));
 		
-		$("td.border").each(function(){
+		$("td.border").each(function() {
 			var iframe = $(this).find("iframe").get('0')
 			if (! iframe) return
-			console.log(iframe)
 			$(this).on({
 				mouseenter: function(e){
 					iframe.contentWindow.postMessage("spin-on", window.location.origin)
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 93405fc..95aabb5 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -3,28 +3,45 @@
 	<input type="hidden" name="_id" value="new">
 
 	<div class="setting">
-		<input type="text" name="name" placeholder="room name" />
+		<input type="text" name="name" placeholder="media title">
 	</div>
 	
 	<div class="setting">
 		<textarea name="description" placeholder="short description"></textarea>
 	</div>
+	
+	<div class="video setting">
+		<span class="play">
+			<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="setting">
-		<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 class="image setting">
+		Dimensions
+		<input type="text" name="width"> Width
+		<input type="text" name="height"> Height
+		<select name="units">
+			<option value="inches">in</option>
+			<option value="cm">cm</option>
+		</select>
 	</div>
 
 	<div class="setting">
 		<button data-role="save-media">Save</button>
 	</div>
-
+	
+	<div class="setting subButtons">
+		<a href="#" data-role="destroy-media">Delete</a>
+	</div>
 </div>
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index 867d5f3..6f46be3 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -10,7 +10,7 @@
 	</div>
 
 	<div class="setting">
-		<input type="text" name="name" placeholder="room name" />
+		<input type="text" name="name" placeholder="room name">
 	</div>
 	
 	<div class="setting">
diff --git a/views/controls/editor/video-toolbar.ejs b/views/controls/editor/video-toolbar.ejs
deleted file mode 100644
index d4364a2..0000000
--- a/views/controls/editor/video-toolbar.ejs
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="edit menu edit-video">
-	<span class="icon-volume-mute toggled" data-info="mute"></span>
-	<span class="icon-ios7-compose-outline edit-text-toggle" data-info="edit wall text"></span>
-	<span class="icon-ios7-reload" data-info="loop"></span>
-	<span class="icon-ios7-arrow-forward" data-info="autoplay"></span>
-	<span class="icon-ios7-trash-outline" data-info="delete video"></span>
-</div>
diff --git a/views/controls/reader/about-media.ejs b/views/controls/reader/about-media.ejs
new file mode 100644
index 0000000..c6365ad
--- /dev/null
+++ b/views/controls/reader/about-media.ejs
@@ -0,0 +1,16 @@
+<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>