Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
James 2012-04-19 12:56:31 -04:00
parent 45fa1efc2d ad769b53d8
commit 32eb80bdeb
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
View File

@ -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>

2
airtime_mvc/public/js/airtime/dashboard/playlist.js
View File

@ -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;
});

BIN
airtime_mvc/public/js/jplayer/skin/jplayer-mute-unmute.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

30
airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css
View File

@ -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;