Merge branch '2.3.x' into devel

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php

airtime_mvc/public/js/airtime/login/login.js

@@ -1,6 +1,6 @@
 $(window).load(function(){
     $("#username").focus();
-    $("#locale").val($.cookie("airtime_locale")!== null?$.cookie("airtime_locale"):'en_CA');
+    $("#locale").val($.cookie("airtime_locale")!== null?$.cookie("airtime_locale"):$.cookie("default_airtime_locale"));
 });
 
 $(document).ready(function() {

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

@@ -111,6 +111,7 @@ $(document).ready(function() {
         $.post(url, {format: "json", data: data}, function(data){
             var json = $.parseJSON(data);
             $('#content').empty().append(json.html);
+            $.cookie("default_airtime_locale", $('#locale').val(), {path: '/'});
             setTimeout(removeSuccessMsg, 5000);
             showErrorSections();
         });

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

@@ -28,7 +28,7 @@ function rebuildStreamURL(ele){
     }else{
         streamurl = "http://"+host+":"+port+"/"
     }
-    div.find("#stream_url").html(streamurl)
+    div.find("#stream_url").text(streamurl)
 }
 function restrictOggBitrate(ele, on){
     var div = ele.closest("div")

airtime_mvc/public/js/airtime/schedule/add-show.js

@@ -37,7 +37,7 @@ function createDateInput(el, onSelect) {
         dayNamesMin: i18n_days_short,
         closeText: $.i18n._('Close'),
         //showButtonPanel: true,
-        firstDay: weekStart
+        firstDay: calendarPref.weekStart
 		});
 }
 
@@ -324,7 +324,7 @@ function setAddShowEvents() {
         dayNamesMin: i18n_days_short,
         closeText: 'Close',
         showButtonPanel: true,
-        firstDay: weekStart
+        firstDay: calendarPref.weekStart
 	});
     form.find('input[name^="add_show_rebroadcast_time"]').timepicker({
         amPmText: ['', ''],

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

@@ -326,21 +326,36 @@ function eventResize( event, dayDelta, minuteDelta, revertFunc, jsEvent, ui, vie
         });
 }
 
-function getFullCalendarEvents(start, end, callback) {
-    var url, start_date, end_date;
-
-    start_date = makeTimeStamp(start);
-    end_date = makeTimeStamp(end);
-
-    url = baseUrl+'Schedule/event-feed';
-
+function preloadEventFeed () {
+    var url = baseUrl+'Schedule/event-feed-preload';
     var d = new Date();
-    
-    $.post(url, {format: "json", start: start_date, end: end_date, cachep: d.getTime()}, function(json){
-        callback(json.events);
+
+    $.post(url, {format: "json", cachep: d.getTime()}, function(json){
+        calendarEvents = json.events;
+        createFullCalendar({calendarInit: calendarPref});
     });
 }
 
+var initialLoad = true;
+function getFullCalendarEvents(start, end, callback) {
+    
+    if (initialLoad) {
+        initialLoad = false;
+        callback(calendarEvents);
+    } else {
+        var url, start_date, end_date;
+
+        start_date = makeTimeStamp(start);
+        end_date = makeTimeStamp(end);
+        url = baseUrl+'Schedule/event-feed';
+
+        var d = new Date();
+            $.post(url, {format: "json", start: start_date, end: end_date, cachep: d.getTime()}, function(json){
+                callback(json.events);
+            });
+    }
+}
+
 function checkSCUploadStatus(){
     var url = baseUrl+'Library/get-upload-to-soundcloud-status/format/json';
     $("span[class*=progress]").each(function(){
@@ -541,6 +556,7 @@ function alertShowErrorAndReload(){
   window.location.reload();
 }
 
+preloadEventFeed();
 $(document).ready(function(){
     setInterval( "checkSCUploadStatus()", 5000 );
     setInterval( "getCurrentShow()", 5000 );

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

@@ -328,9 +328,6 @@ function alertShowErrorAndReload(){
 }
 
 $(document).ready(function() {
-	$.ajax({ url: baseUrl+"Api/calendar-init/format/json", dataType:"json", success:createFullCalendar
-            , error:function(jqXHR, textStatus, errorThrown){}});
-    
     setInterval(checkCalendarSCUploadStatus, 5000);
     
     $.contextMenu({