diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-22 13:19:12 +0200 |
| commit | 4c2cf35050032002d01978f53201723330ebfe16 (patch) | |
| tree | cb931972aae1381d0d46aa934fa56f462e4c873a /apps/calendar/index.php | |
| parent | 711aa229b882d3fc5e2fa8c22e6db2ec05642984 (diff) | |
| parent | 1bba4456420d1824ab6d58f3d9bb523fcde5c4c2 (diff) | |
| download | nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.tar.gz nextcloud-server-4c2cf35050032002d01978f53201723330ebfe16.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/index.php')
| -rw-r--r-- | apps/calendar/index.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/calendar/index.php b/apps/calendar/index.php index 4aa1f695e31..66f51c97226 100644 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -21,6 +21,10 @@ $eventSources = array(); foreach($calendars as $calendar){ $eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar); } + +$eventSources[] = array('url' => 'ajax/events.php?calendar_id=shared_rw', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable'=>'true'); +$eventSources[] = array('url' => 'ajax/events.php?calendar_id=shared_r', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable' => 'false'); + OC_Hook::emit('OC_Calendar', 'getSources', array('sources' => &$eventSources)); $categories = OC_Calendar_App::getCategoryOptions(); |