Merge branch 'saas-dev' into saas

Conflicts:
	airtime_mvc/application/common/FileDataHelper.php

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

@@ -22,7 +22,7 @@ $(document).ready(function() {
 		unique_names    : 'true',
 		multiple_queues : 'true',
 		filters : [
-			{title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4,opus"}
+			{title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4,opus,aac,oga,mp1,mp2,wma,au"}
 		],
                 multipart_params : {
                     "csrf_token" : $("#csrf").attr('value'),

airtime_mvc/public/js/airtime/login/password-restore.js

@@ -1,3 +0,0 @@
-function redirectToLogin(){
-    window.location = baseUrl+"Login"
-}

airtime_mvc/public/js/airtime/nowplaying/lang-timezone-setup.js

@@ -0,0 +1,46 @@
+$(document).ready(function() {
+
+    var dialog = $("#lang-timezone-popup");
+
+    dialog.dialog({
+            autoOpen: false,
+            width: 500,
+            resizable: false,
+            modal: true,
+            position:['center','center'],
+            buttons: [
+                {
+                    id: "setup-later",
+                    text: $.i18n._("Not Now"),
+                    "class": "btn",
+                    click: function() {
+                        $(this).dialog("close");
+                    }
+                },
+                {
+                    id: "help_airtime",
+                    text: $.i18n._("OK"),
+                    "class": "btn",
+                    click: function() {
+                        $("#lang-timezone-form").submit();
+                    }
+                }
+            ]
+    });
+
+    var language = window.navigator.userLanguage || window.navigator.language;
+    if (language === undefined) {
+        language = "en_CA";
+    }
+    language = language.replace("-", "_");
+    $("#setup_language").val(language);
+
+    var timezone = jstz.determine();
+    var timezone_name = timezone.name();
+    if (timezone_name === undefined) {
+        timezone_name = "America/Toronto";
+    }
+    $("#setup_timezone").val(timezone_name);
+
+    dialog.dialog('open');
+});

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

@@ -28,7 +28,7 @@ function rebuildStreamURL(ele){
     }else{
         streamurl = "http://"+host+":"+port+"/"
     }
-    div.find("#stream_url").text(streamurl)
+    div.find("#stream_url").html('<a href="' + streamurl + '" target="_blank">' + streamurl + '</a>')
 }
 function restrictOggBitrate(ele, on){
     var div = ele.closest("div")
@@ -468,19 +468,30 @@ $(document).ready(function() {
     setupEventListeners();
     setSliderForReplayGain();
     getAdminPasswordStatus();
-    
-    $('#stream_save').live('click', function(){
-        var confirm_pypo_restart_text = sprintf($.i18n._("If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If %s is recording, and if the change causes a playout engine restart, the recording will be interrupted."), PRODUCT_NAME);
+    var s = $("[name^='customStreamSettings']:checked");
+
+    $("[id^='stream_save'], [name^='customStreamSettings']").live('click', function() {
+        var e = $(this);
+        if (e[0] == s[0]) { return; }
+        var confirm_pypo_restart_text = $.i18n._("WARNING: This will restart your stream and may cause a short dropout for your listeners!");
         if (confirm(confirm_pypo_restart_text)) {
             var data = $('#stream_form').serialize();
             var url = baseUrl+'Preference/stream-setting';
 
             $.post(url, {format:"json", data: data}, function(json){
-                $('#content').empty().append(json.html);
-                setupEventListeners();
-                setSliderForReplayGain();
-                setPseudoAdminPassword(json.s1_set_admin_pass, json.s2_set_admin_pass, json.s3_set_admin_pass, json.s4_set_admin_pass);
+                window.location.reload();
+                //$('#content').empty().append(json.html);
+                //setupEventListeners();
+                //setSliderForReplayGain();
+                //setPseudoAdminPassword(json.s1_set_admin_pass, json.s2_set_admin_pass, json.s3_set_admin_pass, json.s4_set_admin_pass);
             });
+        } else {
+            if (e.prop('checked')) {
+                if (e[0] != s[0]) {
+                    e.prop('checked', false);
+                    s.prop('checked', true);
+                }
+            }
         }
     });
 });