Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc-3637-fix-external-source-dashboard-display' into devel

This commit is contained in:
denise 2012-04-18 12:32:21 -04:00
parent 000f7d549c 3ddabf5cf7
commit 843299361a
3 changed files with 22 additions and 3 deletions
Show Stats 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; ?>

19
airtime_mvc/public/js/airtime/dashboard/playlist.js
View File

@ -8,6 +8,8 @@ var nextSong = null;
var currentShow = new Array();
var nextShow = new Array();
var showName = null;
var currentElem;
var serverUpdateInterval = 5000;
@ -148,7 +150,21 @@ function updatePlaybar(){
else
$('#current').text(currentSong.name+",");
}else{
$('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>");
if (master_dj_on_air) {
if (showName) {
$('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Master Stream</span>");
} else {
$('#current').html("Current: <span style='color:red; font-weight:bold'>Master Stream</span>");
}
} else if (live_dj_on_air) {
if (showName) {
$('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Live Stream</span>");
} else {
$('#current').html("Current: <span style='color:red; font-weight:bold'>Live Stream</span>");
}
} else {
$('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>");
}
}
if (nextSong !== null){
@ -346,6 +362,7 @@ function getScheduleFromServer(){
parseItems(data.entries);
parseSourceStatus(data.source_status);
parseSwitchStatus(data.switch_status);
showName = data.show_name;
}, error:function(jqXHR, textStatus, errorThrown){}});
setTimeout(getScheduleFromServer, serverUpdateInterval);
}