CC-2159 : Upgrade Airtime to jQuery 1.5
upgraded project to newest jQuery, fullcalender.
This commit is contained in:
parent
76a8deb455
commit
e5ab96a665
10 changed files with 5234 additions and 3991 deletions
|
@ -562,13 +562,19 @@ class Show {
|
|||
$event["end"] = $show["ends"];
|
||||
$event["allDay"] = false;
|
||||
$event["description"] = $show["description"];
|
||||
$event["color"] = $show["color"];
|
||||
$event["backgroundColor"] = $show["background_color"];
|
||||
$event["showId"] = $show["show_id"];
|
||||
$event["record"] = intval($show["record"]);
|
||||
$event["rebroadcast"] = intval($show["rebroadcast"]);
|
||||
$event["soundcloud_id"] = (is_null($show["soundcloud_id"]) ? -1 : $show["soundcloud_id"]);
|
||||
|
||||
//event colouring
|
||||
if($show["color"] != "") {
|
||||
$event["textColor"] = "#".$show["color"];
|
||||
}
|
||||
if($show["background_color"] != "") {
|
||||
$event["color"] = "#".$show["background_color"];
|
||||
}
|
||||
|
||||
foreach($options as $key=>$value) {
|
||||
$event[$key] = $value;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue