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

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

This commit is contained in:
Martin Konecny 2012-03-26 17:59:53 -04:00
parent d7af91f306 44e8e96cc8
commit a50b1ffe73
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/partialviews/header.phtml
View File

@ -34,7 +34,7 @@
<li> <li>
<div id="live_dj_div"> <div id="live_dj_div">
<a id="live_dj" class="source-kick-button" onclick="kickSource(this)"></a> <a id="live_dj" class="source-kick-button" onclick="kickSource(this)"></a>
Live DJ Show Source
<div class="line-to-on-air off"></div> <div class="line-to-on-air off"></div>
<a href="#" id="live_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->live_dj_switch?></span></a> <a href="#" id="live_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->live_dj_switch?></span></a>
<div class="line-to-switch off"></div> <div class="line-to-switch off"></div>
@ -43,7 +43,7 @@
<li> <li>
<div id="master_dj_div"> <div id="master_dj_div">
<a id="master_dj" class="source-kick-button" onclick="kickSource(this)"></a> <a id="master_dj" class="source-kick-button" onclick="kickSource(this)"></a>
Master DJ Master Source
<div class="line-to-on-air off"></div> <div class="line-to-on-air off"></div>
<a href="#" id="master_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->master_dj_switch?></span></a> <a href="#" id="master_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->master_dj_switch?></span></a>
<div class="line-to-switch off"></div> <div class="line-to-switch off"></div>

21
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -401,21 +401,20 @@ function setAddShowEvents() {
// calculate duration // calculate duration
calculateDuration(endDateTime, startDateTime); calculateDuration(endDateTime, startDateTime);
}); });
if($('#cb_custom_auth').attr('checked')){
if($('#cb_custom_auth').attr('checked')){
$('#custom_auth_div').show() $('#custom_auth_div').show()
}else{ }else{
$('#custom_auth_div').hide() $('#custom_auth_div').hide()
} }
$('#cb_custom_auth').change(function(){ $('#cb_custom_auth').change(function(){
if($(this).attr('checked')){ if($(this).attr('checked')){
$('#custom_auth_div').show() $('#custom_auth_div').show()
}else{ }else{
$('#custom_auth_div').hide() $('#custom_auth_div').hide()
} }
}) })
function calculateDuration(endDateTime, startDateTime){ function calculateDuration(endDateTime, startDateTime){
var duration; var duration;