From fedf564090f7b72987aed4b7e145de3bf75dd40a Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 9 May 2013 12:14:49 -0400
Subject: [PATCH] CC-5081: Calendar -> Add a linked show icon

---
 airtime_mvc/application/models/Show.php       |   2 +
 airtime_mvc/public/css/images/icon_link.png   | Bin 0 -> 2887 bytes
 airtime_mvc/public/css/styles.css             |   4 ++
 .../schedule/full-calendar-functions.js       |  44 ++++++++++++++----
 4 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 airtime_mvc/public/css/images/icon_link.png

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 0000000000000000000000000000000000000000..b6609ef74b166642509659b20f36ed037e3ced41
GIT binary patch
literal 2887
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

literal 0
HcmV?d00001

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('<span id="'+event.id+'" class="small-icon show-empty"></span>');
+                    .before('<span id="'+event.id+'" class="small-icon linked"></span><span id="'+event.id+'" class="small-icon show-empty"></span>');
+                } else {
+                    $(element)
+                        .find(".fc-event-time")
+                        .before('<span id="'+event.id+'" class="small-icon show-empty"></span>');
+                }
             } else if (event.show_partial_filled === true) {
-                $(element)
-                    .find(".fc-event-time")
-                    .before('<span id="'+event.id+'" class="small-icon show-partial-filled"></span>');
+                if (event.linked) {
+                    $(element)
+                        .find(".fc-event-time")
+                        .before('<span id="'+event.id+'" class="small-icon linked"></span><span id="'+event.id+'" class="small-icon show-partial-filled"></span>');
+                } else {
+                    $(element)
+                        .find(".fc-event-time")
+                        .before('<span id="'+event.id+'" class="small-icon show-partial-filled"></span>');
+                }
             }
         } else if (view.name === 'month') {
             if (event.show_empty === 1) {
-                $(element)
-                    .find(".fc-event-title")
-                    .after('<span id="'+event.id+'" title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
+                if (event.linked) {
+                    $(element)
+                        .find(".fc-event-title")
+                        .after('<span id="'+event.id+'" class="small-icon linked"></span><span id="'+event.id+'" title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
+                } else {
+                    $(element)
+                        .find(".fc-event-title")
+                        .after('<span id="'+event.id+'" title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
+                }
             } else if (event.show_partial_filled === true) {
-                $(element)
+                if (event.linked) {
+                    $(element)
                     .find(".fc-event-title")
-                    .after('<span id="'+event.id+'" title="'+$.i18n._("Show is partially filled")+'" class="small-icon show-partial-filled"></span>');
+                    .after('<span id="'+event.id+'" class="small-icon linked"></span><span id="'+event.id+'" title="'+$.i18n._("Show is partially filled")+'" class="small-icon show-partial-filled"></span>');
+                } else {
+                    $(element)
+                        .find(".fc-event-title")
+                        .after('<span id="'+event.id+'" title="'+$.i18n._("Show is partially filled")+'" class="small-icon show-partial-filled"></span>');
+                }
             }
         }
     }