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

Merge branch '2.0.x' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
This commit is contained in:
Martin Konecny 2012-02-14 14:47:07 -05:00
commit 54cbc86a0a
3234 changed files with 71062 additions and 781848 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
View file

@ -217,7 +217,8 @@ function audioPreview(filename, elemID){
$(this).jPlayer("setMedia", media).jPlayer("play");
},
swfPath: "/js/jplayer",
supplied: supplied
supplied: supplied,
wmode:"window"
});
$('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause");

11
airtime_mvc/public/js/airtime/schedule/schedule.js
View file

@ -11,11 +11,10 @@ function closeDialog(event, ui) {
$(this).remove();
}
function checkShowLength() {
var showFilled = $("#show_time_filled").text().split('.')[0];
var showLength = $("#show_length").text();
function checkShowLength(json) {
var percent = json.percentFilled;
if (showFilled > showLength){
if (percent > 100){
$("#show_time_warning")
.text("Shows longer than their scheduled time will be cut off by a following show.")
.show();
@ -41,7 +40,7 @@ function setScheduleDialogHtml(json) {
$("#show_time_filled").empty().append(json.timeFilled);
$("#show_progressbar").progressbar( "value" , json.percentFilled );
checkShowLength();
checkShowLength(json);
}
function setScheduleDialogEvents(dialog) {
@ -297,7 +296,7 @@ function buildScheduleDialog(json){
});
dialog.dialog('open');
checkShowLength();
checkShowLength(json);
}

8
airtime_mvc/public/js/airtime/status/status.js
View file

@ -30,9 +30,11 @@ function generatePartitions(partitions){
var tr = $(row);
lastElement.after(tr);
var watched_dirs_ul = $('#watched-dir-list-'+i);
for (var j=0; j<partitions[i].dirs.length; j++){
watched_dirs_ul.append('<li>'+partitions[i].dirs[j]+'</li>');
if (partitions[i].dirs){
var watched_dirs_ul = $('#watched-dir-list-'+i);
for (var j=0; j<partitions[i].dirs.length; j++){
watched_dirs_ul.append('<li>'+partitions[i].dirs[j]+'</li>');
}
}
lastElement = tr;
}