diff options
| author | Max Kostikov <max@kostikov.co> | 2019-04-20 20:14:58 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-04-20 20:14:58 +0200 |
| commit | a6a17a85f32733a29c8d4242e93f1de054d4e6fb (patch) | |
| tree | b0cdc1eb3c423aa81ff609f4a3461cdc60fecb09 /Zotlabs/Widget | |
| parent | 904ae058108412de5e068b02cd45d9b8b4e90e4b (diff) | |
| parent | 9275fd16c232ac6c55da345125c240013248e972 (diff) | |
| download | volse-hubzilla-a6a17a85f32733a29c8d4242e93f1de054d4e6fb.tar.gz volse-hubzilla-a6a17a85f32733a29c8d4242e93f1de054d4e6fb.tar.bz2 volse-hubzilla-a6a17a85f32733a29c8d4242e93f1de054d4e6fb.zip | |
Merge branch 'calendar_merge' into 'dev'
calendar merge - initial checkin
See merge request hubzilla/core!1599
Diffstat (limited to 'Zotlabs/Widget')
| -rw-r--r-- | Zotlabs/Widget/Cdav.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Zotlabs/Widget/Cdav.php b/Zotlabs/Widget/Cdav.php index 589f915c5..c88530c0b 100644 --- a/Zotlabs/Widget/Cdav.php +++ b/Zotlabs/Widget/Cdav.php @@ -113,10 +113,22 @@ class Cdav { } } + $channel_calendars[] = [ + 'ownernick' => $channel['channel_address'], + 'displayname' => $channel['channel_name'], + 'calendarid' => 'channel_calendar', + 'json_source' => '/channel_calendar/json', + 'color' => '#3a87ad', + 'editable' => true, + 'switch' => get_pconfig(local_channel(), 'cdav_calendar', 'channel_calendar') + ]; + $o .= replace_macros(get_markup_template('cdav_widget_calendar.tpl'), [ - '$my_calendars_label' => t('My Calendars'), + '$channel_calendars_label' => t('Channel Calendar'), + '$channel_calendars' => $channel_calendars, + '$my_calendars_label' => t('CalDAV Calendars'), '$my_calendars' => $my_calendars, - '$shared_calendars_label' => t('Shared Calendars'), + '$shared_calendars_label' => t('Shared CalDAV Calendars'), '$shared_calendars' => $shared_calendars, '$sharee_options' => $sharee_options, '$access_options' => $access_options, @@ -127,7 +139,7 @@ class Cdav { '$create_label' => t('Create new calendar'), '$create' => t('Create'), '$create_placeholder' => t('Calendar Name'), - '$tools_label' => t('Calendar Tools'), + '$tools_label' => t('CalDAV Calendar Tools'), '$import_label' => t('Import calendar'), '$import_placeholder' => t('Select a calendar to import to'), '$upload' => t('Upload'), |