2 commits - plugins/calendar plugins/tasklist

[Thomas Brüderli]

 plugins/calendar/helpdocs/en_US/sharing.rst |   61 ++++++++++++++--------------
 plugins/tasklist/localization/en_US.inc     |    2 
 plugins/tasklist/tasklist.js                |   14 +++---
 3 files changed, 40 insertions(+), 37 deletions(-)

New commits:
commit 7a883384cde6455c43ee3c4f88503b22a32fdf69
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Wed Feb 5 16:05:50 2014 +0100

    Fix working and button order

diff --git a/plugins/tasklist/localization/en_US.inc b/plugins/tasklist/localization/en_US.inc
index ba331be..ae41403 100644
--- a/plugins/tasklist/localization/en_US.inc
+++ b/plugins/tasklist/localization/en_US.inc
@@ -49,7 +49,7 @@ $labels['editlist'] = 'Edit list';
 $labels['createlist'] = 'Add list';
 $labels['listactions'] = 'List options...';
 $labels['listname'] = 'Name';
-$labels['showalarms'] = 'Show alarms';
+$labels['showalarms'] = 'Show reminders';
 $labels['import'] = 'Import';
 $labels['viewoptions'] = 'View options';
 $labels['focusview'] = 'View only this list';
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index b2829ff..f7da8d3 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1465,12 +1465,7 @@ function rcube_tasklist_ui(settings)
         if (!rec || rec.readonly || rcmail.busy)
             return false;
 
-        var html, buttons = [{
-            text: rcmail.gettext('cancel', 'tasklist'),
-            click: function() {
-                $(this).dialog('close');
-            }
-        }];
+        var html, buttons = [];
 
         if (rec.children && rec.children.length) {
             html = rcmail.gettext('deleteparenttasktconfirm','tasklist');
@@ -1500,6 +1495,13 @@ function rcube_tasklist_ui(settings)
             });
         }
 
+        buttons.push({
+            text: rcmail.gettext('cancel', 'tasklist'),
+            click: function() {
+                $(this).dialog('close');
+            }
+        });
+
         var $dialog = $('<div>').html(html);
         $dialog.dialog({
           modal: true,


commit 1cb7a66b05a4172b1eafb9e8e9fd7534914714ab
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Tue Feb 4 18:58:01 2014 +0100

    Describe calendar sharing only if 'kolab'

diff --git a/plugins/calendar/helpdocs/en_US/sharing.rst b/plugins/calendar/helpdocs/en_US/sharing.rst
index 227af5e..34599df 100644
--- a/plugins/calendar/helpdocs/en_US/sharing.rst
+++ b/plugins/calendar/helpdocs/en_US/sharing.rst
@@ -2,47 +2,48 @@
 
 .. only:: kolab
 
-Share Calendars
-===============
+    .. index:: Sharing
 
-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.
+    Sharing Calendars
+    =================
 
+    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
-----------------------------
 
-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:
+    Share a Calendar with others
+    ----------------------------
 
-.. image:: _static/_skin/calendar-acl.png
+    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:
 
-The table displays who already has permission to see and modify the selected calendar.
-In order to share the calendar with a new user
+    .. image:: _static/_skin/calendar-acl.png
 
-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.
+    The table displays who already has permission to see and modify the selected calendar.
+    In order to share the calendar with a new user do
 
-Double-click an entry to edit the permissions for a particular user or group.
+    1. Click the *Add entry* button (+) in the table footer
+    2. Enter the username or choose one from the autocompletion menu that appears when you start typing.
+       Instead of a specific user, permissons can be granted for all users or guests.
+    3. Select the access rights you want to grant for the user
+    4. Click *Save* to add the permission
 
-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.
+    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
------------------------------
 
-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.
+    Subscribe to Shared Calendars
+    -----------------------------
 
-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.
+    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.