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

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

Browse source
This commit is contained in:
James 2012-04-18 14:03:47 -04:00
commit d3d6b10528
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -333,6 +333,7 @@ class ScheduleController extends Zend_Controller_Action
public function getCurrentPlaylistAction()
{
$range = Application_Model_Schedule::GetPlayOrderRange();
$show = Application_Model_Show::GetCurrentShow();
/* Convert all UTC times to localtime before sending back to user. */
if (isset($range["previous"])){
@ -371,6 +372,7 @@ class ScheduleController extends Zend_Controller_Action
$this->view->switch_status = $switch_status;
$this->view->entries = $range;
$this->view->show_name = $show[0]["name"];
}
public function removeGroupAction()

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

@ -38,7 +38,7 @@
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
<dd class="edit-error"></dd>
<dt>Fade out (s):</dt>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00/span></dd>
<dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
<dd class="edit-error"></dd>
</dl>
</div>
@ -52,4 +52,4 @@
<?php else : ?>
<div>No open playlist</div>
<?php endif; ?>
<?php endif; ?>