From 64e864079585e2724648cd14da38241645f340ef Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 19 Apr 2012 12:34:51 -0400
Subject: [PATCH] CC-3668: Live stream player - volume control needs improved
usability
-new layout done, mute/un-mute image blurry (need new one)
---
.../scripts/dashboard/stream-player.phtml | 1 -
.../public/js/airtime/dashboard/playlist.js | 2 +-
.../js/jplayer/skin/jplayer-mute-unmute.png | Bin 0 -> 3128 bytes
.../js/jplayer/skin/jplayer.blue.monday.css | 30 ++++++++++--------
4 files changed, 18 insertions(+), 15 deletions(-)
create mode 100644 airtime_mvc/public/js/jplayer/skin/jplayer-mute-unmute.png
diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
index de20357df..ce4faa068 100644
--- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
@@ -75,7 +75,6 @@ $(document).ready(function(){
<ul class="jp-controls">
<li><a title="mute" tabindex="1" class="jp-mute" href="javascript:;">mute</a></li>
<li><a title="unmute" tabindex="1" class="jp-unmute" href="javascript:;">unmute</a></li>
- <!--<li><a title="max volume" tabindex="1" class="jp-volume-max" href="javascript:;">max volume</a></li>-->
</ul>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js
index 368e776d5..077d9b780 100644
--- a/airtime_mvc/public/js/airtime/dashboard/playlist.js
+++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js
@@ -434,7 +434,7 @@ function init() {
$('.listen-control-button').click(function() {
if (stream_window == null || stream_window.closed)
- stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=178');
+ stream_window=window.open(baseUrl+"Dashboard/stream-player", 'name', 'width=400,height=158');
stream_window.focus();
return false;
});
diff --git a/airtime_mvc/public/js/jplayer/skin/jplayer-mute-unmute.png b/airtime_mvc/public/js/jplayer/skin/jplayer-mute-unmute.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8dabe98275749aa72b48c307839db3d88633bd7
GIT binary patch
literal 3128
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
SIJU?D0000<MNUMnLSTZ#(EdvR
literal 0
HcmV?d00001
diff --git a/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css b/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css
index e8e710488..293dbaef0 100644
--- a/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css
+++ b/airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css
@@ -100,7 +100,7 @@ div.jp-interface {
border-bottom: 1px solid #1a1a1a;
}
div.jp-audio div.jp-type-single div.jp-interface {
- height: 70px;
+ height: 50px;
}
div.jp-audio div.jp-type-playlist div.jp-interface {
height: 80px;
@@ -282,12 +282,16 @@ div.jp-seeking-bg {
background: url(pbar-ani.gif);
}
a.jp-mute, a.jp-unmute, a.jp-volume-max {
- width: 20px;
+ width: 25px;
height: 20px;
}
-div.jp-audio div.jp-type-single a.jp-mute, div.jp-audio div.jp-type-single a.jp-unmute {
- top: 45clearpx;
- left: 210px;
+div.jp-audio div.jp-type-single a.jp-mute{
+ top: 15px;
+ left: 102px;
+}
+div.jp-audio div.jp-type-single a.jp-unmute {
+ top: 15px;
+ left: 90px;
}
div.jp-audio div.jp-type-playlist a.jp-mute, div.jp-audio div.jp-type-playlist a.jp-unmute {
top: 32px;
@@ -309,17 +313,17 @@ div.jp-video-360p div.jp-type-playlist a.jp-mute, div.jp-video-360p div.jp-type-
left: 443px;
}
a.jp-mute {
- background: url(jplayer.png) 0 -90px no-repeat;
+ background: url(jplayer-mute-unmute.png) 0 0 no-repeat;
}
a.jp-mute:hover {
- background: url(jplayer.png) -30px -90px no-repeat;
+ background: url(jplayer-mute-unmute.png) -42px 0 no-repeat;
}
a.jp-unmute {
- background: url(jplayer.png) -61px -90px no-repeat;
+ background: url(jplayer-mute-unmute.png) -84px 0 no-repeat;
display: none;
}
a.jp-unmute:hover {
- background: url(jplayer.png) -91px -90px no-repeat;
+ background: url(jplayer-mute-unmute.png) -124px 0 no-repeat;
}
div.jp-interface ul.jp-controls a.jp-volume-max {
background: url(jplayer.png) no-repeat scroll 0 -110px transparent;
@@ -342,12 +346,12 @@ div.jp-volume-bar {
border-left: 1px solid #262526;
border-right: 1px solid #262526;
width: 160px;
- height: 4px;
+ height: 7px;
cursor: pointer;
}
div.jp-audio div.jp-type-single div.jp-volume-bar {
- top: 48px;
- left: 225px;
+ top: 24px;
+ left: 120px;
}
div.jp-audio div.jp-type-playlist div.jp-volume-bar {
top: 37px;
@@ -373,7 +377,7 @@ div.jp-volume-bar-value {
background: -moz-linear-gradient(top, #fc9318 0, #e56815 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fc9318), color-stop(100%, #e56815));
width: 0px;
- height: 3px;
+ height: 6px;
}
div.jp-current-time, div.jp-duration {
position: absolute;