Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Airtime 2.3\n"
 "Report-Msgid-Bugs-To: <contact@sourcefabric.org>\n"
 "POT-Creation-Date: 2013-02-07 16:22-0500\n"
-"PO-Revision-Date: 2013-02-08 11:13+0100\n"
+"PO-Revision-Date: 2013-02-14 17:18+0100\n"
 "Last-Translator: Daniel James <daniel.james@sourcefabric.org>\n"
 "Language-Team: Greek Localization <contact@sourcefabric.org>\n"
 "Language: el_GR\n"
@@ -2867,7 +2867,7 @@ msgstr "Εμφάνιση Πηγής "
 
 #: airtime_mvc/application/views/scripts/partialviews/header.phtml:45
 msgid "Scheduled Play"
-msgstr "Προγραμματισμένη Αναπαραγωγή"
+msgstr "Πρόγραμμα"
 
 #: airtime_mvc/application/views/scripts/partialviews/header.phtml:54
 msgid "ON AIR"

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

@@ -360,13 +360,15 @@ function controlSwitchLight(){
 }
 
 function getScheduleFromServer(){
-    $.ajax({ url: baseUrl+"Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){
+    $.ajax({ url: baseUrl+"Schedule/get-current-playlist/format/json", 
+                    dataType:"json", 
+                    success:function(data){
                 parseItems(data.entries);
                 parseSourceStatus(data.source_status);
                 parseSwitchStatus(data.switch_status);
                 showName = data.show_name;
-          }, error:function(jqXHR, textStatus, errorThrown){}});
                 setTimeout(getScheduleFromServer, serverUpdateInterval);
+          }, error:function(jqXHR, textStatus, errorThrown){}});
 }
 
 function setupQtip(){

airtime_mvc/public/js/airtime/library/library.js

@@ -768,8 +768,7 @@ var AIRTIME = (function(AIRTIME) {
         });
        
         checkImportStatus();
-        setInterval(checkImportStatus, 5000);
-        setInterval(checkLibrarySCUploadStatus, 5000);
+        checkLibrarySCUploadStatus();
         
         addQtipToSCIcons();
        
@@ -997,6 +996,7 @@ function checkImportStatus() {
             }
             div.hide();
         }
+        setTimeout(checkImportStatus, 5000);
     });
 }
     
@@ -1030,6 +1030,7 @@ function checkLibrarySCUploadStatus(){
         else if (json.sc_id == "-3") {
             span.removeClass("progress").addClass("sc-error");
         }
+        setTimeout(checkLibrarySCUploadStatus, 5000);
     }
     
     function checkSCUploadStatusRequest() {

airtime_mvc/public/js/airtime/preferences/streamsetting.js

@@ -103,6 +103,8 @@ function checkLiquidsoapStatus(){
             }
             $("#s"+id+"Liquidsoap-error-msg-element").html(html);
         }
+
+        setTimeout(checkLiquidsoapStatus, 2000);
     });
 }
 
@@ -242,10 +244,10 @@ function setupEventListeners() {
         return false;
     })
     
-    setLiveSourceConnectionOverrideListener()
+    setLiveSourceConnectionOverrideListener();
     
-    showErrorSections()
-    setInterval('checkLiquidsoapStatus()', 1000)
+    showErrorSections();
+    checkLiquidsoapStatus();
     
     // qtip for help text
     $(".override_help_icon").qtip({

airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js

@@ -376,6 +376,7 @@ function checkSCUploadStatus(){
             }else if(json.sc_id == "-3"){
                 $("span[id="+id+"]:not(.recording)").removeClass("progress").addClass("sc-error");
             }
+            setTimeout(checkSCUploadStatus, 5000);
         });
     });
 }
@@ -428,6 +429,7 @@ function getCurrentShow(){
                     $(this).remove("span[small-icon now-playing]");	
                 }    	
             });
+        setTimeout(getCurrentShow, 5000);
     }); 	
 }
 
@@ -568,8 +570,8 @@ function alertShowErrorAndReload(){
 
 preloadEventFeed();
 $(document).ready(function(){
-    setInterval( "checkSCUploadStatus()", 5000 );
-    setInterval( "getCurrentShow()", 5000 );
+    checkSCUploadStatus();
+    getCurrentShow();
 });
 
 var view_name;

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

@@ -93,6 +93,8 @@ function checkCalendarSCUploadStatus(){
         else if (json.sc_id == "-3") {
             span.removeClass("progress").addClass("sc-error");
         }
+
+        setTimeout(checkCalendarSCUploadStatus, 5000);
     }
     
     function checkSCUploadStatusRequest() {
@@ -328,7 +330,7 @@ function alertShowErrorAndReload(){
 }
 
 $(document).ready(function() {
-    setInterval(checkCalendarSCUploadStatus, 5000);
+    checkCalendarSCUploadStatus();
     
     $.contextMenu({
         selector: 'div.fc-event',

airtime_mvc/public/js/airtime/showbuilder/main_builder.js

@@ -277,12 +277,13 @@ AIRTIME = (function(AIRTIME) {
                     if (json.update === true) {
                         oTable.fnDraw();
                     }
+                    setTimeout(checkScheduleUpdates, 5000);
                 }
             });
         }
 
         //check if the timeline view needs updating.
-        setInterval(checkScheduleUpdates, 5 * 1000); //need refresh in milliseconds
+        checkScheduleUpdates();
     };
 
     mod.onResize = function() {

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

@@ -66,6 +66,7 @@ function success(data, textStatus, jqXHR){
     if (data.status.partitions){
         generatePartitions(data.status.partitions);
     }
+    setTimeout(function(){updateStatus(false);}, 5000);
 }
 
 function updateStatus(getDiskInfo){
@@ -75,5 +76,4 @@ function updateStatus(getDiskInfo){
 
 $(document).ready(function() {
     updateStatus(true);
-    setInterval(function(){updateStatus(false);}, 5000);
 });