From 5e5777559cd36d2ef32a786b93d047a1a7a3037e Mon Sep 17 00:00:00 2001 From: Kevin Jardine Date: Tue, 13 Mar 2012 17:34:40 +0100 Subject: event times are now supported by default --- views/default/event_calendar/full_calendar_view.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'views/default/event_calendar/full_calendar_view.php') diff --git a/views/default/event_calendar/full_calendar_view.php b/views/default/event_calendar/full_calendar_view.php index b6c725908..80406ac13 100644 --- a/views/default/event_calendar/full_calendar_view.php +++ b/views/default/event_calendar/full_calendar_view.php @@ -4,14 +4,22 @@ elgg_load_js('elgg.full_calendar'); $events = $vars['events']; $event_array = array(); +$times_supported = elgg_get_plugin_setting('times','event_calendar') != 'no'; foreach($events as $e) { - $event_array[] = array( + $event_item = array( 'id' => $e->guid, 'title' => $e->title, 'start_date' => $e->start_date, 'end_date' => $e->real_end_time, ); + if ($times_supported) { + $event_item['allDay'] = FALSE; + } else { + $event_item['allDay'] = TRUE; + } + + $event_array[] = $event_item; } $json_events_string = json_encode($event_array); @@ -28,7 +36,7 @@ $(document).ready(function() { title : events[i].title, start : new Date(1000*events[i].start_date), end : new Date(1000*events[i].end_date), - allDay: false + allDay: events[i].allDay }); } -- cgit v1.2.3