diff --git a/plugins/calendar/helpdocs/en_US/_static/larry/calendar-acl.png b/plugins/calendar/helpdocs/en_US/_static/larry/calendar-acl.png new file mode 100644 index 00000000..0d0b2514 Binary files /dev/null and b/plugins/calendar/helpdocs/en_US/_static/larry/calendar-acl.png differ diff --git a/plugins/calendar/helpdocs/en_US/manage.rst b/plugins/calendar/helpdocs/en_US/manage.rst index 11e253c1..b86cdd34 100644 --- a/plugins/calendar/helpdocs/en_US/manage.rst +++ b/plugins/calendar/helpdocs/en_US/manage.rst @@ -147,6 +147,7 @@ Invitations will be sent out when you click *Save* and the event is created. .. only:: kolab .. index:: Availability + .. _calendar-availability-finder: Find Availability ^^^^^^^^^^^^^^^^^ diff --git a/plugins/calendar/helpdocs/en_US/overview.rst b/plugins/calendar/helpdocs/en_US/overview.rst index 5b56d3e6..b3833192 100644 --- a/plugins/calendar/helpdocs/en_US/overview.rst +++ b/plugins/calendar/helpdocs/en_US/overview.rst @@ -125,7 +125,7 @@ Edit Calendar Names and Settings 1. Select the calendar to edit by clicking it in the list. 2. Click the gear icon in the calendars list footer and select *Edit* from the options menu. -3. Adjust name, color or alarms settings in the edit dialog. +3. Adjust name, color or reminders settings in the edit dialog. 4. Click *Save* to finally update the calendar. Remove entire Calendars diff --git a/plugins/calendar/helpdocs/en_US/settings.rst b/plugins/calendar/helpdocs/en_US/settings.rst index e2e8e758..154e6e81 100644 --- a/plugins/calendar/helpdocs/en_US/settings.rst +++ b/plugins/calendar/helpdocs/en_US/settings.rst @@ -4,6 +4,72 @@ Calendar Preferences ******************** -TBD. +The settings for the calendar module are listed in *Settings > Preferences* and are grouped by the following sections: +Main Options +------------ + +**Default view** + Lets you select the :ref:`calendar-view` which is visible by default when opening the calendar. + +**Time slots per hour** + How one hour in day and week view is divided vertically. If for example set to 2, you will see + events displayed in 30 minute blocks. + +**First weekday** + Which weekday to begin the week view with. + +**First hour to show** + When opening the day or week view, the listing of events starts at this time. Of course all + hours of a day are visible by scrolling further up. + +.. only:: kolab + + **Working hours** + This time range will be used in the :ref:`availability finder ` + when automatically selecting free slots for a meeting. + +**Event coloring** + The coloring of the title of an event block ("outline") as well as the background color of the box ("content") + in day and week views is influenced by the color of the calendar an event belongs to and/or the color of the + category it is assigned to. This setting lets you control which source for coloring to use or if you even + want a combined coloring that reflects both, the assignment of calendars and categories. + +**Default reminder setting** + When creating new events, they'll have this type of reminder set by default. + +**Default reminder time** + When enabling reminders in a new event, use this preset as default. + +**Create new events in** + This is the default selection for saving new events. Used in both the calendar view and when + accepting event invitations. + + +Categories +---------- + +This block allows the management of categories used in your calendar and assign colors to them. +Use the color picker to change the color by clicking on the square color box in the categories list. + +To add a new category, enter its unique name into the text box below the listing and then click +the *Add category** button to add it. Note that you still need to click the *Save* button +at the bottom of the preferences panel in order to finally register the new categories. + + +Birthdays Calendar +------------------ + +The calendar view and also display birthdays from contacts saved in your address book. This +block controls how this is done. + +**Display birthdays calendar** + Enable the birthdays calendar feature with this checkbox. + +**From these address books** + Choose from which address books you'd like to see birthdays in your calendar. + +**Show reminders** + This option controls whether and when to display reminder notifications for + upcoming birthdays. diff --git a/plugins/calendar/helpdocs/en_US/sharing.rst b/plugins/calendar/helpdocs/en_US/sharing.rst index 7792b83d..227af5e5 100644 --- a/plugins/calendar/helpdocs/en_US/sharing.rst +++ b/plugins/calendar/helpdocs/en_US/sharing.rst @@ -1,20 +1,48 @@ -.. calendar-sharing: +.. _calendar-sharing: + +.. only:: kolab Share Calendars =============== -TBD. +For collaboration, sharing calendars is an important feature. In the :ref:`overview `, +we have already learned how calendars others share with you appear in the calendars list. The following +now explains how to make personal calendars accessible to fellow users. Share a Calendar with others ---------------------------- -TBD. +Sharing is controlled through the :ref:`Calendar Settings Dialog `. +Double-click a calendar in the list on the left and then select the *Sharing* tab at the top of +the dialog box: + +.. image:: _static/_skin/calendar-acl.png + +The table displays who already has permission to see and modify the selected calendar. +In order to share the calendar with a new user + +1. Click the + icon in the table footer +2. Select whether to grant permissions for a single user, all or guests +3. For individual users, enter the email address of the user into the text box. + Possible candidates will be listed as you type. Choose one from the list and hit the key to select it. +4. Check the individual access rights you want to grant to this user or group. +5. Click the *Save* of this inner popup box. This will add a new entry to the list. + +Double-click an entry to edit the permissions for a particular user or group. + +For removing existing permissions, select the according entry in the list and then choose +*Delete* from the menu behind the gear icon in the footer of the list. -Subscribe to shared calendars +Subscribe to Shared Calendars ----------------------------- -TBD. +Calendars shared by others are not showing up right away in the list within the calendar view. +Switch to :ref:`Settings > Folders ` to see all resources you can access. +There's a shortcut to this: click *Manage folders* in the options menu behind the gear icon +located the footer of the calendars list. +In order to make a shared calendar appear in the calendars list, locate it in the folder manager +and check the *Subscribed* mark in the list. Only subscribed calendars are visible in the calendar view.