Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
commit
bfed474b7b
|
@ -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'
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue