Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
martin 2011-03-24 00:53:22 -04:00
parent bf925901c1 e57b18168a
commit 369c800bf0
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/Shows.php
View File

@ -473,15 +473,11 @@ class Show {
$event = array(); $event = array();
if($show["rebroadcast"]) { if($show["rebroadcast"]) {
$title = "REBROADCAST ".$show["name"];
$event["disableResizing"] = true; $event["disableResizing"] = true;
} }
else {
$title = $show["name"];
}
$event["id"] = $show["instance_id"]; $event["id"] = $show["instance_id"];
$event["title"] = $title; $event["title"] = $show["name"];
$event["start"] = $show["starts"]; $event["start"] = $show["starts"];
$event["end"] = $show["ends"]; $event["end"] = $show["ends"];
$event["allDay"] = false; $event["allDay"] = false;

19
public/js/airtime/schedule/full-calendar-functions.js
View File

@ -167,6 +167,25 @@ function eventRender(event, element, view) {
$(element).find(".fc-event-title").after(div); $(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('<span class="small-icon recording"></span>');
}
if(view.name === 'month' && event.record === 1) {
$(element).find(".fc-event-title").after('<span class="small-icon recording"></span>');
}
if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) {
$(element).find(".fc-event-time").after('<span class="small-icon rebroadcast"></span>');
}
if(view.name === 'month' && event.rebroadcast === 1) {
$(element).find(".fc-event-title").after('<span class="small-icon rebroadcast"></span>');
}
if(event.backgroundColor !== "") { if(event.backgroundColor !== "") {
$(element) $(element)
.css({'border-color': '#'+event.backgroundColor}) .css({'border-color': '#'+event.backgroundColor})