diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:40:10 -0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-13 16:40:10 -0400 |
| commit | afcb0aee40230c68dd99f5ea2501b7ba7e444560 (patch) | |
| tree | 5ccd10e78128c70e71a36ca9080a652a7bd833d5 /apps/calendar/index.php | |
| parent | 02dc34320978bfbcb30dea34b87808837586bb65 (diff) | |
| parent | b9f9228a22944184803a8835282862e468812c1d (diff) | |
| download | nextcloud-server-afcb0aee40230c68dd99f5ea2501b7ba7e444560.tar.gz nextcloud-server-afcb0aee40230c68dd99f5ea2501b7ba7e444560.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 280b0a18867..c44de7f07df 100644 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -26,6 +26,7 @@ $eventSources[] = array('url' => 'ajax/events.php?calendar_id=shared_rw', 'backg $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(); //Fix currentview for fullcalendar if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'month') == "oneweekview"){ @@ -49,9 +50,12 @@ OC_Util::addScript('calendar', 'calendar'); OC_Util::addStyle('calendar', 'style'); OC_Util::addScript('', 'jquery.multiselect'); OC_Util::addStyle('', 'jquery.multiselect'); +OC_Util::addScript('contacts','jquery.multi-autocomplete'); +OC_Util::addScript('','oc-vcategories'); OC_App::setActiveNavigationEntry('calendar_index'); $tmpl = new OC_Template('calendar', 'calendar', 'user'); $tmpl->assign('eventSources', $eventSources); +$tmpl->assign('categories', $categories); if(array_key_exists('showevent', $_GET)){ $tmpl->assign('showevent', $_GET['showevent']); } |