From 9447f4fb8203a413dd4d88eb178e906be3f857f0 Mon Sep 17 00:00:00 2001 From: naomiaro Date: Wed, 23 Mar 2011 23:36:45 -0400 Subject: [PATCH] CC-2063 : record/rebroadcast icons for calendar display icons are put on calendar. --- application/models/Shows.php | 6 +----- .../schedule/full-calendar-functions.js | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/application/models/Shows.php b/application/models/Shows.php index f0a7a20bc..8aa83beae 100644 --- a/application/models/Shows.php +++ b/application/models/Shows.php @@ -473,15 +473,11 @@ class Show { $event = array(); if($show["rebroadcast"]) { - $title = "REBROADCAST ".$show["name"]; $event["disableResizing"] = true; } - else { - $title = $show["name"]; - } $event["id"] = $show["instance_id"]; - $event["title"] = $title; + $event["title"] = $show["name"]; $event["start"] = $show["starts"]; $event["end"] = $show["ends"]; $event["allDay"] = false; diff --git a/public/js/airtime/schedule/full-calendar-functions.js b/public/js/airtime/schedule/full-calendar-functions.js index 33df795b7..ce01e4583 100644 --- a/public/js/airtime/schedule/full-calendar-functions.js +++ b/public/js/airtime/schedule/full-calendar-functions.js @@ -165,6 +165,25 @@ function eventRender(event, element, view) { } $(element).find(".fc-event-title").after(div); + } + + //add the record/rebroadcast icons if needed. + if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1) { + + $(element).find(".fc-event-time").after(''); + } + if(view.name === 'month' && event.record === 1) { + + $(element).find(".fc-event-title").after(''); + } + + if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) { + + $(element).find(".fc-event-time").after(''); + } + if(view.name === 'month' && event.rebroadcast === 1) { + + $(element).find(".fc-event-title").after(''); } if(event.backgroundColor !== "") {