summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-06-27 20:31:42 (GMT)
committerThomas Bruederli <thomas@roundcube.net>2012-06-27 20:33:34 (GMT)
commit74214181ec5ae6df0eb4fff10d76f4a84ac78ce1 (patch)
tree98c25dfcb1c779e4578c6cfe73357d4bc3dd84f1
parent6879f2841c49e8559bafe5df533c55fbb8d174f7 (diff)
downloadroundcubemail-plugins-kolab-74214181ec5ae6df0eb4fff10d76f4a84ac78ce1.tar.gz
Fix typos + add documentation for two more config options
-rw-r--r--plugins/calendar/calendar.php6
-rw-r--r--plugins/calendar/config.inc.php.dist9
2 files changed, 12 insertions, 3 deletions
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index a830fcf..b497095 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -353,7 +353,7 @@ class calendar extends rcube_plugin
' &mdash; ' . $select_hours->show($this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']), array('name' => '_work_end', 'id' => $field_id)),
);
- $field_id = 'rcmfd_coloing';
+ $field_id = 'rcmfd_coloring';
$select_colors = new html_select(array('name' => '_event_coloring', 'id' => $field_id));
$select_colors->add($this->gettext('coloringmode0'), 0);
$select_colors->add($this->gettext('coloringmode1'), 1);
@@ -462,7 +462,7 @@ class calendar extends rcube_plugin
// compose default alarm preset value
$alarm_offset = get_input_value('_alarm_offset', RCUBE_INPUT_POST);
- $default_alam = $alarm_offset[0] . intval(get_input_value('_alarm_value', RCUBE_INPUT_POST)) . $alarm_offset[1];
+ $default_alarm = $alarm_offset[0] . intval(get_input_value('_alarm_value', RCUBE_INPUT_POST)) . $alarm_offset[1];
$p['prefs'] = array(
'calendar_default_view' => get_input_value('_default_view', RCUBE_INPUT_POST),
@@ -473,7 +473,7 @@ class calendar extends rcube_plugin
'calendar_work_end' => intval(get_input_value('_work_end', RCUBE_INPUT_POST)),
'calendar_event_coloring' => intval(get_input_value('_event_coloring', RCUBE_INPUT_POST)),
'calendar_default_alarm_type' => get_input_value('_alarm_type', RCUBE_INPUT_POST),
- 'calendar_default_alarm_offset' => $default_alam,
+ 'calendar_default_alarm_offset' => $default_alarm,
'calendar_default_calendar' => get_input_value('_default_calendar', RCUBE_INPUT_POST),
'calendar_date_format' => null, // clear previously saved values
'calendar_time_format' => null,
diff --git a/plugins/calendar/config.inc.php.dist b/plugins/calendar/config.inc.php.dist
index 3c4027a..5126b2a 100644
--- a/plugins/calendar/config.inc.php.dist
+++ b/plugins/calendar/config.inc.php.dist
@@ -72,6 +72,15 @@ $rcmail_config['calendar_work_end'] = 18;
// show line at current time of the day
$rcmail_config['calendar_time_indicator'] = true;
+// default alarm settings for new events.
+// this is only a preset when a new event dialog opens
+// possible values are <empty>, DISPLAY, EMAIL
+$rcmail_config['calendar_default_alarm_type'] = '';
+
+// default alarm offset for new events.
+// use ical-style offset values like "-1H" (one hour before) or "+30M" (30 minutes after)
+$rcmail_config['calendar_default_alarm_offset'] = '-15M';
+
// how to colorize events:
// 0: according to calendar color
// 1: according to category color