From 06e38245987304ef6bddb1f9c3e6cad16a215209 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Tue, 7 Oct 2014 16:12:09 -0400
Subject: new font

---
 views/controls/reader/media-player.ejs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'views/controls/reader/media-player.ejs')

diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs
index ca03ec8..0ca89c5 100644
--- a/views/controls/reader/media-player.ejs
+++ b/views/controls/reader/media-player.ejs
@@ -1,13 +1,13 @@
 <div class="vvbox settings" id="mediaPlayer">
 
 	<span class="playButton video" data-role="play-media">
-		<span class="on icon-play"></span>
-		<span class="off icon-pause"></span>
+		<span class="on ion-play"></span>
+		<span class="off ion-pause"></span>
 	</span>
 
 	<span class="muteButton video" data-role="mute-media">
-		<span class="on icon-volume-high"></span>
-		<span class="off icon-volume-mute"></span>
+		<span class="on ion-volume-high"></span>
+		<span class="off ion-volume-mute"></span>
 	</span>
 
 	<span class="name"></span>
-- 
cgit v1.2.3-70-g09d2


From dd339f073cd53e7067ac1ea9bd2035b1c11914f0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Nov 2014 18:42:47 -0500
Subject: max-height on descriptions

---
 public/assets/stylesheets/app.css      | 16 ++++++++++++++++
 views/controls/reader/about-room.ejs   |  2 +-
 views/controls/reader/media-player.ejs |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'views/controls/reader/media-player.ejs')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 5d67f50..e6b5570 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2509,6 +2509,22 @@ a[data-role="forgot-password"] {
 .aboutRoom h1 {
 	font-size:26px;
 }
+.txt.description {
+  max-height: 200px;
+  overflow: auto;
+}
+.txt.description::-webkit-scrollbar {
+    width: 4px;
+}
+.txt.description::-webkit-scrollbar-track {
+} 
+.txt.description::-webkit-scrollbar-thumb {
+    background: #000;
+}
+::-webkit-scrollbar-thumb:window-inactive {
+    background: #888;
+}
+
 .txt {
 	font-size:12px;
 	padding:5px 0;
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index 7e02e93..2bd3f0c 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -4,7 +4,7 @@
 		<a href="[[- authorlink ]]" class="authorName">[[- author ]]</a>
 	</h1>
 	[[ if (description) { ]]
-	<span class="txt">[[- description ]]</span>
+	<span class="txt description">[[- description ]]</span>
 	[[ } ]]
 	
 	<span class="txt">Last modified [[- date ]]</span>
diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs
index 0ca89c5..9872592 100644
--- a/views/controls/reader/media-player.ejs
+++ b/views/controls/reader/media-player.ejs
@@ -13,7 +13,7 @@
 	<span class="name"></span>
 	
 	<div class="author"></div>
-	<div class="description"></div>
+	<div class="txt description"></div>
 	<div class="dimensions"></div>
 	
 </div>
-- 
cgit v1.2.3-70-g09d2


From 61343137b4600aa225318de352b06de6aa4d1707 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 14 Nov 2014 17:29:25 -0500
Subject: audio settings

---
 public/assets/javascripts/mx/primitives/mx.soundcloud.js | 3 +++
 public/assets/javascripts/ui/lib/Parser.js               | 3 +--
 views/controls/editor/media-editor.ejs                   | 8 +++++---
 views/controls/reader/media-player.ejs                   | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'views/controls/reader/media-player.ejs')

diff --git a/public/assets/javascripts/mx/primitives/mx.soundcloud.js b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
index 6ac64bb..75286d9 100644
--- a/public/assets/javascripts/mx/primitives/mx.soundcloud.js
+++ b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
@@ -17,6 +17,7 @@ MX.Soundcloud = MX.Object3D.extend({
 		this.el.classList.add("mx-scenery")
 
 		this.el.style.backgroundRepeat = 'no-repeat'
+		this.paused = true
 
   	this.ops = ops
   },
@@ -62,6 +63,8 @@ MX.Soundcloud = MX.Object3D.extend({
   },
   
   ready: function(){
+		this.seek( this.media.keyframe || 0 )
+
   	if (this.media.autoplay) {
   	  this.play()
   	}
diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js
index 87d52ef..8bc0310 100644
--- a/public/assets/javascripts/ui/lib/Parser.js
+++ b/public/assets/javascripts/ui/lib/Parser.js
@@ -132,8 +132,7 @@ var Parser = {
 						type: "soundcloud",
 						token: result.id,
 						thumbnail: result.artwork_url || result.user.avatar_url,
-						title: result.title,
-						description: result.user.username,
+						title: result.user.username + " - " + result.title,
 						width: 166,
 						height: 166,
 					})
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 1f4f720..99746e8 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -11,7 +11,7 @@
 		<textarea name="description" placeholder="short description"></textarea>
 	</div>
 	
-	<div class="video setting">
+	<div class="video audio setting">
 		<span class="playButton" data-role="play-media">
 			<span class="on ion-ios7-play-outline"></span>
 			<span class="off ion-ios7-pause-outline"></span>
@@ -21,15 +21,17 @@
 		ion-volume-mute
  -->
 	</div>
-	<div class="video setting">
+	<div class="video audio 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>
+    <span class="video">
 		<input type="checkbox" name="mute" value="1" id="video_mute">
 		<label for="video_mute">Mute</label>
+		</span>
 	</div>
-	<div class="video setting">
+	<div class="video audio setting">
 		<label for="video-keyframe">Initial Still</label>
 		<br>
 		<input type="range" min="0" max="1" value="0" step="0.01" name="keyframe" id="video-keyframe">
diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs
index 9872592..cac9992 100644
--- a/views/controls/reader/media-player.ejs
+++ b/views/controls/reader/media-player.ejs
@@ -1,6 +1,6 @@
 <div class="vvbox settings" id="mediaPlayer">
 
-	<span class="playButton video" data-role="play-media">
+	<span class="playButton video audio" data-role="play-media">
 		<span class="on ion-play"></span>
 		<span class="off ion-pause"></span>
 	</span>
-- 
cgit v1.2.3-70-g09d2