Merge branch '2.1.x' into devel

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

@@ -304,4 +304,25 @@ $(document).ready(function() {
             at: "right center"
         },
     })
+    
+    $(".stream_username_help_icon").qtip({
+        content: {
+            text: "If your live streaming client does not ask for a username, this field should be 'source'."
+        },
+        hide: {
+            delay: 500,
+            fixed: true
+        },
+        style: {
+            border: {
+                width: 0,
+                radius: 4
+            },
+            classes: "ui-tooltip-dark ui-tooltip-rounded"
+        },
+        position: {
+            my: "left bottom",
+            at: "right center"
+        },
+    })
 });

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

@@ -220,6 +220,26 @@ function setAddShowEvents() {
             at: "right center"
         }
     });
+    form.find(".stream_username_help_icon").qtip({
+        content: {
+            text: "If your live streaming client does not ask for a username, this field should be 'source'."
+        },
+        hide: {
+            delay: 500,
+            fixed: true
+        },
+        style: {
+            border: {
+                width: 0,
+                radius: 4
+            },
+            classes: "ui-tooltip-dark ui-tooltip-rounded"
+        },
+        position: {
+            my: "left bottom",
+            at: "right center"
+        }
+    });
     
     function endDateVisibility(){
         if(form.find("#add_show_no_end").is(':checked')){

airtime_mvc/public/js/fullcalendar/AIRTIME_DEV_README_June_7_2012

@@ -91,16 +91,15 @@ denise@denise-DX4860:~/airtime/airtime_mvc/public/js/fullcalendar$ diff -u fullc
  			clearEvents();
  		}
 -		updateCells(firstTime);
-+		getOffset();
++		getOffset(firstTime);
  	}
  	
 -	
 -	
-+    function getOffset() {
++    function getOffset(firstTime) {
 +        var timezoneOffset;
 +        $.ajax({ url: "/Api/calendar-init/format/json", dataType:"json", success:function(data) {
 +            timezoneOffset = data.calendarInit.timezoneOffset*1000;
-+            var firstTime = !body;
 +            updateCells(firstTime, timezoneOffset);
 +        }, error:function(jqXHR, textStatus, errorThrown){}});
 +    }

airtime_mvc/public/js/fullcalendar/fullcalendar.js

@@ -2187,14 +2187,13 @@ function BasicView(element, calendar, viewName) {
 		}else{
 			clearEvents();
 		}
-		getOffset();
+		getOffset(firstTime);
 	}
 	
-    function getOffset() {
+    function getOffset(firstTime) {
         var timezoneOffset;
         $.ajax({ url: "/Api/calendar-init/format/json", dataType:"json", success:function(data) {
             timezoneOffset = data.calendarInit.timezoneOffset*1000;
-            var firstTime = !body;
             updateCells(firstTime, timezoneOffset);
         }, error:function(jqXHR, textStatus, errorThrown){}});
     }