From f909ab9da2f45a3020d8b8a8404c2f45cf64e4cc Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 19 Sep 2012 16:59:45 -0400
Subject: [PATCH 1/3] CC-4490: Calendar: Empty show icon should have a tooltip

-done
---
 .../public/js/airtime/schedule/full-calendar-functions.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index 7ecd6d15d..f583f4df7 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -260,7 +260,9 @@ function eventRender(event, element, view) {
         if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
             if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
                 if (event.soundcloud_id === -1) {
-                    $(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon show-empty"></span>');
+                    $(element)
+                        .find(".fc-event-time")
+                        .before('<span id="'+event.id+'" title="Show is empty" class="small-icon show-empty"></span>');
                 } else if (event.soundcloud_id > 0) {
                     
                 } else if (event.soundcloud_id === -2) {
@@ -272,7 +274,9 @@ function eventRender(event, element, view) {
         } else if (view.name === 'month') {
             if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
                 if (event.soundcloud_id === -1) {
-                    $(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon show-empty"></span>');
+                    $(element)
+                        .find(".fc-event-title")
+                        .after('<span id="'+event.id+'" title="Show is empty" class="small-icon show-empty"></span>');
                 } else if (event.soundcloud_id > 0) {
                     
                 } else if (event.soundcloud_id === -2) {

From 253a31b1ea1079032e2348a15aa4803298719d90 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 19 Sep 2012 17:05:20 -0400
Subject: [PATCH 2/3] -datatables small fix

---
 airtime_mvc/application/models/Datatables.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Datatables.php b/airtime_mvc/application/models/Datatables.php
index 751caa257..351c382d2 100644
--- a/airtime_mvc/application/models/Datatables.php
+++ b/airtime_mvc/application/models/Datatables.php
@@ -100,7 +100,7 @@ class Application_Model_Datatables
          */
         $params = array();
 
-        if ($data['advSearch'] === 'true') {
+        if (isset($data['advSearch']) && $data['advSearch'] === 'true') {
             $advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm);
             if (!empty($advancedWhere['clause'])) {
                 $where[] = join(" AND ", $advancedWhere['clause']);

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 3/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;
 }