Skip to content

Build your personal knowledge base with Trilium Notes

feat(calendar): replace the all-day switch with "Add time"

Elian Doran15e3704e6abf
diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json
index 03f62dcf5e..fd4f6e18b6 100644
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@ -1061,7 +1061,9 @@
"end_date": "End date",
"time": "Time",
"start_time": "Start time",
- "end_time": "End time"
+ "end_time": "End time",
+ "add_time": "Add time",
+ "remove_time": "Remove time"
},
"recurrence": {
"repeats": "Repeats",
diff --git a/apps/client/src/widgets/collections/calendar/EventDatesEditor.spec.tsx b/apps/client/src/widgets/collections/calendar/EventDatesEditor.spec.tsx
index df7ff365c3..b5aa1864cd 100644
--- a/apps/client/src/widgets/collections/calendar/EventDatesEditor.spec.tsx
+++ b/apps/client/src/widgets/collections/calendar/EventDatesEditor.spec.tsx
@@ -42,7 +42,8 @@ describe("EventDatesEditor", () => {
container));
}
- const allDayBox = () => container.querySelector<HTMLInputElement>("input[type='checkbox']");
+ const addTimeButton = () => container.querySelector<HTMLButtonElement>(".calendar-event-add-time");
+ const removeTimeButton = () => container.querySelector<HTMLElement>(".calendar-event-remove-time");
const dateInputs = () => container.querySelectorAll<HTMLInputElement>("input[type='date']");
const timeInputs = () => container.querySelectorAll<HTMLInputElement>("input[type='time']");
const duration = () => container.querySelector(".calendar-event-duration")?.textContent;
@@ -56,47 +57,52 @@ describe("EventDatesEditor", () => {
it("shows a whole-day event as a span of days, and a timed one as a day and its hours", () => {
mount(buildNote({ title: "Fair", "#startDate": "2026-06-05", "#endDate": "2026-06-07" }));
- expect(allDayBox()?.checked).toBe(true);
expect(dateInputs()).toHaveLength(2);
+ // An all-day event has no hours, only the way to add them, on the time row.
expect(timeInputs()).toHaveLength(0);
+ expect(removeTimeButton()).toBeNull();
+ expect(addTimeButton()?.closest(".calendar-event-row")?.querySelector(".bx-time-five")).not.toBeNull();
expect(duration()).toBeUndefined();
expect(dateInputs()[0].value).toBe("2026-06-05");
expect(dateInputs()[1].value).toBe("2026-06-07");
mount(buildNote({ title: "Meeting", "#startDate": "2026-06-05", "#startTime": "13:00", "#endTime": "14:30" }));
- expect(allDayBox()?.checked).toBe(false);
+ expect(addTimeButton()).toBeNull();
expect(dateInputs()).toHaveLength(1);
expect(timeInputs()).toHaveLength(2);
+ expect(timeInputs()[0].closest(".calendar-event-row")?.contains(removeTimeButton())).toBe(true);
expect(timeInputs()[0].value).toBe("13:00");
expect(timeInputs()[1].value).toBe("14:30");
expect(duration()).toBe("calendar_view.duration_hours_minutes|1|30");
expect(timeInputs()[0].closest(".calendar-event-row")?.querySelector(".calendar-event-duration")).not.toBeNull();
});
- it("switching all-day off gives the day hours to edit and lets a span of days go", () => {
+ it("adding a time gives the day hours to edit and lets a span of days go", () => {
const note = buildNote({ title: "Fair", "#startDate": "2026-06-05", "#endDate": "2026-06-07" });
mount(note);
- act(() => allDayBox()?.click());
+ act(() => addTimeButton()?.click());
expect(setLabel).toHaveBeenCalledWith(note.noteId, "startTime", "09:00");
expect(setLabel).toHaveBeenCalledWith(note.noteId, "endTime", "10:00");
expect(removeLabel).toHaveBeenCalledWith(note, "endDate");
// The fields answer the press at once, ahead of the labels echoing back.
expect(timeInputs()).toHaveLength(2);
+ expect(document.activeElement).toBe(timeInputs()[0]);
expect(dateInputs()).toHaveLength(1);
});
- it("switching all-day on takes the hours off and keeps the dates", () => {
+ it("removing the time takes the hours off and keeps the dates", () => {
const note = buildNote({ title: "Meeting", "#startDate": "2026-06-05", "#startTime": "13:00", "#endTime": "14:30" });
mount(note);
- act(() => allDayBox()?.click());
+ act(() => removeTimeButton()?.click());
expect(removeLabel).toHaveBeenCalledWith(note, "startTime");
expect(removeLabel).toHaveBeenCalledWith(note, "endTime");
expect(setLabel).not.toHaveBeenCalled();
expect(dateInputs()).toHaveLength(2);
+ expect(document.activeElement).toBe(addTimeButton());
});
it("commits an end date as the field is left, and emptying it makes the event a single day", () => {
@@ -127,7 +133,7 @@ describe("EventDatesEditor", () => {
});
mount(note);
- expect(allDayBox()?.checked).toBe(true);
+ expect(addTimeButton()).not.toBeNull();
expect(dateInputs()[0].value).toBe("2026-06-05");
expect(dateInputs()[1].value).toBe("2026-06-07");
@@ -170,10 +176,10 @@ describe("EventDatesEditor", () => {
"#calendar:endTime": "myEndTime", "#myEndTime": "14:30"
});
mount(note);
- expect(allDayBox()?.checked).toBe(false);
+ expect(addTimeButton()).toBeNull();
expect(timeInputs()[0].value).toBe("13:00");
- act(() => allDayBox()?.click());
+ act(() => removeTimeButton()?.click());
expect(removeLabel).toHaveBeenCalledWith(note, "myStartTime");
expect(removeLabel).toHaveBeenCalledWith(note, "startTime");
diff --git a/apps/client/src/widgets/collections/calendar/EventDatesEditor.tsx b/apps/client/src/widgets/collections/calendar/EventDatesEditor.tsx
index 4acf24ad51..4a966600f1 100644
--- a/apps/client/src/widgets/collections/calendar/EventDatesEditor.tsx
+++ b/apps/client/src/widgets/collections/calendar/EventDatesEditor.tsx
@@ -4,22 +4,21 @@ import { useEffect, useState } from "preact/hooks";
import FNote from "../../../entities/fnote";
import { t } from "../../../services/i18n";
import LabelValueInput from "../../attribute_widgets/label_value_input";
-import FormToggle from "../../react/FormToggle";
-import { EventDuration, EventRow } from "./EventField";
+import { EventDuration, EventRow, EventTimeRow } from "./EventField";
import { useEventLabel } from "./hooks";
import { DEFAULT_END_TIME, DEFAULT_START_TIME } from "./selection";
/**
* Edits when the event happens, through the date and time labels the calendar draws it by (see
* event_builder.ts) — under whatever names the note draws them by, a `#calendar:startDate`
- * renaming included (see useEventLabel). Two shapes, told apart by the all-day switch: a whole-day
+ * renaming included (see useEventLabel). Two shapes, told apart by whether it has hours: a whole-day
* event is a span of days — a start date and, where it runs longer, an end date — while a timed
* one is a single day and the hours within it. Rendered as {@link EventRow} lines: the date, the
- * all-day switch beside the repeats field, and for a timed event the hours and their duration.
+ * hours with their duration (or the button to add them), then the repeats field.
*/
export default function EventDatesEditor({ note, repeats }: {
note: FNote;
- /** The repeats field, shown beside the all-day switch. */
+ /** The repeats field, shown on a row of its own below the hours. */
repeats?: ComponentChildren;
}) {
const [ startDate, setStartDate ] = useEventLabel(note, "startDate");
@@ -28,25 +27,26 @@ export default function EventDatesEditor({ note, repeats }: {
const [ endTime, setEndTime ] = useEventLabel(note, "endTime");
// All day is the absence of a start time, which is how the event builder reads it too. Held
- // locally so the switch answers the press at once — the labels the press writes come back only
+ // locally so the time row answers the press at once — the labels the press writes come back only
// with the server's echo — and follows the note's own state wherever it changes from.
const storedAllDay = !startTime;
const [ allDay, setAllDay ] = useState(storedAllDay);
useEffect(() => setAllDay(storedAllDay), [ storedAllDay ]);
- const toggleAllDay = (on: boolean) => {
- setAllDay(on);
- if (on) {
- // A whole day has no hours; the dates stay as they were.
- setStartTime(null);
- setEndTime(null);
- } else {
- // A timed event is said within one day, so a span of days is let go rather than kept
- // where the fields no longer show it. The hours are a foothold to edit, not a guess.
- setStartTime(DEFAULT_START_TIME);
- setEndTime(endTime ?? DEFAULT_END_TIME);
- setEndDate(null);
- }
+ const addTime = () => {
+ setAllDay(false);
+ // A timed event is said within one day, so a span of days is let go rather than kept
+ // where the fields no longer show it. The hours are a foothold to edit, not a guess.
+ setStartTime(DEFAULT_START_TIME);
+ setEndTime(endTime ?? DEFAULT_END_TIME);
+ setEndDate(null);
+ };
+
+ const removeTime = () => {
+ // A whole day has no hours; the dates stay as they were.
+ setAllDay(true);
+ setStartTime(null);
+ setEndTime(null);
};
return (
@@ -75,38 +75,30 @@ export default function EventDatesEditor({ note, repeats }: {
</>}
</EventRow>
- <EventRow>
- <div className="calendar-event-switches">
- <FormToggle
- switchOnName={t("calendar.dates.all_day")}
- switchOffName={t("calendar.dates.all_day")}
- currentValue={allDay}
- onChange={toggleAllDay}
- />
- {repeats}
- </div>
- </EventRow>
+ <EventTimeRow hasTime={!allDay} onAdd={addTime} onRemove={removeTime}>
+ <LabelValueInput
+ labelType="time"
+ value={startTime ?? ""}
+ commitOn="blur"
+ // Never emptied either: a timed event without a start time is the all-day
+ // shape, and the button beside the hours is the way to say that.
+ onCommit={(value) => value && setStartTime(value)}
+ inputProps={{ className: "form-control", "aria-label": t("calendar.dates.start_time") }}
+ />
+ <span className="calendar-event-row-separator" aria-hidden="true">–</span>
+ <LabelValueInput
+ labelType="time"
+ value={endTime ?? ""}
+ commitOn="blur"
+ onCommit={(value) => value && setEndTime(value)}
+ inputProps={{ className: "form-control", "aria-label": t("calendar.dates.end_time") }}
+ />
+ {startDate && <EventDuration event={{ startDate, endDate, startTime, endTime }} />}
+ </EventTimeRow>
- {!allDay && (
- <EventRow icon="bx-time-five" title={t("calendar.dates.time")}>
- <LabelValueInput
- labelType="time"
- value={startTime ?? ""}
- commitOn="blur"
- // Never emptied either: a timed event without a start time is the
- // all-day shape, and the switch above is the way to say that.
- onCommit={(value) => value && setStartTime(value)}
- inputProps={{ className: "form-control", "aria-label": t("calendar.dates.start_time") }}
- />
- <span className="calendar-event-row-separator" aria-hidden="true">–</span>
- <LabelValueInput
- labelType="time"
- value={endTime ?? ""}
- commitOn="blur"
- onCommit={(value) => value && setEndTime(value)}
- inputProps={{ className: "form-control", "aria-label": t("calendar.dates.end_time") }}
- />
- {startDate && <EventDuration event={{ startDate, endDate, startTime, endTime }} />}
+ {repeats && (
+ <EventRow icon="bx-repeat" title={t("calendar.recurrence.repeats")}>
+ {repeats}
</EventRow>
)}
</>
diff --git a/apps/client/src/widgets/collections/calendar/EventField.css b/apps/client/src/widgets/collections/calendar/EventField.css
index 8c60ad7631..5b399c54d5 100644
--- a/apps/client/src/widgets/collections/calendar/EventField.css
+++ b/apps/client/src/widgets/collections/calendar/EventField.css
@@ -35,6 +35,10 @@
display: flex;
align-items: center;
gap: 6px;
+ /* Shared by the inputs and the button to add hours, so the time row keeps its height when
+ one replaces the other. */
+ --calendar-event-control-height: 2rem;
+ min-height: var(--calendar-event-control-height);
/* A native date or time input with `width: auto` is as wide as its fields and picker icon.
It can still shrink when the row is narrower than that, as on a phone. */
@@ -42,9 +46,22 @@
flex: 0 1 auto;
width: auto;
min-width: 0;
+ height: var(--calendar-event-control-height);
padding: 0.25rem 0.5rem;
}
+ .calendar-event-add-time {
+ display: inline-flex;
+ align-items: center;
+ gap: 0.35em;
+ height: var(--calendar-event-control-height);
+ padding: 0 0.5rem;
+
+ .tn-icon {
+ font-size: 1.2em;
+ }
+ }
+
.select-button {
--bs-btn-padding-y: 0.25rem;
--bs-btn-padding-x: 0.5rem;
@@ -62,12 +79,9 @@
opacity: 0.75;
}
- .calendar-event-switches {
- flex: 1;
- min-width: 0;
- display: flex;
- align-items: center;
- gap: 16px;
+ .calendar-event-remove-time {
+ flex: none;
+ margin-inline-start: auto;
}
.calendar-event-duration {
diff --git a/apps/client/src/widgets/collections/calendar/EventField.tsx b/apps/client/src/widgets/collections/calendar/EventField.tsx
index 89de87f56e..b50c25a34e 100644
--- a/apps/client/src/widgets/collections/calendar/EventField.tsx
+++ b/apps/client/src/widgets/collections/calendar/EventField.tsx
@@ -1,9 +1,12 @@
import "./EventField.css";
import clsx from "clsx";
-import { ComponentChildren } from "preact";
+import { ComponentChildren, RefObject } from "preact";
+import { useLayoutEffect, useRef } from "preact/hooks";
import { t } from "../../../services/i18n";
+import ActionButton from "../../react/ActionButton";
+import Button from "../../react/Button";
import { getTimedDurationMinutes } from "./utils";
/**
@@ -40,14 +43,15 @@ export function EventField({ name, htmlFor, children }: {
* name as its tooltip. A line without an icon is indented to the same column, so its controls line
* up with the ones above. Shared by the event popover and the new-event popup.
*/
-export function EventRow({ icon, title, children }: {
+export function EventRow({ icon, title, rowRef, children }: {
/** A boxicons class such as `bx-calendar`. */
icon?: string;
title?: string;
+ rowRef?: RefObject<HTMLDivElement | null>;
children: ComponentChildren;
}) {
return (
- <div className="calendar-event-row">
+ <div ref={rowRef} className="calendar-event-row">
<span className={clsx("calendar-event-row-icon", icon && `bx ${icon}`)} title={title} aria-hidden="true" />
{children}
</div>
@@ -65,6 +69,56 @@ export function EventFieldControls({ className, children }: {
return <div className={clsx("calendar-event-field-controls", className)}>{children}</div>;
}
+/**
+ * The row of an event's hours. An all-day event has none, so the row offers to add them; a timed
+ * one shows its hours (`children`) with a button that removes them, which makes it all-day again.
+ * Either button hands the focus on to what replaces it: the start time, or the button to add one.
+ */
+export function EventTimeRow({ hasTime, onAdd, onRemove, children }: {
+ hasTime: boolean;
+ onAdd(): void;
+ onRemove(): void;
+ children: ComponentChildren;
+}) {
+ const rowRef = useRef<HTMLDivElement>(null);
+ const moveFocus = useRef(false);
+
+ useLayoutEffect(() => {
+ if (!moveFocus.current) return;
+ moveFocus.current = false;
+ const target = hasTime ? "input" : ".calendar-event-add-time";
+ rowRef.current?.querySelector<HTMLElement>(target)?.focus();
+ }, [ hasTime ]);
+
+ return (
+ <EventRow icon="bx-time-five" title={t("calendar.dates.time")} rowRef={rowRef}>
+ {hasTime ? <>
+ {children}
+ <ActionButton
+ className="calendar-event-remove-time"
+ icon="bx bx-x"
+ text={t("calendar.dates.remove_time")}
+ onClick={() => {
+ moveFocus.current = true;
+ onRemove();
+ }}
+ />
+ </> : (
+ <Button
+ className="calendar-event-add-time"
+ kind="lowProfile"
+ icon="bx-plus"
+ text={t("calendar.dates.add_time")}
+ onClick={() => {
+ moveFocus.current = true;
+ onAdd();
+ }}
+ />
+ )}
+ </EventRow>
+ );
+}
+
/**
* How long a timed event lasts, at the end of its time row. Renders nothing for an all-day event. An end before the start reads as running into the next day (see
* {@link getTimedDurationMinutes}).
diff --git a/apps/client/src/widgets/collections/calendar/GhostPopover.spec.tsx b/apps/client/src/widgets/collections/calendar/GhostPopover.spec.tsx
index cbc564a373..aa63056ed1 100644
--- a/apps/client/src/widgets/collections/calendar/GhostPopover.spec.tsx
+++ b/apps/client/src/widgets/collections/calendar/GhostPopover.spec.tsx
@@ -113,14 +113,15 @@ describe("GhostPopover", () => {
const onCommit = vi.fn().mockResolvedValue(undefined);
mount(onCommit);
- const allDay = document.querySelector<HTMLInputElement>(".calendar-event-switches .switch-toggle");
- if (!allDay) throw new Error("The ghost has no all-day switch.");
- expect(allDay.checked).toBe(true);
+ const addTime = document.querySelector<HTMLButtonElement>(".calendar-event-add-time");
+ if (!addTime) throw new Error("The ghost has no button to add a time.");
expect(timeInputs()).toHaveLength(0);
+ expect(addTime.closest(".calendar-event-row")?.querySelector(".bx-time-five")).not.toBeNull();
expect(duration()).toBeUndefined();
- act(() => { allDay.dispatchEvent(new Event("input", { bubbles: true })); });
+ act(() => { addTime.click(); });
const [ start, end ] = timeInputs();
+ expect(document.activeElement).toBe(start);
expect(start.value).toBe("09:00");
expect(end.value).toBe("10:00");
expect(duration()).toBe("calendar_view.duration_hours|1");
@@ -137,4 +138,17 @@ describe("GhostPopover", () => {
startDate: "2026-06-05", endDate: null, startTime: "14:00", endTime: "15:30"
});
});
+
+ it("lets the hours be removed again, making the draft whole-day", async () => {
+ const onCommit = vi.fn().mockResolvedValue(undefined);
+ mount(onCommit);
+
+ act(() => { document.querySelector<HTMLButtonElement>(".calendar-event-add-time")?.click(); });
+ act(() => { document.querySelector<HTMLElement>(".calendar-event-remove-time")?.click(); });
+
+ expect(timeInputs()).toHaveLength(0);
+ expect(document.activeElement).toBe(document.querySelector(".calendar-event-add-time"));
+ await act(async () => { createButton()?.click(); });
+ expect(onCommit).toHaveBeenCalledWith("", { startDate: "2026-06-05", startTime: null, endTime: null, endDate: null });
+ });
});
diff --git a/apps/client/src/widgets/collections/calendar/GhostPopover.tsx b/apps/client/src/widgets/collections/calendar/GhostPopover.tsx
index ea60a82329..1347de8570 100644
--- a/apps/client/src/widgets/collections/calendar/GhostPopover.tsx
+++ b/apps/client/src/widgets/collections/calendar/GhostPopover.tsx
@@ -7,15 +7,14 @@ import { isMobile } from "../../../services/utils";
import ActionButton from "../../react/ActionButton";
import Button from "../../react/Button";
import FormTextBox from "../../react/FormTextBox";
-import FormToggle from "../../react/FormToggle";
import Modal from "../../react/Modal";
import Popover from "../../react/Popover";
-import { EventDuration, EventRow } from "./EventField";
+import { EventDuration, EventRow, EventTimeRow } from "./EventField";
import { AnchorPoint, EventDraft, narrowAnchorRect, withAllDay } from "./selection";
/**
* The ghost: the form an event is decided in before its note exists. It asks for the name, shows
- * the days the drag covered, and lets the user switch all-day off to give the event hours, as a
+ * the days the drag covered, and lets the user add hours to the event, as a
* click in the month view drafts a whole day. Everything else an event can hold waits for the
* note, a click on its chip away. Dismissed — Escape, the close button, a press anywhere else —
* the draft simply evaporates: nothing was created.
@@ -116,35 +115,26 @@ export default function GhostPopover({ draft: initialDraft, anchor, container, o
<span>{describeDates(draft)}</span>
</EventRow>
- <EventRow>
- <div className="calendar-event-switches">
- <FormToggle
- switchOnName={t("calendar.dates.all_day")}
- switchOffName={t("calendar.dates.all_day")}
- currentValue={allDay}
- onChange={(on) => setDraft((d) => withAllDay(d, on))}
- />
- </div>
- </EventRow>
-
- {!allDay && (
- <EventRow icon="bx-time-five" title={t("calendar.dates.time")}>
- <FormTextBox
- type="time"
- currentValue={draft.startTime ?? ""}
- aria-label={t("calendar.dates.start_time")}
- onChange={(startTime) => startTime && setDraft((d) => ({ ...d, startTime }))}
- />
- <span className="calendar-event-row-separator" aria-hidden="true">–</span>
- <FormTextBox
- type="time"
- currentValue={draft.endTime ?? ""}
- aria-label={t("calendar.dates.end_time")}
- onChange={(endTime) => endTime && setDraft((d) => ({ ...d, endTime }))}
- />
- <EventDuration event={draft} />
- </EventRow>
- )}
+ <EventTimeRow
+ hasTime={!allDay}
+ onAdd={() => setDraft((d) => withAllDay(d, false))}
+ onRemove={() => setDraft((d) => withAllDay(d, true))}
+ >
+ <FormTextBox
+ type="time"
+ currentValue={draft.startTime ?? ""}
+ aria-label={t("calendar.dates.start_time")}
+ onChange={(startTime) => startTime && setDraft((d) => ({ ...d, startTime }))}
+ />
+ <span className="calendar-event-row-separator" aria-hidden="true">–</span>
+ <FormTextBox
+ type="time"
+ currentValue={draft.endTime ?? ""}
+ aria-label={t("calendar.dates.end_time")}
+ onChange={(endTime) => endTime && setDraft((d) => ({ ...d, endTime }))}
+ />
+ <EventDuration event={draft} />
+ </EventTimeRow>
</div>
<div className="calendar-ghost-actions">
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Calendar.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Calendar.html
index e30dac8b19..f39f736ff7 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Calendar.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Calendar.html
@@ -37,10 +37,11 @@
title is provided, the event will follow the&nbsp;<a class="reference-link"
href="#root/_help_47ZrP6FNuoG8">Default Note Title</a>&nbsp;rules.</p>
<p>To give the event a time before creating it (for example, after clicking
- a day in the month view), turn off the <em>All day</em> toggle and set the
- start and end time; the duration is shown to the right of them. A timed
- event spans a single day, so turning off <em>All day</em> for a range of
- days keeps only the first one.</p>
+ a day in the month view), press <em>Add time</em> and set the start and end
+ time; the duration is shown to the right of them. To make the event all-day
+ again, press the <span class="tn-icon bx bx-x"></span> button at the end
+ of the row. A timed event spans a single day, so adding a time to a range
+ of days keeps only the first one.</p>
<p>After creating the event, it will show up on the calendar. To edit the
content of the event (including recurrence), click on it to bring it into
the popup view.</p>
@@ -82,12 +83,12 @@
</li>
<li>Calendar-specific features:
<ul>
- <li>The date, with the <em>All day</em> toggle and the recurrence dropdown underneath
- it.</li>
- <li>For a timed event, the start and end time, with the duration to the right
- of them.</li>
- <li>A full recurrence editor, opened from that dropdown, to have the same
- event show up weekly, monthly, etc.</li>
+ <li>The date, or the first and last day for an all-day event.</li>
+ <li>The start and end time with the duration to the right of them, and a <span
+ class="tn-icon bx bx-x"></span> button that removes the time, making the
+ event all-day. An all-day event shows an <em>Add time</em> button instead.</li>
+ <li>A full recurrence editor, opened from the dropdown below the time, to
+ have the same event show up weekly, monthly, etc.</li>
</ul>
</li>
<li>The&nbsp;<a class="reference-link" href="#root/_help_OFXdgB2nNk1F">Promoted Attributes</a>&nbsp;of
diff --git a/docs/User Guide/User Guide/Collections/Calendar.md b/docs/User Guide/User Guide/Collections/Calendar.md
index c14e64910e..5a2e9d9b1e 100644
--- a/docs/User Guide/User Guide/Collections/Calendar.md
+++ b/docs/User Guide/User Guide/Collections/Calendar.md
@@ -28,7 +28,7 @@ In either cases, a small popup will show with a prompt for a title and the date
At this point, the event hasn't been created yet to protect against accidental clicks. Add a title optionally and press the _Create_ button. If no title is provided, the event will follow the <a class="reference-link" href="../Advanced%20Usage/Default%20Note%20Title.md">Default Note Title</a> rules.
-To give the event a time before creating it (for example, after clicking a day in the month view), turn off the _All day_ toggle and set the start and end time; the duration is shown to the right of them. A timed event spans a single day, so turning off _All day_ for a range of days keeps only the first one.
+To give the event a time before creating it (for example, after clicking a day in the month view), press _Add time_ and set the start and end time; the duration is shown to the right of them. To make the event all-day again, press the <span class="tn-icon bx bx-x"></span> button at the end of the row. A timed event spans a single day, so adding a time to a range of days keeps only the first one.
After creating the event, it will show up on the calendar. To edit the content of the event (including recurrence), click on it to bring it into the popup view.
@@ -56,9 +56,9 @@ When an event is clicked, a popup will show near the event which contains the fo
* Color picker to change the color of the event.
* Button to remove the event from the calendar, which can optionally delete its corresponding note.
* Calendar-specific features:
- * The date, with the _All day_ toggle and the recurrence dropdown underneath it.
- * For a timed event, the start and end time, with the duration to the right of them.
- * A full recurrence editor, opened from that dropdown, to have the same event show up weekly, monthly, etc.
+ * The date, or the first and last day for an all-day event.
+ * The start and end time with the duration to the right of them, and a <span class="tn-icon bx bx-x"></span> button that removes the time, making the event all-day. An all-day event shows an _Add time_ button instead.
+ * A full recurrence editor, opened from the dropdown below the time, to have the same event show up weekly, monthly, etc.
* The <a class="reference-link" href="../Advanced%20Usage/Attributes/Promoted%20Attributes.md">Promoted Attributes</a> of the marker, if any.
* The note's content which can be edited directly from the panel.