mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
Move calendar stuff to general settings
This commit is contained in:
parent
4f16b71ea5
commit
8d3b47863d
@ -290,13 +290,42 @@ class infolog_hooks
|
||||
'xmlrpc' => True,
|
||||
'admin' => False,
|
||||
),
|
||||
array(
|
||||
);
|
||||
if ($GLOBALS['egw_info']['user']['apps']['calendar'])
|
||||
{
|
||||
$settings['cal_show'] = array(
|
||||
'type' => 'multiselect',
|
||||
'label' => 'Which types should the calendar show',
|
||||
'name' => 'cal_show',
|
||||
'values' => $info->enums['type'],
|
||||
'help' => 'Can be used to show further InfoLog types in the calendar or limit it to show eg. only tasks.',
|
||||
'xmlrpc' => True,
|
||||
'admin' => False,
|
||||
'default'=> 'tasks,phone',
|
||||
);
|
||||
$settings['calendar_set'] = array(
|
||||
'type' => 'multiselect',
|
||||
'label' => 'Participants for scheduling an appointment',
|
||||
'name' => 'calendar_set',
|
||||
'values' => array(
|
||||
'responsible' => lang('Responsible'),
|
||||
'contact' => lang('Contact'),
|
||||
'owner' => lang('Owner'),
|
||||
'user' => lang('Current user'),
|
||||
'selected' => lang('Selected calendars'),
|
||||
),
|
||||
'help' => 'Which participants should be preselected when scheduling an appointment.',
|
||||
'xmlrpc' => True,
|
||||
'admin' => False,
|
||||
'default'=> 'responsible,contact,user',
|
||||
);
|
||||
}
|
||||
$settings[] = array(
|
||||
'type' => 'section',
|
||||
'title' => lang('Notification settings'),
|
||||
'no_lang'=> true,
|
||||
'xmlrpc' => False,
|
||||
'admin' => False
|
||||
),
|
||||
);
|
||||
|
||||
// notification preferences
|
||||
@ -393,35 +422,6 @@ class infolog_hooks
|
||||
'admin' => False
|
||||
);
|
||||
|
||||
if ($GLOBALS['egw_info']['user']['apps']['calendar'])
|
||||
{
|
||||
$settings['cal_show'] = array(
|
||||
'type' => 'multiselect',
|
||||
'label' => 'Which types should the calendar show',
|
||||
'name' => 'cal_show',
|
||||
'values' => $info->enums['type'],
|
||||
'help' => 'Can be used to show further InfoLog types in the calendar or limit it to show eg. only tasks.',
|
||||
'xmlrpc' => True,
|
||||
'admin' => False,
|
||||
'default'=> 'tasks,phone',
|
||||
);
|
||||
$settings['calendar_set'] = array(
|
||||
'type' => 'multiselect',
|
||||
'label' => 'Participants for scheduling an appointment',
|
||||
'name' => 'calendar_set',
|
||||
'values' => array(
|
||||
'responsible' => lang('Responsible'),
|
||||
'contact' => lang('Contact'),
|
||||
'owner' => lang('Owner'),
|
||||
'user' => lang('Current user'),
|
||||
'selected' => lang('Selected calendars'),
|
||||
),
|
||||
'help' => 'Which participants should be preselected when scheduling an appointment.',
|
||||
'xmlrpc' => True,
|
||||
'admin' => False,
|
||||
'default'=> 'responsible,contact,user',
|
||||
);
|
||||
}
|
||||
// Merge print
|
||||
if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user