From a3628ca86dc988485ad704f12092b8fd270c022d Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Wed, 19 Sep 2012 16:59:02 -0400
Subject: [PATCH 1/3] CC-4488: Database Upgrade Error, from 2.1.3 to 2.2

-fixed
---
 install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
index c27a1d563..8f8c5486c 100644
--- a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
+++ b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
@@ -22,7 +22,7 @@ WHERE id IN
     (SELECT s.id
      FROM cc_schedule s
      LEFT JOIN cc_show_instances si ON s.instance_id = si.id
-     AND si.modified_instance = 't')
+     AND si.modified_instance = 't');
 
 ALTER TABLE cc_files
 	DROP CONSTRAINT cc_files_gunid_idx;

From 29347527cf5551d538b7700389525a6e2e075c5d Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 19 Sep 2012 17:14:22 -0400
Subject: [PATCH 2/3] CC-4471: Library -> Remove extra top margin in playlist
 builder

-done
---
 airtime_mvc/application/views/scripts/playlist/playlist.phtml | 2 +-
 .../application/views/scripts/playlist/smart-block.phtml      | 2 +-
 .../application/views/scripts/webstream/webstream.phtml       | 2 +-
 airtime_mvc/public/css/playlist_builder.css                   | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index b85ee2d92..4ae48b038 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -4,7 +4,7 @@ if (isset($this->obj)) {
     $count = count($contents);
 }
 ?>
-<div class="btn-toolbar clearfix">
+<div class="btn-toolbar spl-no-top-margin clearfix">
     <div class="btn-group pull-left">
         <button id="spl_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
             New <span class="caret"></span>
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index 136f9084a..f970733c0 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -4,7 +4,7 @@ if (isset($this->obj)) {
     $count = count($contents);
 }
 ?>
-<div class="btn-toolbar clearfix">
+<div class="btn-toolbar spl-no-top-margin clearfix">
     <div class="btn-group pull-left">
         <button id="spl_new" class="btn dropdown-toggle" data-toggle='dropdown' aria-disabled="false">
             New <span class="caret"></span>
diff --git a/airtime_mvc/application/views/scripts/webstream/webstream.phtml b/airtime_mvc/application/views/scripts/webstream/webstream.phtml
index a91d8eb91..1757f9be0 100644
--- a/airtime_mvc/application/views/scripts/webstream/webstream.phtml
+++ b/airtime_mvc/application/views/scripts/webstream/webstream.phtml
@@ -1,4 +1,4 @@
-<div class="btn-toolbar clearfix">
+<div class="btn-toolbar spl-no-top-margin clearfix">
     <div class="btn-group pull-left">
         <button id="ws_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
             New <span class="caret"></span>
diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css
index 2fef8a296..342046a61 100644
--- a/airtime_mvc/public/css/playlist_builder.css
+++ b/airtime_mvc/public/css/playlist_builder.css
@@ -56,6 +56,10 @@
     
 }
 
+.spl-no-top-margin {
+    margin-top: 0px !important;
+}
+
 .ui-icon-closethick {
     margin-top: 7px;
 }

From 5a8510b909768e092e75cadce7d9f371e15cff77 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Wed, 19 Sep 2012 17:22:04 -0400
Subject: [PATCH 3/3] remove gap on right side of show builder: part 3

---
 airtime_mvc/public/js/airtime/showbuilder/main_builder.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
index 6e38afa3e..9f6047d9d 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
@@ -69,9 +69,9 @@ AIRTIME = (function(AIRTIME) {
 		
 		if ($lib.filter(':visible').length > 0) {
 	    	
-	    	$lib.width(Math.floor(screenWidth * 0.49));
+	    	$lib.width(Math.floor(screenWidth * 0.48));
 	    	    
-	    	$builder.width(Math.floor(screenWidth * 0.49))
+	    	$builder.width(Math.floor(screenWidth * 0.48))
 				.find("#sb_edit")
 					.remove()
 					.end()
@@ -155,9 +155,9 @@ AIRTIME = (function(AIRTIME) {
 			AIRTIME.showbuilder.resetTimestamp();
 			
 			$lib.show()
-				.width(Math.floor(screenWidth * 0.49));
+				.width(Math.floor(screenWidth * 0.48));
 			
-			$builder.width(Math.floor(screenWidth * 0.49))
+			$builder.width(Math.floor(screenWidth * 0.48))
 				.find("#sb_edit")
 					.remove()
 					.end()