Skip to content

Commit

Permalink
At least mark preferences only available in basic mode (Bug #12210).
Browse files Browse the repository at this point in the history
  • Loading branch information
yunosh committed Jan 18, 2016
1 parent 3d8ef00 commit 0bd4b2f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
16 changes: 8 additions & 8 deletions kronolith/config/prefs.php
Expand Up @@ -116,7 +116,7 @@
$_prefs['time_between_days'] = array(
'value' => 0,
'type' => 'checkbox',
'desc' => _("Show time of day between each day in week views?")
'desc' => _("Show time of day between each day in week views?") . ' (<em>' . _("Basic view only") . '</em>'
);

// what day does the week start with
Expand All @@ -136,7 +136,7 @@
'value' => 16,
'type' => 'enum',
'enum' => array(),
'desc' => _("What time should day and week views start, when there are no earlier events?"),
'desc' => _("What time should day and week views start, when there are no earlier events?") . ' (<em>' . _("Basic view only") . '</em>',
'on_init' => function($ui) {
$enum = array();
$fmt = $GLOBALS['prefs']->getValue('twentyFour')
Expand All @@ -155,7 +155,7 @@
'value' => 48,
'type' => 'enum',
'enum' => array(),
'desc' => _("What time should day and week views end, when there are no later events?"),
'desc' => _("What time should day and week views end, when there are no later events?") . ' (<em>' . _("Basic view only") . '</em>',
'on_init' => function($ui) {
$enum = array();
$fmt = $GLOBALS['prefs']->getValue('twentyFour')
Expand All @@ -179,7 +179,7 @@
$_prefs['slots_per_hour'] = array(
'value' => 1,
'type' => 'enum',
'desc' => _("How long should the time slots on the day and week views be?"),
'desc' => _("How long should the time slots on the day and week views be?") . ' (<em>' . _("Basic view only") . '</em>',
'enum' => array(
4 => _("15 minutes"),
3 => _("20 minutes"),
Expand All @@ -192,7 +192,7 @@
$_prefs['show_icons'] = array(
'value' => 1,
'type' => 'checkbox',
'desc' => _("Show delete, alarm, and recurrence icons in calendar views?"),
'desc' => _("Show delete, alarm, and recurrence icons in calendar views?") . ' (<em>' . _("Basic view only") . '</em>',
);

// show event start/end times in the calendar and/or print views?
Expand All @@ -214,22 +214,22 @@
'screen' => _("Month, Week, and Day Views"),
'print' => _("Print Views")
),
'desc' => _("Choose the views to show event locations in:"),
'desc' => _("Choose the views to show event locations in:") . ' (<em>' . _("Basic view only") . '</em>',
);

// show Free/Busy legend?
// a value of 0 = no, 1 = yes
$_prefs['show_fb_legend'] = array(
'value' => 1,
'type' => 'checkbox',
'desc' => _("Show Free/Busy legend?"),
'desc' => _("Show Free/Busy legend?") . ' (<em>' . _("Basic view only") . '</em>',
);

// collapsed or side by side view
$_prefs['show_shared_side_by_side'] = array(
'value' => 0,
'type' => 'checkbox',
'desc' => _("Show shared calendars side-by-side?"),
'desc' => _("Show shared calendars side-by-side?") . ' (<em>' . _("Basic view only") . '</em>',
);

// default calendar
Expand Down
1 change: 1 addition & 0 deletions kronolith/docs/CHANGES
Expand Up @@ -2,6 +2,7 @@
v4.2.12-git
-----------

[jan] Mark preferences only available in basic mode.
[jan] Use access rules compatible with both Apache 2.2 and 2.4.
[jan] Fix accidental deletion of events if importing recurring events without a
UID attribute (Bug #14208).
Expand Down
2 changes: 2 additions & 0 deletions kronolith/package.xml
Expand Up @@ -33,6 +33,7 @@
</stability>
<license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
<notes>
* [jan] Mark preferences only available in basic mode.
* [jan] Use access rules compatible with both Apache 2.2 and 2.4.
* [jan] Fix accidental deletion of events if importing recurring events without a UID attribute (Bug #14208).
* [mjr] Honor confirm_delete preference in dynamic view (Bug #14188).
Expand Down Expand Up @@ -2636,6 +2637,7 @@
<date>2016-01-13</date>
<license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
<notes>
* [jan] Mark preferences only available in basic mode.
* [jan] Use access rules compatible with both Apache 2.2 and 2.4.
* [jan] Fix accidental deletion of events if importing recurring events without a UID attribute (Bug #14208).
* [mjr] Honor confirm_delete preference in dynamic view (Bug #14188).
Expand Down

0 comments on commit 0bd4b2f

Please sign in to comment.