diff --git a/user_manual/groupware/calendar.rst b/user_manual/groupware/calendar.rst index 20ad00446aa..a16c207671b 100644 --- a/user_manual/groupware/calendar.rst +++ b/user_manual/groupware/calendar.rst @@ -43,7 +43,7 @@ Import a Calendar If you want to transfer your calendar and their respective events to your Nextcloud instance, importing is the best way to do so. -.. figure:: images/calendar_settings.png +.. figure:: images/calendar_settings_sidebar.png :scale: 80% 1. Click on the settings-icon labeled with ``Settings & Import`` at the left-bottom. @@ -70,16 +70,30 @@ hard drive or delete it forever. .. figure:: images/calendar_dropdown.png -1. Click on the three-dot-menu of the respective calendar. +Click on the "pen" icon of the respective calendar. You will see a new popup that will allow you to change +the calendar name and color, and buttons to delete or export the calendar. + +.. figure:: images/calendar_settings.png + +Calendar Transparency +~~~~~~~~~~~~~~~~~~~~~ -.. figure:: images/calendar_editing.png +You can toggle the checkbox "Never show me as busy (set calendar to transparent)" to influence if this calendars' events +are taken into account in Free/Busy calculations. If checked, no events in this calendar will be taken into account, your schedule will +always be free, regardless of an events' settings. -2. Click on *Edit name*, *Edit color*, *Export* or *Delete*. +.. figure:: images/calendar_transparency.png Sharing calendars ~~~~~~~~~~~~~~~~~ -You may share your calendar with other users or groups. Calendars may be shared with write access or read-only. When sharing a calendar with write access, users with whom the calendar is shared will be able to create new events into the calendar as well as edit and delete existing ones. +You may share your calendar with other users or groups. + +.. figure:: images/calendar_sharing_1.png + +Calendars may be shared with write access or read-only. When sharing a calendar with write access, users with whom the calendar is shared will be able to create new events into the calendar as well as edit and delete existing ones. + +.. figure:: images/calendar_sharing_2.png .. note:: Calendar shares currently cannot be accepted or rejected. If you want to stop having a calendar that someone shared with you, you can click on the 3-dot menu next to the calendar in the calendar list and click on "Unshare from me". To restore a share, the calendar can be reshared again, either for the whole group, resetting all unshares, or for a single user. @@ -152,8 +166,8 @@ The month-view only requires a single click into the area of the target day. .. figure:: images/calendar_new-event_month.png -After that, you can type in the event's name (e.g. **Meeting with Lukas**), choose -the calendar in which you want to save the event to (e.g. **Personal**, **Work**), +After that, you can type in the event's name (e.g. **Meeting with Linus**), choose +the calendar in which you want to save the event to (e.g. **Personal**, **Community Events**), check and concretize the time span or set the event as an all-day event. Optionally you can specify a location and a description. @@ -229,7 +243,7 @@ Add attachments to events You can import attachments to your events either by uploading them or adding them from files .. figure:: images/calendar_adding_attachments.png - :scale: 40% + :scale: 80% .. note:: Attachments can be added while creating new events or editing existent ones. Newly uploaded files will be saved in files by default in the calendar folder in the root directory. @@ -374,10 +388,12 @@ For a selected day there will be a list with all the possible time slots. On day too many conflicts or a reached daily maximum limit of already booked appointments, the list might be empty. .. figure:: images/appointment_booking_1.png + :scale: 80% For the booking, attendees have to enter a name and an email address. Optionally they can also add a comment. .. figure:: images/appointment_booking_2.png + :scale: 80% When the booking was successful, a confirmation dialogue will be shown to the attendee. diff --git a/user_manual/groupware/images/appointment_booking_1.png b/user_manual/groupware/images/appointment_booking_1.png index 191a2cb6e73..96c5def0bc2 100644 Binary files a/user_manual/groupware/images/appointment_booking_1.png and b/user_manual/groupware/images/appointment_booking_1.png differ diff --git a/user_manual/groupware/images/appointment_booking_2.png b/user_manual/groupware/images/appointment_booking_2.png index dbb6459a2d7..a655e11ddf6 100644 Binary files a/user_manual/groupware/images/appointment_booking_2.png and b/user_manual/groupware/images/appointment_booking_2.png differ diff --git a/user_manual/groupware/images/appointment_calendar_event.png b/user_manual/groupware/images/appointment_calendar_event.png index 70add4a51e8..686666caed4 100644 Binary files a/user_manual/groupware/images/appointment_calendar_event.png and b/user_manual/groupware/images/appointment_calendar_event.png differ diff --git a/user_manual/groupware/images/appointment_calendar_prep.png b/user_manual/groupware/images/appointment_calendar_prep.png index 78f3424c748..d6ba633bdbb 100644 Binary files a/user_manual/groupware/images/appointment_calendar_prep.png and b/user_manual/groupware/images/appointment_calendar_prep.png differ diff --git a/user_manual/groupware/images/appointment_config_options.png b/user_manual/groupware/images/appointment_config_options.png index ee6db837500..b739d506036 100644 Binary files a/user_manual/groupware/images/appointment_config_options.png and b/user_manual/groupware/images/appointment_config_options.png differ diff --git a/user_manual/groupware/images/appointment_new.png b/user_manual/groupware/images/appointment_new.png index 1ed616cde52..7d72beb07ef 100644 Binary files a/user_manual/groupware/images/appointment_new.png and b/user_manual/groupware/images/appointment_new.png differ diff --git a/user_manual/groupware/images/calendar_accept_sidebar_editor.png b/user_manual/groupware/images/calendar_accept_sidebar_editor.png index b5a280cda2b..b8028f9f91c 100644 Binary files a/user_manual/groupware/images/calendar_accept_sidebar_editor.png and b/user_manual/groupware/images/calendar_accept_sidebar_editor.png differ diff --git a/user_manual/groupware/images/calendar_accept_simple_editor.png b/user_manual/groupware/images/calendar_accept_simple_editor.png index d1690172156..25d68c60f08 100644 Binary files a/user_manual/groupware/images/calendar_accept_simple_editor.png and b/user_manual/groupware/images/calendar_accept_simple_editor.png differ diff --git a/user_manual/groupware/images/calendar_adding_attachments.png b/user_manual/groupware/images/calendar_adding_attachments.png index f170f5c0b36..01fab47cf63 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_application.png b/user_manual/groupware/images/calendar_application.png index 572201be6c1..61e1dbce419 100644 Binary files a/user_manual/groupware/images/calendar_application.png and b/user_manual/groupware/images/calendar_application.png differ diff --git a/user_manual/groupware/images/calendar_attachments_location.png b/user_manual/groupware/images/calendar_attachments_location.png index 8fddcfb36bb..6780860cbd5 100644 Binary files a/user_manual/groupware/images/calendar_attachments_location.png and b/user_manual/groupware/images/calendar_attachments_location.png differ diff --git a/user_manual/groupware/images/calendar_create_1.png b/user_manual/groupware/images/calendar_create_1.png index bba81a093ec..4b6fd94a6c5 100644 Binary files a/user_manual/groupware/images/calendar_create_1.png and b/user_manual/groupware/images/calendar_create_1.png differ diff --git a/user_manual/groupware/images/calendar_create_2.png b/user_manual/groupware/images/calendar_create_2.png index 6c198d39473..49fd606a793 100644 Binary files a/user_manual/groupware/images/calendar_create_2.png and b/user_manual/groupware/images/calendar_create_2.png differ diff --git a/user_manual/groupware/images/calendar_dropdown.png b/user_manual/groupware/images/calendar_dropdown.png index 60b0d5d0411..7b19fcd5885 100644 Binary files a/user_manual/groupware/images/calendar_dropdown.png and b/user_manual/groupware/images/calendar_dropdown.png differ diff --git a/user_manual/groupware/images/calendar_editing.png b/user_manual/groupware/images/calendar_editing.png deleted file mode 100644 index 431f70b83e6..00000000000 Binary files a/user_manual/groupware/images/calendar_editing.png and /dev/null differ diff --git a/user_manual/groupware/images/calendar_event_invitation_level.png b/user_manual/groupware/images/calendar_event_invitation_level.png index 62da8723efc..3a0cafca9b4 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 3d8319f61f6..2c7306deb3c 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_menu_modal.png b/user_manual/groupware/images/calendar_event_menu_modal.png index 4238ba7834c..e501846b0a4 100644 Binary files a/user_manual/groupware/images/calendar_event_menu_modal.png and b/user_manual/groupware/images/calendar_event_menu_modal.png differ diff --git a/user_manual/groupware/images/calendar_new-event_month.png b/user_manual/groupware/images/calendar_new-event_month.png index d06a6fac421..0489aa077d3 100644 Binary files a/user_manual/groupware/images/calendar_new-event_month.png and b/user_manual/groupware/images/calendar_new-event_month.png differ diff --git a/user_manual/groupware/images/calendar_new-event_week.png b/user_manual/groupware/images/calendar_new-event_week.png index a5eed1723b1..999e8bf58f0 100644 Binary files a/user_manual/groupware/images/calendar_new-event_week.png and b/user_manual/groupware/images/calendar_new-event_week.png differ diff --git a/user_manual/groupware/images/calendar_settings.png b/user_manual/groupware/images/calendar_settings.png index 1fc8e63eee7..8c153a6a032 100644 Binary files a/user_manual/groupware/images/calendar_settings.png and b/user_manual/groupware/images/calendar_settings.png differ diff --git a/user_manual/groupware/images/calendar_settings_sidebar.png b/user_manual/groupware/images/calendar_settings_sidebar.png new file mode 100644 index 00000000000..17d2abf2754 Binary files /dev/null and b/user_manual/groupware/images/calendar_settings_sidebar.png differ diff --git a/user_manual/groupware/images/calendar_sharing_1.png b/user_manual/groupware/images/calendar_sharing_1.png new file mode 100644 index 00000000000..53064d90340 Binary files /dev/null and b/user_manual/groupware/images/calendar_sharing_1.png differ diff --git a/user_manual/groupware/images/calendar_sharing_2.png b/user_manual/groupware/images/calendar_sharing_2.png new file mode 100644 index 00000000000..e8a7354d6de Binary files /dev/null and b/user_manual/groupware/images/calendar_sharing_2.png differ diff --git a/user_manual/groupware/images/calendar_transparency.png b/user_manual/groupware/images/calendar_transparency.png new file mode 100644 index 00000000000..5a275ae20c4 Binary files /dev/null and b/user_manual/groupware/images/calendar_transparency.png differ diff --git a/user_manual/groupware/images/calendar_trash_bin.png b/user_manual/groupware/images/calendar_trash_bin.png index 50ed06e0828..d0d52c496e0 100644 Binary files a/user_manual/groupware/images/calendar_trash_bin.png and b/user_manual/groupware/images/calendar_trash_bin.png differ