3 commits - plugins/calendar

Thomas Brüderli bruederli at kolabsys.com
Tue Feb 4 18:43:16 CET 2014


 plugins/calendar/calendar_ui.js                                |    2 
 plugins/calendar/helpdocs/en_US/_static/larry/calendar-acl.png |binary
 plugins/calendar/helpdocs/en_US/manage.rst                     |    1 
 plugins/calendar/helpdocs/en_US/overview.rst                   |    2 
 plugins/calendar/helpdocs/en_US/settings.rst                   |   68 +++++++++-
 plugins/calendar/helpdocs/en_US/sharing.rst                    |   38 ++++-
 plugins/calendar/localization/en_US.inc                        |    4 
 7 files changed, 105 insertions(+), 10 deletions(-)

New commits:
commit 9fdec3fcb26c0d023d3febe64b27256d2388582b
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Tue Feb 4 18:43:09 2014 +0100

    Describe calendar settings and sharing in the user guide docs

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 0000000..0d0b251
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 11e253c..b86cdd3 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 5b56d3e..b383319 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 e2e8e75..154e6e8 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 <calendar-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 7792b83..227af5e 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 <calendar-lists>`,
+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 <calendar-edit-properties>`.
+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 <Tab> 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 <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.
 


commit 2425268e9a2a7b0ffa894d5bb921ce11340fbda2
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Tue Feb 4 18:42:31 2014 +0100

    Correct wording

diff --git a/plugins/calendar/localization/en_US.inc b/plugins/calendar/localization/en_US.inc
index e6cbceb..9392b82 100644
--- a/plugins/calendar/localization/en_US.inc
+++ b/plugins/calendar/localization/en_US.inc
@@ -5,7 +5,7 @@ $labels = array();
 // preferences
 $labels['default_view'] = 'Default view';
 $labels['time_format'] = 'Time format';
-$labels['timeslots'] = 'Timeslots per hour';
+$labels['timeslots'] = 'Time slots per hour';
 $labels['first_day'] = 'First weekday';
 $labels['first_hour'] = 'First hour to show';
 $labels['workinghours'] = 'Working hours';
@@ -98,7 +98,7 @@ $labels['pastevents'] = 'Past';
 $labels['futureevents'] = 'Future';
 
 // alarm/reminder settings
-$labels['showalarms'] = 'Show alarms';
+$labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Default reminder setting';
 $labels['defaultalarmoffset'] = 'Default reminder time';
 


commit b0e09c52e0c0288de6ab9bf763617b6a42701f53
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Tue Feb 4 17:41:35 2014 +0100

    Fix color of category name in event view dialog

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 64d67c2..86f029f 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -306,7 +306,7 @@ function rcube_calendar_ui(settings)
       if (calendar.name)
         $('#event-calendar').show().children('.event-text').html(Q(calendar.name)).removeClass().addClass('event-text').addClass('cal-'+calendar.id);
       if (event.categories)
-        $('#event-category').show().children('.event-text').html(Q(event.categories)).removeClass().addClass('event-text cat-'+String(event.categories).replace(rcmail.identifier_expr, ''));
+        $('#event-category').show().children('.event-text').html(Q(event.categories)).removeClass().addClass('event-text cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
       if (event.free_busy)
         $('#event-free-busy').show().children('.event-text').html(Q(rcmail.gettext(event.free_busy, 'calendar')));
       if (event.priority > 0) {




More information about the commits mailing list