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

Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
martin 2011-04-15 12:32:43 -04:00
parent 6db16bc6d1 4814d90824
commit be26c9a9ba
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml
View File

@ -28,7 +28,7 @@
<div id="show_progressbar"></div> <div id="show_progressbar"></div>
<span id="show_length" class="time"><?php echo $this->showLength; ?></span> <span id="show_length" class="time"><?php echo $this->showLength; ?></span>
</div> </div>
<div id="show_time_warning"></div> <div id="show_time_warning" style="display:none"></div>
</div> </div>
</div> </div>
</div> </div>

28
airtime_mvc/public/js/airtime/schedule/schedule.js
View File

@ -9,6 +9,22 @@ function closeDialog(event, ui) {
$(this).remove(); $(this).remove();
} }
function checkShowLength() {
var showFilled = $("#show_time_filled").text().split('.')[0];
var showLength = $("#show_length").text();
if (showFilled > showLength){
$("#show_time_warning")
.text("Shows longer than their scheduled time will be cut off by a following show.")
.show();
}
else {
$("#show_time_warning")
.empty()
.hide();
}
}
function setScheduleDialogHtml(json) { function setScheduleDialogHtml(json) {
var dt; var dt;
@ -23,14 +39,7 @@ function setScheduleDialogHtml(json) {
$("#show_time_filled").empty().append(json.timeFilled); $("#show_time_filled").empty().append(json.timeFilled);
$("#show_progressbar").progressbar( "value" , json.percentFilled ); $("#show_progressbar").progressbar( "value" , json.percentFilled );
var showFilled = $("#show_time_filled").text().split('.')[0]; checkShowLength();
var showLength = $("#show_length").text();
if (showFilled > showLength){
$("#show_time_warning").text("Shows longer than their scheduled time will be cut off by a following show.");
} else {
$("#show_time_warning").empty();
}
} }
function setScheduleDialogEvents(dialog) { function setScheduleDialogEvents(dialog) {
@ -221,7 +230,7 @@ function buildScheduleDialog(json){
autoOpen: false, autoOpen: false,
title: 'Schedule Playlist', title: 'Schedule Playlist',
width: 1100, width: 1100,
height: 500, height: 550,
modal: true, modal: true,
close: closeDialog, close: closeDialog,
buttons: {"Ok": function() { buttons: {"Ok": function() {
@ -231,6 +240,7 @@ function buildScheduleDialog(json){
}); });
dialog.dialog('open'); dialog.dialog('open');
checkShowLength();
} }
function buildEditDialog(json){ function buildEditDialog(json){

4
python_apps/pypo/scripts/liquidsoap.cfg
View File

@ -34,5 +34,5 @@ icecast_genre = "genre"
#liquidsoap output settings # #liquidsoap output settings #
########################################### ###########################################
output_sound_device = false output_sound_device = false
output_icecast_vorbis = false output_icecast_vorbis = true
output_icecast_mp3 = true output_icecast_mp3 = false