Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin Konecny 2012-04-18 19:02:53 -04:00
parent 5bea867bec de89db7c36
commit bd8ce4b0a7
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/models/Preference.php
View File

@ -154,10 +154,13 @@ class Application_Model_Preference
$fade = self::GetValue("default_fade"); $fade = self::GetValue("default_fade");
if ($fade === "") { if ($fade === "") {
return null; // the default value of the fade is 00.500000
return "00.500000";
} }
$fade = number_format($fade, 6); $fade = number_format($fade, 6);
//fades need 2 leading zeros for DateTime conversion
$fade = str_pad($fade, 9, "0", STR_PAD_LEFT);
return $fade; return $fade;
} }

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

@ -75,7 +75,7 @@ $(document).ready(function(){
<ul class="jp-controls"> <ul class="jp-controls">
<li><a title="mute" tabindex="1" class="jp-mute" href="javascript:;">mute</a></li> <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="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> <!--<li><a title="max volume" tabindex="1" class="jp-volume-max" href="javascript:;">max volume</a></li>-->
</ul> </ul>
<div class="jp-volume-bar"> <div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div> <div class="jp-volume-bar-value"></div>

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

File diff suppressed because one or more lines are too long