Merge branch '2.0.x' into devel

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

airtime_mvc/public/index.php

@@ -14,19 +14,21 @@ defined('APPLICATION_ENV')
 
 // Ensure library/ is on include_path
 set_include_path(implode(PATH_SEPARATOR, array(
-    realpath(APPLICATION_PATH . '/../library'),
     get_include_path(),
+    realpath(APPLICATION_PATH . '/../library')
 )));
 
 //Propel classes.
 set_include_path(APPLICATION_PATH . '/models' . PATH_SEPARATOR . get_include_path());
 
-//Pear classes.
-set_include_path(APPLICATION_PATH . '/../library/pear' . PATH_SEPARATOR . get_include_path());
-
 //Controller plugins.
 set_include_path(APPLICATION_PATH . '/controllers/plugins' . PATH_SEPARATOR . get_include_path());
 
+//Zend framework
+if (file_exists('/usr/share/php/libzend-framework-php')){
+    set_include_path('/usr/share/php/libzend-framework-php' . PATH_SEPARATOR . get_include_path());
+}
+
 /** Zend_Application */
 require_once 'Zend/Application.php';
 

airtime_mvc/public/install/clearstatcache.php

@@ -0,0 +1,6 @@
+<?php
+
+/* The purpose of this file is get PHP to clear its cache regarding the
+ * filesystem layout. See this ticket http://dev.sourcefabric.org/browse/CC-3320 */
+
+clearstatcache(true);

airtime_mvc/public/js/airtime/dashboard/helperfunctions.js

@@ -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");

airtime_mvc/public/js/airtime/schedule/schedule.js

@@ -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);
 }
 
 

airtime_mvc/public/js/airtime/status/status.js

@@ -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;
     }