Merge branch 'master' of dev.sourcefabric.org:campcaster

Conflicts:
	.zfproject.xml
	application/configs/airtime-conf.php
	build/build.properties
	public/css/styles.css

public/js/airtime/library/spl.js

@@ -146,21 +146,21 @@ function submitOnEnter(event) {
 	}
 }
 
-function setCueEvents() {
+function setCueEvents(el) {
     
-    $(".spl_cue_in span:last").blur(changeCueIn);
-	$(".spl_cue_out span:last").blur(changeCueOut);
+    $(el).find(".spl_cue_in span:last").blur(changeCueIn);
+	$(el).find(".spl_cue_out span:last").blur(changeCueOut);
 
-    $(".spl_cue_in span:first, .spl_cue_out span:first")
+    $(el).find(".spl_cue_in span:first, .spl_cue_out span:first")
         .keydown(submitOnEnter);
 }
 
-function setFadeEvents() {
+function setFadeEvents(el) {
 
-    $(".spl_fade_in span:first").blur(changeFadeIn);
-	$(".spl_fade_out span:first").blur(changeFadeOut);
+    $(el).find(".spl_fade_in span:first").blur(changeFadeIn);
+	$(el).find(".spl_fade_out span:first").blur(changeFadeOut);
 
-    $(".spl_fade_in span:first, .spl_fade_out span:first")
+    $(el).find(".spl_fade_in span:first, .spl_fade_out span:first")
         .keydown(submitOnEnter);
 }
 
@@ -198,7 +198,7 @@ function openFadeEditor(event) {
 			.append(json.html)
 			.show();
 
-        setFadeEvents();
+        setFadeEvents(li);
 	});
 }
 
@@ -231,7 +231,7 @@ function openCueEditor(event) {
 			.append(json.html)
 			.show();
 
-        setCueEvents();
+        setCueEvents(li);
 	});	
 }
 
@@ -392,13 +392,83 @@ function setUpSPL() {
 		.button()
 		.click(closeSPL);
 
-    $("#spl_main_crossfade")
-		.button({
-            icons: {
-                primary: "crossfade-main-icon"
-            },
-            text: false
-        });
+    $("#spl_crossfade").click(function(){
+
+        if($(this).hasClass("ui-state-active")) {
+            $(this).removeClass("ui-state-active");
+            $("#crossfade_main").hide();
+        }
+        else {
+            $(this).addClass("ui-state-active");
+
+            var url = '/Playlist/set-playlist-fades';
+
+	        $.get(url, {format: "json"}, function(json){
+                $("#spl_fade_in_main").find("span")
+                    .empty()
+                    .append(json.fadeIn);
+                $("#spl_fade_out_main").find("span")
+                    .empty()
+                    .append(json.fadeOut);
+
+                $("#crossfade_main").show();
+            });
+        }
+    });
+
+    $("#spl_fade_in_main span:first").blur(function(event){
+        event.stopPropagation();
+
+	    var url, fadeIn, span;
+
+	    span = $(this);
+	    url = "/Playlist/set-playlist-fades";
+	    fadeIn = span.text().trim();
+
+	    if(!isTimeValid(fadeIn)){
+            showError(span, "please put in a time '00:00:00 (.000000)'");
+		    return;
+	    }
+
+	    $.post(url, {format: "json", fadeIn: fadeIn}, function(json){
+		    if(json.response.error) {
+			    return;
+		    }
+
+             hideError(span);
+	    });
+    });
+
+    $("#spl_fade_out_main span:first").blur(function(event){
+        event.stopPropagation();
+
+	    var url, fadeIn, span;
+
+	    span = $(this);
+	    url = "/Playlist/set-playlist-fades";
+	    fadeOut = span.text().trim();
+
+	    if(!isTimeValid(fadeOut)){
+            showError(span, "please put in a time '00:00:00 (.000000)'");
+		    return;
+	    }
+
+	    $.post(url, {format: "json", fadeOut: fadeOut}, function(json){
+		    if(json.response.error) {
+			    return;
+		    }
+
+             hideError(span);
+	    });
+    });
+
+    $("#spl_fade_in_main span:first, #spl_fade_out_main span:first")
+        .keydown(submitOnEnter);
+
+    $("#crossfade_main > .ui-icon-closethick").click(function(){
+        $("#spl_crossfade").removeClass("ui-state-active");
+        $("#crossfade_main").hide();
+    });
 
 	$("#spl_delete")
 		.button()

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

@@ -70,6 +70,20 @@ function setAddShowEvents() {
         $("#schedule-show-when > fieldset:last").toggle();
     });
 
+    $("#add_show_repeat_type").change(function(){
+        var x = $(this).val();
+        if($(this).val() == 2) {
+            $("#add_show_day_check-label, #add_show_day_check-element").hide();
+        }
+        else {
+            $("#add_show_day_check-label, #add_show_day_check-element").show();
+        }
+    });
+
+    $("#add_show_no_end").click(function(){
+        $("#add_show_end_date").toggle();
+    });
+
 	start  = $("#add_show_start_date");
 	end  = $("#add_show_end_date");