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:
Martin Konecny 2012-04-12 13:41:18 -04:00
parent 83d78eb0dd a2fedaa3f1
commit bfed474b7b
3 changed files with 6 additions and 5 deletions
airtime_mvc/application
forms
GeneralPreferences.php
models
ShowInstance.php
views/scripts/dashboard
stream-player.phtml

4
airtime_mvc/application/forms/GeneralPreferences.php
View File

@ -33,8 +33,8 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
'required' => false,
'filters' => array('StringTrim'),
'validators' => array(array('regex', false,
array('/^[0-5][0-9](\.\d{1,6})?$/',
'messages' => 'enter a time in seconds 00{.000000}'))),
array('/^[0-9]{1,2}(\.\d{1,6})?$/',
'messages' => 'enter a time in seconds 0{.000000}'))),
'value' => $defaultFade,
'decorators' => array(
'ViewHelper'

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

@ -609,7 +609,10 @@ class Application_Model_ShowInstance {
$end = $this->getShowInstanceEnd(null);
$interval = $start->diff($end);
return $interval->format("%h:%I:%S");
$days = $interval->format("%d");
if ($days > 0) return "24:" . $interval->format("%I:%S");
else return $interval->format("%h:%I:%S");
}
public function getShowListContent()

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

@ -73,8 +73,6 @@ $(document).ready(function(){
<div class="jp-type-single">
<div id="jp_interface_1" class="jp-gui jp-interface">
<ul class="jp-controls">
<li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
<li><a href="javascript:;" class="jp-pause" tabindex="1">pause</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="max volume" tabindex="1" class="jp-volume-max" href="javascript:;">max volume</a></li>