diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index e1b1cf3060..56ea784bb7 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -288,6 +288,23 @@ class calendar_hooks } $settings = array( + array( + 'type' => 'section', + 'title' => lang('view settings'), + 'no_lang'=> true, + 'xmlrpc' => False, + 'admin' => False + ), + 'mainscreen_showevents' => array( + 'type' => 'select', + 'label' => 'Which view to show on home page', + 'name' => 'mainscreen_showevents', + 'values' => $mainscreen, + 'help' => 'Displays this calendar view on the home page (page you get when you enter EGroupware or click on the home page icon)?', + 'xmlrpc' => True, + 'admin' => False, + 'default'=> '1', // 1 = week + ), 'days_in_weekview' => array( 'type' => 'select', 'label' => 'default week view', @@ -308,16 +325,6 @@ class calendar_hooks 'admin' => False, 'forced'=> 3, ), - 'mainscreen_showevents' => array( - 'type' => 'select', - 'label' => 'Which view to show on home page', - 'name' => 'mainscreen_showevents', - 'values' => $mainscreen, - 'help' => 'Displays this calendar view on the home page (page you get when you enter EGroupware or click on the home page icon)?', - 'xmlrpc' => True, - 'admin' => False, - 'default'=> '1', // 1 = week - ), 'weekdaystarts' => array( 'type' => 'select', 'label' => 'weekday starts on', @@ -348,16 +355,6 @@ class calendar_hooks 'admin' => False, 'default'=> 18, ), - 'use_time_grid' => array( - 'type' => 'select', - 'label' => 'Views with fixed time intervals', - 'name' => 'use_time_grid', - 'values' => $grid_views, - 'help' => 'For which views should calendar show distinct lines with a fixed time interval.', - 'xmlrpc' => True, - 'admin' => False, - 'forced' => 'all', - ), 'interval' => array( 'type' => 'select', 'label' => 'Length of the time interval', @@ -368,26 +365,29 @@ class calendar_hooks 'admin' => False, 'default'=> 30, ), - 'defaultlength' => array( - 'type' => 'input', - 'label' => 'default appointment length (in minutes)', - 'name' => 'defaultlength', - 'help' => 'Default length of newly created events. The length is in minutes, eg. 60 for 1 hour.', - 'default' => '', - 'size' => 3, + 'display_holidays_event' => array( + 'type' => 'select', + 'label' => 'Display holidays or birthdays as events in dayview', + 'name' => 'display_holidays_event', + 'values' => array( + '0' => lang('Display in header'), //Please note that these values are a binary mask + '1' => lang('Birthdays only'), + '2' => lang('Holidays only'), + '3' => lang('Both, holidays and birthdays') + ), + 'help' => "When selected, birthdays and/or holidays will be displayed as events in your calendar. Please note that this option only changes the appereance inside of EGroupware, but does not change the information being sent via iCal or other calendar interfaces.", 'xmlrpc' => True, 'admin' => False, - 'default'=> 60, + 'default'=> '0', ), - 'defaultresource_sel' => array( - 'type' => 'select', - 'label' => 'default type of resources selection', - 'name' => 'defaultresource_sel', - 'values' => $defaultresource_sel, - 'help' => 'Default type of resources application selected in the calendar particpants research form.', - 'xmlrpc' => True, - 'admin' => False, - 'forced' => 'addressbook', + 'limit_des_lines' => array( + 'type' => 'input', + 'size' => 5, + 'label' => 'Limit number of description lines in list view (default 5, 0 for no limit)', + 'name' => 'limit_des_lines', + 'help' => 'How many describtion lines should be directly visible. Further lines are available via a scrollbar.', + 'xmlrpc' => True, + 'admin' => False ), 'planner_start_with_group' => array( 'type' => 'select', @@ -413,15 +413,44 @@ class calendar_hooks 'admin' => False, 'forced' => 'user', ), - 'limit_des_lines' => array( - 'type' => 'input', - 'size' => 5, - 'label' => 'Limit number of description lines in list view (default 5, 0 for no limit)', - 'name' => 'limit_des_lines', - 'help' => 'How many describtion lines should be directly visible. Further lines are available via a scrollbar.', + 'use_time_grid' => array( + 'type' => 'select', + 'label' => 'Views with fixed time intervals', + 'name' => 'use_time_grid', + 'values' => $grid_views, + 'help' => 'For which views should calendar show distinct lines with a fixed time interval.', 'xmlrpc' => True, + 'admin' => False, + 'forced' => 'all', + ), + array( + 'type' => 'section', + 'title' => lang('appointment settings'), + 'no_lang'=> true, + 'xmlrpc' => False, 'admin' => False ), + 'defaultlength' => array( + 'type' => 'input', + 'label' => 'default appointment length (in minutes)', + 'name' => 'defaultlength', + 'help' => 'Default length of newly created events. The length is in minutes, eg. 60 for 1 hour.', + 'default' => '', + 'size' => 3, + 'xmlrpc' => True, + 'admin' => False, + 'default'=> 60, + ), + 'defaultresource_sel' => array( + 'type' => 'select', + 'label' => 'default type of resources selection', + 'name' => 'defaultresource_sel', + 'values' => $defaultresource_sel, + 'help' => 'Default type of resources application selected in the calendar particpants research form.', + 'xmlrpc' => True, + 'admin' => False, + 'forced' => 'addressbook', + ), 'default_private' => array( 'type' => 'check', 'label' => 'Set new events to private', @@ -431,6 +460,23 @@ class calendar_hooks 'admin' => False, 'forced' => '0', ), + 'reset_stati' => array( + 'type' => 'select', + 'label' => 'Reset participant stati on event shifts', + 'name' => 'reset_stati', + 'help' => 'Select whether you want the pariticpant stati reset to unkown, if an event is shifted later on.', + 'values' => $reset_stati_on_shifts, + 'default' => 'no', + 'xmlrpc' => True, + 'admin' => False, + ), + array( + 'type' => 'section', + 'title' => lang('notification settings'), + 'no_lang'=> true, + 'xmlrpc' => False, + 'admin' => False + ), 'receive_updates' => array( 'type' => 'select', 'label' => 'Receive email updates', @@ -441,25 +487,15 @@ class calendar_hooks 'admin' => False, 'default'=> 'time_change', ), - 'receive_own_updates' => array( - 'type' => 'select', - 'label' => 'Receive notifications about events you created/modified/deleted', - 'name' => 'receive_own_updates', - 'values' => $yesno, - 'help' => "Do you want to be notified about changes of appointments you modified?", - 'xmlrpc' => True, - 'admin' => False, - 'default'=> 'false', - ), - 'update_format' => array( + 'receive_own_updates' => array( 'type' => 'select', - 'label' => 'Format of event updates', - 'name' => 'update_format', - 'values' => $update_formats, - 'help' => 'Extended updates always include the complete event-details. iCal\'s can be imported by certain other calendar-applications.', + 'label' => 'Receive notifications about events you created/modified/deleted', + 'name' => 'receive_own_updates', + 'values' => $yesno, + 'help' => "Do you want to be notified about changes of appointments you modified?", 'xmlrpc' => True, 'admin' => False, - 'forced' => 'ical', + 'default'=> 'false', ), 'notify_externals' => array( 'type' => 'select', @@ -471,25 +507,15 @@ class calendar_hooks 'admin' => False, 'default'=> 'no', ), - 'export_timezone' => array( + 'update_format' => array( 'type' => 'select', - 'label' => 'Timezone of event iCal file import/export', - 'name' => 'export_timezone', - 'values' => $export_tzs, - 'help' => 'Use this timezone to import/export calendar data.', - 'xmlrpc' => True, - 'admin' => False, - 'default' => '0', // Use event's TZ - ), - 'reset_stati' => array( - 'type' => 'select', - 'label' => 'Reset participant stati on event shifts', - 'name' => 'reset_stati', - 'help' => 'Select whether you want the pariticpant stati reset to unkown, if an event is shifted later on.', - 'values' => $reset_stati_on_shifts, - 'default' => 'no', + 'label' => 'Format of event updates', + 'name' => 'update_format', + 'values' => $update_formats, + 'help' => 'Extended updates always include the complete event-details. iCal\'s can be imported by certain other calendar-applications.', 'xmlrpc' => True, 'admin' => False, + 'forced' => 'ical', ), 'notifyAdded' => array( 'type' => 'notify', @@ -565,44 +591,14 @@ class calendar_hooks 'xmlrpc' => True, 'admin' => False, ), - 'freebusy' => array( - 'type' => 'select', - 'label' => 'Make freebusy information available to not loged in persons?', - 'name' => 'freebusy', - 'help' => $freebusy_help, - 'values' => $freebusy_values, - 'run_lang' => false, - 'subst_help' => False, - 'xmlrpc' => True, - 'admin' => False, - 'forced' => 0, - ), - 'freebusy_pw' => array( - 'type' => 'input', - 'label' => 'Password for not loged in users to your freebusy information?', - 'name' => 'freebusy_pw', - 'help' => 'If you dont set a password here, the information is available to everyone, who knows the URL!!!', - 'xmlrpc' => True, - 'admin' => False, - 'forced' => '' - ), - 'display_holidays_event' => array( - 'type' => 'select', - 'label' => 'Display holidays or birthdays as events in dayview', - 'name' => 'display_holidays_event', - 'values' => array( - '0' => lang('Display in header'), //Please note that these values are a binary mask - '1' => lang('Birthdays only'), - '2' => lang('Holidays only'), - '3' => lang('Both, holidays and birthdays') - ), - 'help' => "When selected, birthdays and/or holidays will be displayed as events in your calendar. Please note that this option only changes the appereance inside of EGroupware, but does not change the information being sent via iCal or other calendar interfaces.", - 'xmlrpc' => True, - 'admin' => False, - 'default'=> '0', + array( + 'type' => 'section', + 'title' => lang('Data exchange settings'), + 'no_lang'=> true, + 'xmlrpc' => False, + 'admin' => False ), ); - // Merge print if ($GLOBALS['egw_info']['user']['apps']['filemanager']) { @@ -674,6 +670,40 @@ class calendar_hooks 'default'=> isset($options[$default_def]) ? $default_def : false, ); } + $settings += array( + 'export_timezone' => array( + 'type' => 'select', + 'label' => 'Timezone of event iCal file import/export', + 'name' => 'export_timezone', + 'values' => $export_tzs, + 'help' => 'Use this timezone to import/export calendar data.', + 'xmlrpc' => True, + 'admin' => False, + 'default' => '0', // Use event's TZ + ), + 'freebusy' => array( + 'type' => 'select', + 'label' => 'Make freebusy information available to not loged in persons?', + 'name' => 'freebusy', + 'help' => $freebusy_help, + 'values' => $freebusy_values, + 'run_lang' => false, + 'subst_help' => False, + 'xmlrpc' => True, + 'admin' => False, + 'forced' => 0, + ), + 'freebusy_pw' => array( + 'type' => 'input', + 'label' => 'Password for not loged in users to your freebusy information?', + 'name' => 'freebusy_pw', + 'help' => 'If you dont set a password here, the information is available to everyone, who knows the URL!!!', + 'xmlrpc' => True, + 'admin' => False, + 'forced' => '' + ), + ); + return $settings; } diff --git a/calendar/lang/egw_en.lang b/calendar/lang/egw_en.lang index 2c6fc0ac99..2306ac3d7e 100644 --- a/calendar/lang/egw_en.lang +++ b/calendar/lang/egw_en.lang @@ -44,6 +44,7 @@ allows to edit the event again calendar en Allows to edit the event again always calendar en Always apply the action on the whole query, not only the shown events calendar en Apply the action on the whole query, NOT only the shown events. apply the changes calendar en Apply the changes +appointment settings calendar en Appointment settings are you sure you want to delete this country ? calendar en Are you sure you want to delete this country? are you sure you want to delete this holiday ? calendar en Are you sure you want to delete this holiday? as an alternative you can %1download a mysql dump%2 and import it manually into egw_cal_timezones table. calendar en As an alternative you can %1download a MySQL dump%2 and import it manually into egw_cal_timezones table. @@ -106,6 +107,7 @@ custom fields common en Custom fields custom_2 common en Free/Busy daily calendar en Daily daily tables calendar en Daily tables +data exchange settings calendar en Data exchange settings date for the day of the week, available for the first entry inside each day of week or daily table inside the selected range. calendar en Date for the day of the week, available for the first entry inside each day of week or daily table inside the selected range. day calendar en Day day of week tables calendar en Day of week tables @@ -316,6 +318,7 @@ notification messages for disinvited participants calendar en Notification messa notification messages for modified events calendar en Notification messages for modified events notification messages for your alarms calendar en Notification messages for your alarms notification messages for your responses calendar en Notification messages for your responses +notification settings calendar en Notification settings notify non-egroupware users about event updates calendar en Notify non-EGroupware users about event updates number of records to read (%1) calendar en Number of records to read (%1) number of weeks to show calendar en Number of weeks to show @@ -514,6 +517,7 @@ users + groups: inviting both allways requires an invite grant admin en Users + using already existing event on server. calendar en Using already existing event on server. view exception calendar en View exception view series calendar en View series +view settings calendar en View settings view this event calendar en View this event views with fixed time intervals calendar en Views with fixed time intervals wed calendar en Wed