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

CC-3427: Live Stream: Ability to switch off Scheduled Play

Browse source 
- done
This commit is contained in:
James 2012-03-13 14:34:48 -04:00
parent e31ac81e74
commit 4eefc05366
11 changed files with 91 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -326,6 +326,8 @@ class ScheduleController extends Zend_Controller_Action
$switch_status = array();
$live_dj = Application_Model_Preference::GetSourceStatus("live_dj");
$master_dj = Application_Model_Preference::GetSourceStatus("master_dj");
$scheduled_play_switch = Application_Model_Preference::GetSourceSwitchStatus("scheduled_play");
$live_dj_switch = Application_Model_Preference::GetSourceSwitchStatus("live_dj");
$master_dj_switch = Application_Model_Preference::GetSourceSwitchStatus("master_dj");
@ -336,6 +338,7 @@ class ScheduleController extends Zend_Controller_Action
$switch_status['live_dj_source'] = $live_dj_switch;
$switch_status['master_dj_source'] = $master_dj_switch;
$switch_status['scheduled_play'] = $scheduled_play_switch;
$this->view->switch_status = $switch_status;
$this->view->entries = $range;

3
airtime_mvc/application/layouts/scripts/builder.phtml
View file

@ -14,7 +14,8 @@
$sss = $this->SourceSwitchStatus();
$scs = $this->SourceConnectionStatus();?>
<?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(),
"live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'])) ?>
"live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'],
"scheduled_play_switch"=>$sss['scheduled_play'])) ?>
<?php $partial = array('menu.phtml', 'default');
$this->navigation()->menu()->setPartial($partial); ?>

3
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -16,7 +16,8 @@
$scs = $this->SourceConnectionStatus();
?>
<?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(),
"live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'])) ?>
"live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'],
"scheduled_play_switch"=>$sss['scheduled_play'])) ?>
<?php $partial = array('menu.phtml', 'default');
$this->navigation()->menu()->setPartial($partial); ?>

3
airtime_mvc/application/layouts/scripts/library.phtml
View file

@ -15,7 +15,8 @@
$sss = $this->SourceSwitchStatus();
$scs = $this->SourceConnectionStatus(); ?>
<?php echo $this->partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(),
"live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'])) ?>
"live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'],
"scheduled_play_switch"=>$sss['scheduled_play'])) ?>
<?php $partial = array('menu.phtml', 'default');
$this->navigation()->menu()->setPartial($partial); ?>

4
airtime_mvc/application/views/helpers/SourceSwitchStatus.php
View file

@ -2,7 +2,9 @@
class Airtime_View_Helper_SourceSwitchStatus extends Zend_View_Helper_Abstract{
public function SourceSwitchStatus(){
$status = array("live_dj"=>Application_Model_Preference::GetSourceSwitchStatus("live_dj"), "master_dj"=>Application_Model_Preference::GetSourceSwitchStatus("master_dj"));
$status = array("live_dj"=>Application_Model_Preference::GetSourceSwitchStatus("live_dj"),
"master_dj"=>Application_Model_Preference::GetSourceSwitchStatus("master_dj"),
"scheduled_play"=>Application_Model_Preference::GetSourceSwitchStatus("scheduled_play"));
return $status;
}
}

6
airtime_mvc/application/views/scripts/partialviews/header.phtml
View file

