diff --git a/admin_manual/groupware/calendar.rst b/admin_manual/groupware/calendar.rst index 1ff83a7c4c5..030ed304740 100644 --- a/admin_manual/groupware/calendar.rst +++ b/admin_manual/groupware/calendar.rst @@ -28,7 +28,7 @@ You can customize the events user interface. Hide export buttons ~~~~~~~~~~~~~~~~~~~ -By default users can export their calendar data from the editor and the sidebar. Admins can disable this feature:: +By default users can export their calendar data from the event editor. Admins can disable this feature:: php occ config:app:set calendar hideEventExport --value=yes diff --git a/user_manual/groupware/calendar.rst b/user_manual/groupware/calendar.rst index d01510d009d..c8bd0ff827f 100644 --- a/user_manual/groupware/calendar.rst +++ b/user_manual/groupware/calendar.rst @@ -176,8 +176,7 @@ check and concretize the time span or set the event as an all-day event. Optiona you can specify a location and a description. If you want to edit advanced details such as the **Attendees** or **Reminders**, or if you -want to set the event as a repeating-event, click on the ``More`` button to open the advanced -sidebar editor. +want to set the event as a repeating-event, click on the ``More`` button to open the advanced editor. Add Talk conversation ~~~~~~~~~~~~~~~~~~~~~ @@ -185,7 +184,7 @@ You can include an existing Talk conversation in your event by clicking "Add Tal .. figure:: images/add-talk-room.png -.. note:: If you always want to open the advanced sidebar editor instead of the +.. note:: If you always want to open the advanced editor instead of the simple event editor popup, you can set a ``Skip simple event editor`` checkmark in the ``Settings & Import`` section of the app. @@ -197,11 +196,11 @@ Edit, duplicate or delete an event If you want to edit, duplicate or delete a specific event, you first need to click on the event. After that you will be able to re-set all event details and open the -advanced sidebar-editor by clicking on ``More``. +advanced editor by clicking on ``More``. -Clicking on the ``Update`` button will update the event. To cancel your changes, click on the close icon on top right of the popup or sidebar editor. +Clicking on the ``Update`` button will update the event. To cancel your changes, click on the close icon on top right of the popup or advanced editor. -If you open the sidebar view and click the three dot menu next to the event name, you have an option to export the event as an ``.ics`` file or remove the event from your calendar. +If you open the advanced view and click the three dot menu next to the event name, you have an option to export the event as an ``.ics`` file or remove the event from your calendar. .. figure:: images/calendar_event_menu.png @@ -237,7 +236,7 @@ After adding attendees to an event you can click on ``Find a time`` to bring up .. figure:: images/calendar_free_busy_modal.png :scale: 40% -Your own busy blocks will be shown in the same color as your personal calendar, your out of office times will be shown in gray, and other attendees' busy times will have the same color as their avatar shown in the sidebar. +Your own busy blocks will be shown in the same color as your personal calendar, your out of office times will be shown in gray, and other attendees' busy times will have the same color as their avatar shown in the advanced editor. You can select a time slot for the event directly on the calendar. @@ -329,9 +328,9 @@ You can directly respond to invitations inside the app. Click on the event and s .. figure:: images/calendar_accept_simple_editor.png :scale: 80% -You can respond to an invitation from the sidebar too. +You can respond to an invitation from the advanced editor too. -.. figure:: images/calendar_accept_sidebar_editor.png +.. figure:: images/calendar_accept_advanced_editor.png :scale: 80% Availability (Working Hours) diff --git a/user_manual/groupware/images/add-talk-room.png b/user_manual/groupware/images/add-talk-room.png index e9d87e238a0..36643260106 100644 Binary files a/user_manual/groupware/images/add-talk-room.png and b/user_manual/groupware/images/add-talk-room.png differ diff --git a/user_manual/groupware/images/calendar_accept_advanced_editor.png b/user_manual/groupware/images/calendar_accept_advanced_editor.png new file mode 100644 index 00000000000..e14276d4244 Binary files /dev/null and b/user_manual/groupware/images/calendar_accept_advanced_editor.png differ diff --git a/user_manual/groupware/images/calendar_adding_attachments.png b/user_manual/groupware/images/calendar_adding_attachments.png index 01fab47cf63..badc0d340da 100644 Binary files a/user_manual/groupware/images/calendar_adding_attachments.png and b/user_manual/groupware/images/calendar_adding_attachments.png differ diff --git a/user_manual/groupware/images/calendar_event_invitation_level.png b/user_manual/groupware/images/calendar_event_invitation_level.png index 3a0cafca9b4..f965131aaa8 100644 Binary files a/user_manual/groupware/images/calendar_event_invitation_level.png and b/user_manual/groupware/images/calendar_event_invitation_level.png differ diff --git a/user_manual/groupware/images/calendar_event_menu.png b/user_manual/groupware/images/calendar_event_menu.png index 2c7306deb3c..0ba93b6764d 100644 Binary files a/user_manual/groupware/images/calendar_event_menu.png and b/user_manual/groupware/images/calendar_event_menu.png differ diff --git a/user_manual/groupware/images/calendar_event_reminders.png b/user_manual/groupware/images/calendar_event_reminders.png index f0751df7d5c..81dc83ad25b 100644 Binary files a/user_manual/groupware/images/calendar_event_reminders.png and b/user_manual/groupware/images/calendar_event_reminders.png differ diff --git a/user_manual/groupware/images/calendar_event_repeat.png b/user_manual/groupware/images/calendar_event_repeat.png index e1a3844998e..605ebbc47d5 100644 Binary files a/user_manual/groupware/images/calendar_event_repeat.png and b/user_manual/groupware/images/calendar_event_repeat.png differ