diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 186603f97..3aa5528bd 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1680,6 +1680,7 @@ SELECT si1.starts AS starts, show.name AS name, show.color AS color, show.background_color AS background_color, + show.linked AS linked, si1.file_id AS file_id, si1.id AS instance_id, si1.created AS created, @@ -1835,6 +1836,7 @@ SQL; $event["end"] = $endsDT->format("Y-m-d H:i:s"); $event["allDay"] = false; $event["showId"] = intval($show["show_id"]); + $event["linked"] = intval($show["linked"]); $event["record"] = intval($show["record"]); $event["rebroadcast"] = intval($show["rebroadcast"]); $event["soundcloud_id"] = is_null($show["soundcloud_id"]) diff --git a/airtime_mvc/public/css/images/icon_link.png b/airtime_mvc/public/css/images/icon_link.png new file mode 100644 index 000000000..b6609ef74 Binary files /dev/null and b/airtime_mvc/public/css/images/icon_link.png differ diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 93a83a3e8..cbe514d07 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1958,6 +1958,10 @@ span.errors.sp-errors{ margin-left:3px; margin-top:2px; } +.small-icon.linked { + background:url(images/icon_link.png) no-repeat 0 0; + margin-top: 0px !important; +} .small-icon.recording { background:url(images/icon_record.png) no-repeat 0 0; margin-top: 0px !important; 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 4fa3c81fd..db5eadd53 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -264,23 +264,47 @@ function eventRender(event, element, view) { if (event.record === 0 && event.rebroadcast === 0) { if (view.name === 'agendaDay' || view.name === 'agendaWeek') { if (event.show_empty === 1) { - $(element) + if (event.linked) { + $(element) .find(".fc-event-time") - .before(''); + .before(''); + } else { + $(element) + .find(".fc-event-time") + .before(''); + } } else if (event.show_partial_filled === true) { - $(element) - .find(".fc-event-time") - .before(''); + if (event.linked) { + $(element) + .find(".fc-event-time") + .before(''); + } else { + $(element) + .find(".fc-event-time") + .before(''); + } } } else if (view.name === 'month') { if (event.show_empty === 1) { - $(element) - .find(".fc-event-title") - .after(''); + if (event.linked) { + $(element) + .find(".fc-event-title") + .after(''); + } else { + $(element) + .find(".fc-event-title") + .after(''); + } } else if (event.show_partial_filled === true) { - $(element) + if (event.linked) { + $(element) .find(".fc-event-title") - .after(''); + .after(''); + } else { + $(element) + .find(".fc-event-title") + .after(''); + } } } }