@ -23,9 +23,9 @@
<div class="source-info-block">
<ul>
<li>Source Streams</li>
<li><div id="airtime_connection" class="source-connection off"></div>Airtime<div class="line-to-on-air"></div></li>
<li><div id="live_dj_connection" class="source-connection off"></div>Live DJ<div class="line-to-on-air"></div><a href="#" id="live_dj" class="source-switch-button"><span><?php echo $this->live_dj_switch?></span></a><div class="line-to-switch"></div></li>
<li><div id="master_dj_connection" class="source-connection off"></div>Master DJ<div class="line-to-on-air"></div><a href="#" id="master_dj" class="source-switch-button"><span><?php echo $this->master_dj_switch?></span></a><div class="line-to-switch"></div></li>
<li><div id="scheduled_play_connection" style="width:19px;"></div>Scheduled Play<div class="line-to-on-air off"></div><a href="#" id="scheduled_play" class="source-switch-button"><span><?php echo $this->scheduled_play_switch?></span></a><div class="line-to-switch off"></div></li>
<li><div id="live_dj_connection" class="source-connection off"></div>Live DJ<div class="line-to-on-air off"></div><a href="#" id="live_dj" class="source-switch-button"><span><?php echo $this->live_dj_switch?></span></a><div class="line-to-switch off"></div></li>
<li><div id="master_dj_connection" class="source-connection off"></div>Master DJ<div class="line-to-on-air off"></div><a href="#" id="master_dj" class="source-switch-button"><span><?php echo $this->master_dj_switch?></span></a><div class="line-to-switch off"></div></li>
</ul>
</div>
<div class="on-air-block">

15
airtime_mvc/public/css/styles.css
View file

@ -438,18 +438,33 @@ select {
height:6px;
border:1px solid #242424;
border-width:1px 1px 0 1px;
margin-left: 5px;
}
.line-to-switch.off{
background:#FFFFFF
}
.line-to-switch.on{
background:#D40000
}
.line-to-on-air {
float: right;
height:6px;
border:1px solid #242424;
border-width:1px 1px 0 1px;
width: 10px;
}
.line-to-on-air.off{
background:#FFFFFF
}
.line-to-on-air.on{
background:#D$0000
}
/* END Master Panel */

90
airtime_mvc/public/js/airtime/dashboard/playlist.js
View file

