Skip to content

Commit a4efb0e

Browse files
Merge pull request #13536 from nextcloud/backport/13526/stable30
[MANUAL BACKPORT] feat(Groupware/Calendar): update text and screenshots to full page calendar modal
2 parents 8977487 + 26c20ef commit a4efb0e

9 files changed

Lines changed: 12 additions & 13 deletions

β€Žadmin_manual/groupware/calendar.rstβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ You can customize the events user interface.
2727
Hide export buttons
2828
~~~~~~~~~~~~~~~~~~~
2929

30-
By default users can export their calendar data from the editor and the sidebar. Admins can disable this feature::
30+
By default users can export their calendar data from the event editor. Admins can disable this feature::
3131

3232
php occ config:app:set calendar hideEventExport --value=yes
3333

β€Žuser_manual/groupware/calendar.rstβ€Ž

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ hard drive or delete it forever.
7272

7373
.. figure:: images/calendar_dropdown.png
7474

75-
Click on the "pen" icon of the respective calendar. You will see a new popup that will allow you to change
75+
Click on the "pen" icon of the respective calendar. You will see a new popup that will allow you to change
7676
the calendar name and color, and buttons to delete or export the calendar.
7777

7878
.. figure:: images/calendar_settings.png
@@ -81,7 +81,7 @@ Calendar Transparency
8181
~~~~~~~~~~~~~~~~~~~~~
8282

8383
You can toggle the checkbox "Never show me as busy (set calendar to transparent)" to influence if this calendars' events
84-
are taken into account in Free/Busy calculations. If checked, no events in this calendar will be taken into account, your schedule will
84+
are taken into account in Free/Busy calculations. If checked, no events in this calendar will be taken into account, your schedule will
8585
always be free, regardless of an events' settings.
8686

8787
.. figure:: images/calendar_transparency.png
@@ -121,8 +121,8 @@ On the public page, users are able to get the subscription link for the calendar
121121
Calendar Widget
122122
~~~~~~~~~~~~~~~
123123

124-
You can embed your calendars into supported apps like ``Talk``, ``Notes``, etc...
125-
by either sharing the public link to make the embed viewable (read-only) to all users
124+
You can embed your calendars into supported apps like ``Talk``, ``Notes``, etc...
125+
by either sharing the public link to make the embed viewable (read-only) to all users
126126
or by using the internal link to make it private.
127127

128128
Subscribe to a Calendar
@@ -174,10 +174,9 @@ check and concretize the time span or set the event as an all-day event. Optiona
174174
you can specify a location and a description.
175175

176176
If you want to edit advanced details such as the **Attendees** or **Reminders**, or if you
177-
want to set the event as a repeating-event, click on the ``More`` button to open the advanced
178-
sidebar editor.
177+
want to set the event as a repeating-event, click on the ``More`` button to open the advanced editor.
179178

180-
.. note:: If you always want to open the advanced sidebar editor instead of the
179+
.. note:: If you always want to open the advanced editor instead of the
181180
simple event editor popup, you can set a ``Skip simple event
182181
editor`` checkmark in the ``Settings & Import`` section of the app.
183182

@@ -189,11 +188,11 @@ Edit, duplicate or delete an event
189188
If you want to edit, duplicate or delete a specific event, you first need to click on the event.
190189

191190
After that you will be able to re-set all event details and open the
192-
advanced sidebar-editor by clicking on ``More``.
191+
advanced editor by clicking on ``More``.
193192

194-
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.
193+
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.
195194

196-
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.
195+
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.
197196

198197
.. figure:: images/calendar_event_menu.png
199198

@@ -321,9 +320,9 @@ You can directly respond to invitations inside the app. Click on the event and s
321320
.. figure:: images/calendar_accept_simple_editor.png
322321
:scale: 80%
323322

324-
You can respond to an invitation from the sidebar too.
323+
You can respond to an invitation from the advanced editor too.
325324

326-
.. figure:: images/calendar_accept_sidebar_editor.png
325+
.. figure:: images/calendar_accept_advanced_editor.png
327326
:scale: 80%
328327

329328
Availability (Working Hours)
21.1 KB
Loading
19.8 KB
Loading
-15.8 KB
Loading
-9.78 KB
Loading
-1.25 KB
Loading
-10.6 KB
Loading
14.2 KB
Loading

0 commit comments

Comments
Β (0)