Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
feat(calendar): lead the event's date and time with icons
Elian Doranfac700963113
diff --git a/apps/client/src/widgets/collections/calendar/EventDatesEditor.css b/apps/client/src/widgets/collections/calendar/EventDatesEditor.cssdeleted file mode 100644index 2ced0daf54..0000000000--- a/apps/client/src/widgets/collections/calendar/EventDatesEditor.css+++ /dev/null@@ -1,21 +0,0 @@-/* The toggle stood at the height of the control beside it, so the row's two fields meet on one- line; the toggle itself is the app's own (see FormToggle). */-.calendar-all-day-switch {- display: flex;- align-items: center;- flex: 1;- min-height: 2em;-}--/* A range said in one line — the days an event spans, or the hours within its day: the two ends- share the row evenly, the dash between them taking only its own width. */-.calendar-event-range {- > input {- flex: 1 1 0;- min-width: 0;- }-- .calendar-event-range-separator {- opacity: 0.75;- }-}diff --git a/apps/client/src/widgets/collections/calendar/EventDatesEditor.spec.tsx b/apps/client/src/widgets/collections/calendar/EventDatesEditor.spec.tsxindex 03c1a86bb5..df7ff365c3 100644--- a/apps/client/src/widgets/collections/calendar/EventDatesEditor.spec.tsx+++ b/apps/client/src/widgets/collections/calendar/EventDatesEditor.spec.tsx@@ -69,7 +69,8 @@ describe("EventDatesEditor", () => {expect(timeInputs()).toHaveLength(2);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(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", () => {diff --git a/apps/client/src/widgets/collections/calendar/EventDatesEditor.tsx b/apps/client/src/widgets/collections/calendar/EventDatesEditor.tsxindex 916efd3139..4acf24ad51 100644--- a/apps/client/src/widgets/collections/calendar/EventDatesEditor.tsx+++ b/apps/client/src/widgets/collections/calendar/EventDatesEditor.tsx@@ -1,5 +1,3 @@-import "./EventDatesEditor.css";-import { ComponentChildren } from "preact";import { useEffect, useState } from "preact/hooks";@@ -7,8 +5,7 @@ import FNote from "../../../entities/fnote";import { t } from "../../../services/i18n";import LabelValueInput from "../../attribute_widgets/label_value_input";import FormToggle from "../../react/FormToggle";-import { useUniqueName } from "../../react/hooks";-import { EventDuration, EventField, EventFieldControls, EventFieldRow } from "./EventField";+import { EventDuration, EventRow } from "./EventField";import { useEventLabel } from "./hooks";import { DEFAULT_END_TIME, DEFAULT_START_TIME } from "./selection";@@ -17,21 +14,18 @@ import { DEFAULT_END_TIME, DEFAULT_START_TIME } from "./selection";* 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* 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 EventField} rows, standing in- * the event popover's field column beside the recurrence.+ * 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.*/export default function EventDatesEditor({ note, repeats }: {note: FNote;- /** The repeats field, handed in to stand beside the all-day switch: how the event repeats- * belongs to the recurrence editor, but the room next to the switch is this editor's to give. */+ /** The repeats field, shown beside the all-day switch. */repeats?: ComponentChildren;}) {const [ startDate, setStartDate ] = useEventLabel(note, "startDate");const [ endDate, setEndDate ] = useEventLabel(note, "endDate");const [ startTime, setStartTime ] = useEventLabel(note, "startTime");const [ endTime, setEndTime ] = useEventLabel(note, "endTime");- const startDateId = useUniqueName("event-start-date");- const allDayId = useUniqueName("event-all-day");// 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@@ -57,75 +51,63 @@ export default function EventDatesEditor({ note, repeats }: {return (<>- {/* The two shape-of-the-event switches share the first line: whether it takes the whole- day, and whether it comes back. The app's own toggle (see the revisions dialog),- nameless because the field's name speaks for it — a switch rather than a checkbox,- as it reads as the mode flip it is. */}- <EventFieldRow>- <EventField name={t("calendar.dates.all_day")} htmlFor={allDayId} compact>- <div className="calendar-all-day-switch">- <FormToggle- id={allDayId}- currentValue={allDay}- onChange={toggleAllDay}- />- </div>- </EventField>- {repeats}- </EventFieldRow>-- {/* One line whichever the shape: the day, or the days it spans. */}- <EventField name={t("calendar.dates.date")} htmlFor={startDateId}>- <EventFieldControls className="calendar-event-range">+ <EventRow icon="bx-calendar" title={t("calendar.dates.date")}>+ <LabelValueInput+ labelType="date"+ value={startDate ?? ""}+ commitOn="blur"+ // Never emptied: without a start date the note stops being an event at all,+ // and the dock is no place to do that by accident. The field snaps back.+ onCommit={(value) => value && setStartDate(value)}+ inputProps={{ className: "form-control", "aria-label": t("calendar.dates.start_date") }}+ />+ {allDay && <>+ <span className="calendar-event-row-separator" aria-hidden="true">–</span><LabelValueInputlabelType="date"- value={startDate ?? ""}+ value={endDate ?? ""}commitOn="blur"- // Never emptied: without a start date the note stops being an event at all,- // and the dock is no place to do that by accident. The field snaps back.- onCommit={(value) => value && setStartDate(value)}- inputProps={{ id: startDateId, className: "form-control", "aria-label": t("calendar.dates.start_date") }}+ // Emptied, the event is a single day: the label goes rather than+ // staying blank, which is how the builder reads a day-long event.+ onCommit={(value) => setEndDate(value || null)}+ inputProps={{ className: "form-control", "aria-label": t("calendar.dates.end_date") }}/>- {allDay && <>- <span className="calendar-event-range-separator" aria-hidden="true">–</span>- <LabelValueInput- labelType="date"- value={endDate ?? ""}- commitOn="blur"- // Emptied, the event is a single day: the label goes rather than- // staying blank, which is how the builder reads a day-long event.- onCommit={(value) => setEndDate(value || null)}- inputProps={{ className: "form-control", "aria-label": t("calendar.dates.end_date") }}- />- </>}- </EventFieldControls>- </EventField>+ </>}+ </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>{!allDay && (- <EventField name={<>- {t("calendar.dates.time")}+ <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 }} />}- </>}>- <EventFieldControls className="calendar-event-range">- <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-range-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") }}- />- </EventFieldControls>- </EventField>+ </EventRow>)}</>);diff --git a/apps/client/src/widgets/collections/calendar/EventField.css b/apps/client/src/widgets/collections/calendar/EventField.cssindex 92b86bc364..a2f7f35677 100644--- a/apps/client/src/widgets/collections/calendar/EventField.css+++ b/apps/client/src/widgets/collections/calendar/EventField.css@@ -9,24 +9,6 @@gap: 4px;}- /* Fields sharing one line, splitting what is left of it evenly. Parted by more than the- controls within a field are, so the line reads as two fields rather than as one field's- worth of controls. */- .calendar-event-field-row {- display: flex;- gap: 16px;-- > * {- flex: 1 1 0;- min-width: 0;- }-- /* Except those that asked for no more room than they need (see EventField's `compact`). */- > .calendar-event-field-compact {- flex: 0 0 auto;- }- }-/* Faded as the promoted grid fades its labels (see theme-next/shell.css), so the event's ownfields and the note's promoted ones read as one form when they stand in the same dock. */.calendar-event-field-name {@@ -48,3 +30,41 @@}}}++.calendar-event-row {+ display: flex;+ align-items: center;+ gap: 6px;++ > input {+ flex: 1 1 0;+ min-width: 0;+ }++ /* As wide as an `ActionButton`, so the icons line up with the popover's toolbar above them. */+ .calendar-event-row-icon {+ flex: 0 0 var(--icon-button-size);+ font-size: 1.1em;+ text-align: center;+ color: var(--muted-text-color);+ }++ .calendar-event-row-separator {+ opacity: 0.75;+ }++ .calendar-event-switches {+ flex: 1;+ min-width: 0;+ display: flex;+ align-items: center;+ gap: 16px;+ }++ .calendar-event-duration {+ flex: none;+ white-space: nowrap;+ font-size: 0.9em;+ color: var(--muted-text-color);+ }+}diff --git a/apps/client/src/widgets/collections/calendar/EventField.tsx b/apps/client/src/widgets/collections/calendar/EventField.tsxindex 88cfaf68e5..89de87f56e 100644--- a/apps/client/src/widgets/collections/calendar/EventField.tsx+++ b/apps/client/src/widgets/collections/calendar/EventField.tsx@@ -21,17 +21,14 @@ export function EventFieldList({ children }: { children: ComponentChildren }) {* one input to speak for ({@link htmlFor}), and reads as a heading where the field is a group —* a row of weekday toggles has no single input to point at.*/-export function EventField({ name, htmlFor, compact, children }: {- name: ComponentChildren;+export function EventField({ name, htmlFor, children }: {+ name: string;/** The id of the field's input, for a field that has exactly one. */htmlFor?: string;- /** Take no more of a shared line than the field's own name and control need, leaving the rest- * to whatever stands beside it (see {@link EventFieldRow}). */- compact?: boolean;children: ComponentChildren;}) {return (- <div className={clsx("calendar-event-field", compact && "calendar-event-field-compact")}>+ <div className="calendar-event-field"><label className="calendar-event-field-name" for={htmlFor}>{name}</label>{children}</div>@@ -39,11 +36,22 @@ export function EventField({ name, htmlFor, compact, children }: {}/**- * Two or more whole fields sharing one line, each with its own name over its own control — for- * fields short enough that a line apiece would leave the column mostly air.+ * One line of when an event happens, led by an icon that names what the line holds, with the icon's+ * 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 EventFieldRow({ children }: { children: ComponentChildren }) {- return <div className="calendar-event-field-row">{children}</div>;+export function EventRow({ icon, title, children }: {+ /** A boxicons class such as `bx-calendar`. */+ icon?: string;+ title?: string;+ children: ComponentChildren;+}) {+ return (+ <div className="calendar-event-row">+ <span className={clsx("calendar-event-row-icon", icon && `bx ${icon}`)} title={title} aria-hidden="true" />+ {children}+ </div>+ );}/**@@ -58,8 +66,7 @@ export function EventFieldControls({ className, children }: {}/**- * How long a timed event lasts, appended to the line that summarizes when it happens. Renders- * nothing for an all-day event. An end before the start reads as running into the next day (see+ * 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}).*/export function EventDuration({ event }: { event: Parameters<typeof getTimedDurationMinutes>[0] }) {@@ -73,5 +80,5 @@ export function EventDuration({ event }: { event: Parameters<typeof getTimedDura: !minutes? t("calendar_view.duration_hours", { hours }): t("calendar_view.duration_hours_minutes", { hours, minutes });- return <span className="calendar-event-duration"> · {text}</span>;+ return <span className="calendar-event-duration">{text}</span>;}diff --git a/apps/client/src/widgets/collections/calendar/GhostPopover.css b/apps/client/src/widgets/collections/calendar/GhostPopover.cssindex 9c9350c89d..3005f824a9 100644--- a/apps/client/src/widgets/collections/calendar/GhostPopover.css+++ b/apps/client/src/widgets/collections/calendar/GhostPopover.css@@ -14,30 +14,8 @@.calendar-ghost-when {display: flex;- align-items: center;- gap: 6px;- color: var(--muted-text-color);- font-size: 0.9em;-- .calendar-ghost-dates {- flex: 1;- min-width: 0;- }- }-- .calendar-ghost-time {- display: flex;- align-items: center;- gap: 6px;-- > input {- flex: 1 1 0;- min-width: 0;- }-- .calendar-ghost-time-separator {- opacity: 0.75;- }+ flex-direction: column;+ gap: 10px;}.calendar-ghost-actions {@@ -51,7 +29,7 @@* room around what it holds — all of which a dialog brings for the sheet.*/.calendar-ghost-popover {- width: 340px;+ width: 460px;.calendar-ghost-header {display: flex;diff --git a/apps/client/src/widgets/collections/calendar/GhostPopover.spec.tsx b/apps/client/src/widgets/collections/calendar/GhostPopover.spec.tsxindex 1dd642d871..cbc564a373 100644--- a/apps/client/src/widgets/collections/calendar/GhostPopover.spec.tsx+++ b/apps/client/src/widgets/collections/calendar/GhostPopover.spec.tsx@@ -113,7 +113,7 @@ describe("GhostPopover", () => {const onCommit = vi.fn().mockResolvedValue(undefined);mount(onCommit);- const allDay = document.querySelector<HTMLInputElement>(".calendar-ghost-when .switch-toggle");+ 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);expect(timeInputs()).toHaveLength(0);@@ -123,13 +123,14 @@ describe("GhostPopover", () => {const [ start, end ] = timeInputs();expect(start.value).toBe("09:00");expect(end.value).toBe("10:00");- expect(duration()).toBe(" · calendar_view.duration_hours|1");+ expect(duration()).toBe("calendar_view.duration_hours|1");start.value = "14:00";act(() => { start.dispatchEvent(new Event("input", { bubbles: true })); });end.value = "15:30";act(() => { end.dispatchEvent(new Event("input", { bubbles: true })); });- expect(duration()).toBe(" · calendar_view.duration_hours_minutes|1|30");+ expect(duration()).toBe("calendar_view.duration_hours_minutes|1|30");+ expect(timeInputs()[0].closest(".calendar-event-row")?.querySelector(".calendar-event-duration")).not.toBeNull();await act(async () => { createButton()?.click(); });expect(onCommit).toHaveBeenCalledWith("", {diff --git a/apps/client/src/widgets/collections/calendar/GhostPopover.tsx b/apps/client/src/widgets/collections/calendar/GhostPopover.tsxindex 2972b3777e..ea60a82329 100644--- a/apps/client/src/widgets/collections/calendar/GhostPopover.tsx+++ b/apps/client/src/widgets/collections/calendar/GhostPopover.tsx@@ -10,7 +10,7 @@ import FormTextBox from "../../react/FormTextBox";import FormToggle from "../../react/FormToggle";import Modal from "../../react/Modal";import Popover from "../../react/Popover";-import { EventDuration } from "./EventField";+import { EventDuration, EventRow } from "./EventField";import { AnchorPoint, EventDraft, narrowAnchorRect, withAllDay } from "./selection";/**@@ -112,34 +112,41 @@ export default function GhostPopover({ draft: initialDraft, anchor, container, o/><div className="calendar-ghost-when">- <span className="bx bx-calendar" />- <span className="calendar-ghost-dates">{describeDates(draft)}<EventDuration event={draft} /></span>- <FormToggle- switchOnName={t("calendar.dates.all_day")}- switchOffName={t("calendar.dates.all_day")}- currentValue={allDay}- onChange={(on) => setDraft((d) => withAllDay(d, on))}- />+ <EventRow icon="bx-calendar" title={t("calendar.dates.date")}>+ <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>+ )}</div>- {!allDay && (- <div className="calendar-ghost-time">- <FormTextBox- type="time"- currentValue={draft.startTime ?? ""}- aria-label={t("calendar.dates.start_time")}- onChange={(startTime) => startTime && setDraft((d) => ({ ...d, startTime }))}- />- <span className="calendar-ghost-time-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 }))}- />- </div>- )}-<div className="calendar-ghost-actions"><Buttonkind="primary"diff --git a/apps/client/src/widgets/collections/calendar/RecurrenceEditor.tsx b/apps/client/src/widgets/collections/calendar/RecurrenceEditor.tsxindex 418f486309..a4c4d4f70b 100644--- a/apps/client/src/widgets/collections/calendar/RecurrenceEditor.tsx+++ b/apps/client/src/widgets/collections/calendar/RecurrenceEditor.tsx@@ -29,8 +29,8 @@ import {* Edits how the event repeats, through the note's `#recurrence` label — or whatever label a* `#calendar:recurrence` renaming points at instead (see useEventLabel) — structured fields for* the everyday rules, the raw RRULE string for one saying more than they can (see recurrence.ts- * for where that line runs). Rendered as {@link EventField} rows, so it stands in the event- * popover's field column beside the start and end dates when those grow editors of their own.+ * for where that line runs). Rendered as a dropdown whose button names the rule, shown beside the+ * all-day switch (see EventDatesEditor); the rule's fields open inside it.*/export default function RecurrenceEditor({ note }: { note: FNote }) {const [ storedValue, setStoredValue ] = useEventLabel(note, "recurrence");@@ -58,19 +58,18 @@ export default function RecurrenceEditor({ note }: { note: FNote }) {// — a rule is several choices, and the menu going down after the first would make it three// trips. Portaled to the body because the popover clips what overflows it (see EventPopover.css).return (- <EventField name={t("calendar.recurrence.repeats")}>- <DropdownPanel- className="calendar-recurrence-dropdown"- text={modelTitle(model)}- autoClose="outside"- >- <EventFieldList>- <FrequencyField model={model} commit={commit} />- {model.kind === "simple" && <SimpleRuleFields rule={model.rule} commit={commit} />}- {model.kind === "custom" && <CustomRuleField value={model.value} commit={commit} />}- </EventFieldList>- </DropdownPanel>- </EventField>+ <DropdownPanel+ className="calendar-recurrence-dropdown"+ text={modelTitle(model)}+ title={t("calendar.recurrence.repeats")}+ autoClose="outside"+ >+ <EventFieldList>+ <FrequencyField model={model} commit={commit} />+ {model.kind === "simple" && <SimpleRuleFields rule={model.rule} commit={commit} />}+ {model.kind === "custom" && <CustomRuleField value={model.value} commit={commit} />}+ </EventFieldList>+ </DropdownPanel>);}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.htmlindex 7b059f4193..e30dac8b19 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@@ -38,9 +38,9 @@href="#root/_help_47ZrP6FNuoG8">Default Note Title</a> rules.</p><p>To give the event a time before creating it (for example, after clickinga day in the month view), turn off the <em>All day</em> toggle and set the- start and end time; the duration is shown next to the date. 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>+ 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><p>After creating the event, it will show up on the calendar. To edit thecontent of the event (including recurrence), click on it to bring it intothe popup view.</p>@@ -82,11 +82,12 @@</li><li>Calendar-specific features:<ul>- <li>A toggle for all-day events.</li>- <li>A start/end date & time selector. For a timed event, the duration- is shown next to the <em>Time</em> label.</li>- <li>A full recurrence editor, to have the same event show up weekly, monthly,- etc.</li>+ <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></ul></li><li>The <a class="reference-link" href="#root/_help_OFXdgB2nNk1F">Promoted Attributes</a> ofdiff --git a/docs/User Guide/User Guide/Collections/Calendar.md b/docs/User Guide/User Guide/Collections/Calendar.mdindex ed78afdaaa..c14e64910e 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 dateAt 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 next to the date. 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), 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.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:- * A toggle for all-day events.- * A start/end date & time selector. For a timed event, the duration is shown next to the _Time_ label.- * A full recurrence editor, to have the same event show up weekly, monthly, etc.+ * 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 <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.