@ -15,7 +15,7 @@ var uiUpdateInterval = 200;
var master_dj_on_air = false;
var live_dj_on_air = false;
var airtime_on_air = false;
var scheduled_play_on_air = false;
//var timezoneOffset = 0;
@ -80,22 +80,20 @@ function updateProgressBarValue(){
songPercentDone = 0;
currentSong = null;
} else {
var airtime_connection = $("#airtime_connection")
var scheduled_play_connection = $("#scheduled_play_connection").parent().find(".line-to-switch")
if (currentSong.media_item_played == "t" && currentShow.length > 0){
//$('#on-air-info').attr("class", "on-air-info on");
airtime_connection.attr("class", "source-connection on");
airtime_on_air = true;
scheduled_play_connection.attr("class", "line-to-switch on");
//scheduled_play_on_air = true;
}
else{
//$('#on-air-info').attr("class", "on-air-info off");
airtime_on_air = false;
airtime_connection.attr("class", "source-connection off");
//scheduled_play_on_air = false;
scheduled_play_connection.attr("class", "line-to-switch off");
}
$('#progress-show').attr("class", "progress-show");
}
} else {
$('#on-air-info').attr("class", "on-air-info off");
$("#airtime_connection").attr("class", "source-connection off");
$("#scheduled_play_connection").parent().find(".line-to-switch").attr("class", "line-to-switch off");
$('#progress-show').attr("class", "progress-show-error");
}
$('#progress-bar').attr("style", "width:"+songPercentDone+"%");
@ -232,38 +230,20 @@ function parseItems(obj){
localRemoteTimeOffset = date.getTime() - schedulePosixTime;
}
function changeLineToWhite(div){
div.css("background", "#FFFFFF")
}
function changeLineToRed(div){
div.css("background", "#D40000")
}
function ColorOnSourceConnection(div){
div.attr("class", "source-connection on");
changeLineToRed(div.parent().find(".line-to-switch"))
}
function ColorOnSourceDisconnection(div){
div.attr("class", "source-connection off");
changeLineToWhite(div.parent().find(".line-to-switch"))
}
function parseSourceStatus(obj){
var live_div = $("#live_dj_connection")
var master_div = $("#master_dj_connection")
var live_div = $("#live_dj_connection").parent().find(".line-to-switch")
var master_div = $("#master_dj_connection").parent().find(".line-to-switch")
if(obj.live_dj_source == false){
ColorOnSourceDisconnection(live_div)
live_div.attr("class", "line-to-switch off")
}else{
ColorOnSourceConnection(live_div)
live_div.attr("class", "line-to-switch on")
}
if(obj.master_dj_source == false){
ColorOnSourceDisconnection(master_div)
master_div.attr("class", "line-to-switch off")
}else{
ColorOnSourceConnection(master_div)
master_div.attr("class", "line-to-switch on")
}
}
@ -272,26 +252,30 @@ function parseSwitchStatus(obj){
var master_div = $("#master_dj_connection")
if(obj.live_dj_source == "on" && obj.master_dj_source == "off"){
//changeLineToRed(live_div.parent().find(".line-to-on-air"))
live_dj_on_air = true;
}else{
//changeLineToWhite(live_div.parent().find(".line-to-on-air"))
live_dj_on_air = false;
}
if(obj.master_dj_source == "on"){
//changeLineToRed(master_div.parent().find(".line-to-on-air"))
master_dj_on_air = true;
}else{
master_dj_on_air = false;
//changeLineToWhite(master_div.parent().find(".line-to-on-air"))
}
if(obj.scheduled_play == "on"){
scheduled_play_on_air = true;
}else{
scheduled_play_on_air = false;
}
$("#scheduled_play.source-switch-button").find("span").html(obj.scheduled_play)
$("#live_dj.source-switch-button").find("span").html(obj.live_dj_source)
$("#master_dj.source-switch-button").find("span").html(obj.master_dj_source)
}
function controlOnAirLight(){
if(airtime_on_air || live_dj_on_air || master_dj_on_air){
if(scheduled_play_on_air || live_dj_on_air || master_dj_on_air){
$('#on-air-info').attr("class", "on-air-info on");
}else{
$('#on-air-info').attr("class", "on-air-info off");
@ -301,24 +285,24 @@ function controlOnAirLight(){
function controlSwitchLight(){
var live_div = $("#live_dj_connection")
var master_div = $("#master_dj_connection")
var airtime_div = $("#airtime_connection")
var scheduled_play_div = $("#scheduled_play_connection")
if(airtime_on_air && !live_dj_on_air && !master_dj_on_air){
changeLineToRed(airtime_div.parent().find(".line-to-on-air"))
changeLineToWhite(live_div.parent().find(".line-to-on-air"))
changeLineToWhite(master_div.parent().find(".line-to-on-air"))
if(scheduled_play_on_air && !live_dj_on_air && !master_dj_on_air){
scheduled_play_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air on")
live_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air off")
master_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air off")
}else if(live_dj_on_air && !master_dj_on_air){
changeLineToWhite(airtime_div.parent().find(".line-to-on-air"))
changeLineToRed(live_div.parent().find(".line-to-on-air"))
changeLineToWhite(master_div.parent().find(".line-to-on-air"))
scheduled_play_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air off")
live_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air on")
master_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air off")
}else if(master_dj_on_air){
changeLineToWhite(airtime_div.parent().find(".line-to-on-air"))
changeLineToWhite(live_div.parent().find(".line-to-on-air"))
changeLineToRed(master_div.parent().find(".line-to-on-air"))
scheduled_play_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air off")
live_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air off")
master_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air on")
}else{
changeLineToWhite(airtime_div.parent().find(".line-to-on-air"))
changeLineToWhite(live_div.parent().find(".line-to-on-air"))
changeLineToWhite(master_div.parent().find(".line-to-on-air"))
scheduled_play_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air off")
live_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air off")
master_div.parent().find(".line-to-on-air").attr("class", "line-to-on-air off")
}
}
@ -361,7 +345,7 @@ function setSwitchListener(){
var sourcename = $(this).attr('id')
var status_span = $(this).find("span")
var status = status_span.html()
var _class = $(this).parent().find("div.source-connection").attr("class")
var _class = $(this).parent().find("div.line-to-switch").attr("class")
var source_connection_status = false
if(_class.indexOf("off") > 0){