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

CC-6118: Playlist crossfade panel needs restyling

Browse source 
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
  by Propel so we should probably restrict the fade time to whole
  seconds....
This commit is contained in:
Albert Santoni 2015-09-04 18:35:11 -04:00
parent 1db1af3f2e
commit de322171df
5 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/LocaleController.php
View file

@ -122,7 +122,7 @@ class LocaleController extends Zend_Controller_Action
//library/spl.js
"Open Media Builder" => _("Open Media Builder"),
"please put in a time '00:00:00 (.0)'" => _("please put in a time '00:00:00 (.0)'"),
"please put in a time in seconds '00 (.0)'" => _("please put in a time in seconds '00 (.0)'"),
"Please enter a valid time in seconds. Eg. 0.5'" => _("Please enter a valid time in seconds. Eg. 0.5"),
"Your browser does not support playing this file type: " => _("Your browser does not support playing this file type: "),
"Dynamic block is not previewable" => _("Dynamic block is not previewable"),
"Limit to: " => _("Limit to: "),

6
airtime_mvc/application/models/airtime/CcPlaylistcontents.php
View file

@ -69,7 +69,9 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
}
$this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEIN;
$this->save();
//FIXME(XXX): Propel silently drops the milliseconds from our fadein time. :(
return $this;
} // setDbFadein()
@ -107,6 +109,8 @@ class CcPlaylistcontents extends BaseCcPlaylistcontents {
}
$this->modifiedColumns[] = CcPlaylistcontentsPeer::FADEOUT;
$this->save();
//FIXME(XXX): Propel silently drops the milliseconds from our fadeout time. :(
return $this;
} // setDbFadeout()

8
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View file

@ -57,11 +57,11 @@ if (isset($this->obj)) {
<div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
<span class="ui-icon ui-icon-closethick sp-closethick-center"></span>
<dl id="spl_editor-main" class="inline-list">
<dt><?php echo _("Fade in: "); ?><span class='spl_cue_hint'>(ss.m)</span></dt>
<dd><input class="playlist_main_fade_input spl_main_fade_in" value="00" /></dd>
<dt><?php echo _("Fade in: "); ?></dt>
<dd><input class="spl_main_fade_in playlist_main_fade_input" value="0" /><span class='spl_cue_hint'> seconds</span></dd>
<dd class="edit-error"></dd>
<dt><?php echo _("Fade out: "); ?><span class='spl_cue_hint'>(ss.m)</span></dt>
<dd><input class="playlist_main_fade_input spl_main_fade_out" value="00" /></dd>
<dt><?php echo _("Fade out: "); ?></dt>
<dd><input class="spl_main_fade_out playlist_main_fade_input" value="0" /><span class='spl_cue_hint'> seconds</span></dd>
<dd class="edit-error"></dd>
</dl>
</div>