Skip to content

Commit

Permalink
Merge pull request #12096 from nextcloud/feat/document-transparency-s…
Browse files Browse the repository at this point in the history
…ettings

feat: update calendar screenshots
  • Loading branch information
ChristophWurst authored Aug 7, 2024
2 parents d230dba + ec11238 commit ac92790
Show file tree
Hide file tree
Showing 27 changed files with 24 additions and 8 deletions.
32 changes: 24 additions & 8 deletions user_manual/groupware/calendar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.

Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -235,7 +249,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.
Expand Down Expand Up @@ -380,10 +394,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.

Expand Down
Binary file modified user_manual/groupware/images/appointment_booking_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/appointment_booking_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/appointment_calendar_event.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/appointment_calendar_prep.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/appointment_config_options.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/appointment_new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_accept_sidebar_editor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_accept_simple_editor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_adding_attachments.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_application.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_create_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_create_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_dropdown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed user_manual/groupware/images/calendar_editing.png
Binary file not shown.
Binary file modified user_manual/groupware/images/calendar_event_invitation_level.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_event_menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_event_menu_modal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_new-event_month.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_new-event_week.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified user_manual/groupware/images/calendar_trash_bin.png

0 comments on commit ac92790

Please sign in to comment.