diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index c36fc369b..9ab5350fe 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1621,6 +1621,15 @@ class Application_Model_Show {
else if ($p_editable && $nowEpoch < $endsEpoch) {
$options["editable"] = true;
}
+
+ $showInstance = new Application_Model_ShowInstance($show["instance_id"]);
+ $showContent = $showInstance->getShowListContent();
+ if (empty($showContent)) {
+ $options["show_empty"] = 1;
+ } else {
+ $options["show_empty"] = 0;
+ }
+
$events[] = &self::makeFullCalendarEvent($show, $options, $startsDT, $endsDT, $startsEpochStr, $endsEpochStr);
}
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 4f17a5d40..ab13df7b9 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1722,17 +1722,21 @@ div.errors{
}
.small-icon.recording {
background:url(images/icon_record.png) no-repeat 0 0;
+ margin-top: 0px !important;
}
.small-icon.rebroadcast {
background:url(images/icon_rebroadcast.png) no-repeat 0 0;
+ margin-top: 0px !important;
}
.small-icon.soundcloud {
background:url(images/icon_soundcloud.png) no-repeat 0 0;
width:21px;
+ margin-top: 0px !important;
}
.small-icon.sc-error {
background:url(images/icon_soundcloud_error2.png) no-repeat 0 0;
width:21px;
+ margin-top: 0px !important;
}
.small-icon.progress {
background:url(images/upload-icon.gif) no-repeat;
@@ -1741,6 +1745,7 @@ div.errors{
border-radius:2px;
-webkit-border-radius:2px;
-moz-border-radius:2px;
+ margin-top: 0px !important;
}
.small-icon.alert {
background:url(images/icon_alert.png) no-repeat;
@@ -1749,6 +1754,11 @@ div.errors{
margin-right:3px;
margin-left:1px;
}
+.small-icon.show-empty {
+ background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat 0 -144px;
+ width: 16px;
+ margin-top: 0px !important;
+}
.medium-icon {
display:block;
width:25px;
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 d0be9d108..dd69dc71b 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -244,14 +244,39 @@ function eventRender(event, element, view) {
} else if (view.name === 'month' && event.record === 1 && event.soundcloud_id === -3) {
$(element).find(".fc-event-title").after('');
}
+
+ //add scheduled show content empty icon
+ 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('');
+ } else if (event.soundcloud_id > 0) {
+
+ } else if (event.soundcloud_id === -2) {
+
+ } else if (event.soundcloud_id === -3) {
+
+ }
+ }
+ } 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('');
+ } else if (event.soundcloud_id > 0) {
+
+ } else if (event.soundcloud_id === -2) {
+
+ } else if (event.soundcloud_id === -3) {
+
+ }
+ }
+ }
//rebroadcast icon
if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) {
-
$(element).find(".fc-event-time").before('');
}
if(view.name === 'month' && event.rebroadcast === 1) {
-
$(element).find(".fc-event-title").after('');
}
}
@@ -403,6 +428,24 @@ function addQtipToSCIcons(ele){
ready: true // Needed to make it show on first mouseover event
}
});
+ }else if ($(ele).hasClass("show-empty")){
+ $(ele).qtip({
+ content: {
+ text: "This show has no scheduled content."
+ },
+ position:{
+ adjust: {
+ resize: true,
+ method: "flip flip"
+ },
+ at: "right center",
+ my: "left top",
+ viewport: $(window)
+ },
+ show: {
+ ready: true // Needed to make it show on first mouseover event
+ }
+ });
}
}