From b992801a450dae5337b7a4fd27d0f3994c12ff30 Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Fri, 15 Apr 2011 12:11:06 -0400
Subject: [PATCH 1/2] hiding/showing show overflow message properly.

---
 .../schedule/schedule-show-dialog.phtml       |  2 +-
 .../public/js/airtime/schedule/schedule.js    | 28 +++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml b/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml
index c0a28a984..2085d67e9 100644
--- a/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml
@@ -28,7 +28,7 @@
 			    <div id="show_progressbar"></div>
 			    <span id="show_length" class="time"><?php echo $this->showLength; ?></span>
 		    </div>
-            <div id="show_time_warning"></div>
+            <div id="show_time_warning" style="display:none"></div>
 	    </div>
     </div>
 </div>
diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js
index 40a56a68c..85c7dd34c 100644
--- a/airtime_mvc/public/js/airtime/schedule/schedule.js
+++ b/airtime_mvc/public/js/airtime/schedule/schedule.js
@@ -9,6 +9,22 @@ function closeDialog(event, ui) {
 	$(this).remove();
 }
 
+function checkShowLength() {
+    var showFilled = $("#show_time_filled").text().split('.')[0];
+    var showLength = $("#show_length").text();
+
+    if (showFilled > showLength){
+        $("#show_time_warning")
+            .text("Shows longer than their scheduled time will be cut off by a following show.")
+            .show();
+    }
+    else {
+        $("#show_time_warning")
+            .empty()
+            .hide();
+    }
+}
+
 
 function setScheduleDialogHtml(json) {
 	var dt;
@@ -23,14 +39,7 @@ function setScheduleDialogHtml(json) {
 	$("#show_time_filled").empty().append(json.timeFilled);
 	$("#show_progressbar").progressbar( "value" , json.percentFilled );
 
-    var showFilled = $("#show_time_filled").text().split('.')[0];
-    var showLength = $("#show_length").text();
-
-    if (showFilled > showLength){
-        $("#show_time_warning").text("Shows longer than their scheduled time will be cut off by a following show.");
-    } else {
-        $("#show_time_warning").empty();
-    }
+    checkShowLength();
 }
 
 function setScheduleDialogEvents(dialog) {
@@ -221,7 +230,7 @@ function buildScheduleDialog(json){
 		autoOpen: false,
 		title: 'Schedule Playlist',
 		width: 1100,
-		height: 500,
+		height: 550,
 		modal: true,
 		close: closeDialog,
 		buttons: {"Ok": function() {
@@ -231,6 +240,7 @@ function buildScheduleDialog(json){
 	});
 
 	dialog.dialog('open');
+    checkShowLength();
 }
 
 function buildEditDialog(json){

From 4814d90824560e72a24ca1255c038a3e2ba7d26b Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Fri, 15 Apr 2011 12:14:49 -0400
Subject: [PATCH 2/2] CC-2157 : Enable OGG streams by default, not MP3, due to
 lame distribution problems

---
 python_apps/pypo/scripts/liquidsoap.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python_apps/pypo/scripts/liquidsoap.cfg b/python_apps/pypo/scripts/liquidsoap.cfg
index 467ece4d1..360ee107f 100644
--- a/python_apps/pypo/scripts/liquidsoap.cfg
+++ b/python_apps/pypo/scripts/liquidsoap.cfg
@@ -34,5 +34,5 @@ icecast_genre = "genre"
 #liquidsoap output settings              #
 ###########################################
 output_sound_device = false
-output_icecast_vorbis = false
-output_icecast_mp3 = true
+output_icecast_vorbis = true
+output_icecast_mp3 = false