@@ -119,13 +128,24 @@ export default class CalendarView extends ViewMode {
height: "100%",
eventContent: (e => {
let html = "";
+ const { iconClass, promotedAttributes } = e.event.extendedProps;
- const iconClass = e.event.extendedProps.iconClass;
+ // Title and icon
if (iconClass) {
html += `
`;
}
-
html += utils.escapeHtml(e.event.title);
+
+ // Promoted attributes
+ if (promotedAttributes) {
+ for (const [ name, value ] of Object.entries(promotedAttributes)) {
+ html += `\
+
+ ${name}: ${value}
+
`;
+ }
+ }
+
return { html };
}),
dateClick: async (e) => {
@@ -279,7 +299,7 @@ export default class CalendarView extends ViewMode {
const events: EventSourceInput = [];
for (const note of notes) {
- let startDate = note.getLabelValue("startDate");
+ const startDate = note.getLabelValue("startDate");
if (note.hasChildren()) {
const childrenEventData = await this.#buildEvents(note.getChildNoteIds());
@@ -304,6 +324,13 @@ export default class CalendarView extends ViewMode {
const titles = await CalendarView.#parseCustomTitle(customTitle, note);
const color = note.getLabelValue("calendar:color") ?? note.getLabelValue("color");
const events: EventInput[] = [];
+
+ const calendarPromotedAttributes = note.getLabelValue("calendar:promotedAttributes");
+ let promotedAttributesData = null;
+ if (calendarPromotedAttributes) {
+ promotedAttributesData = await this.#buildPromotedAttributes(note, calendarPromotedAttributes);
+ }
+
for (const title of titles) {
const eventData: EventInput = {
title: title,
@@ -311,7 +338,8 @@ export default class CalendarView extends ViewMode {
url: `#${note.noteId}`,
noteId: note.noteId,
color: color ?? undefined,
- iconClass: note.getLabelValue("iconClass")
+ iconClass: note.getLabelValue("iconClass"),
+ promotedAttributes: promotedAttributesData
};
const endDateOffset = CalendarView.#offsetDate(endDate ?? startDate, 1);
@@ -323,6 +351,35 @@ export default class CalendarView extends ViewMode {
return events;
}
+ static async #buildPromotedAttributes(note: FNote, calendarPromotedAttributes: string) {
+ const promotedAttributeNames = calendarPromotedAttributes.split(",");
+ const filteredPromotedAttributes = note.getPromotedDefinitionAttributes().filter((attr) => promotedAttributeNames.includes(attr.name));
+ const result: Record
= {};
+
+ for (const promotedAttribute of filteredPromotedAttributes) {
+ const [ type, name ] = promotedAttribute.name.split(":", 2);
+ const definition = promotedAttribute.getDefinition();
+
+ if (definition.multiplicity !== "single") {
+ // TODO: Add support for multiple definitions.
+ continue;
+ }
+
+ // TODO: Add support for relations
+ if (type !== "label" || !note.hasLabel(name)) {
+ continue;
+ }
+
+ const value = note.getLabelValue(name);
+ const friendlyName = definition.promotedAlias ?? name;
+ if (friendlyName && value) {
+ result[friendlyName] = value;
+ }
+ }
+
+ return result;
+ }
+
static async #parseCustomTitle(customTitleValue: string | null, note: FNote, allowRelations = true): Promise {
if (customTitleValue) {
const attributeName = customTitleValue.substring(1);
diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index 6c67941da..39bdaf8c6 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -79,7 +79,9 @@ button.btn.btn-success kbd {
*/
:root .icon-action:not(.global-menu-button),
-:root .tn-tool-button {
+:root .tn-tool-button,
+:root .btn-group .tn-tool-button:not(:last-child),
+:root .btn-group .tn-tool-button:last-child {
width: var(--icon-button-size);
height: var(--icon-button-size);
border: unset !important;
@@ -89,6 +91,10 @@ button.btn.btn-success kbd {
color: var(--icon-button-color);
}
+.btn-group .tn-tool-button + .tn-tool-button {
+ margin-left: 4px !important;
+}
+
/* The "x" icon button */
:root .icon-action.bx-x,
:root .tn-tool-button.bx-x {
@@ -620,4 +626,12 @@ a.tn-link:hover[href^="https://"]:not(.no-arrow)::after,
.use-tn-links a:hover[href^="http://"]:not(.no-arrow)::after,
.use-tn-links a:hover[href^="https://"]:not(.no-arrow)::after {
animation: link-arrow-blink 500ms linear alternate infinite;
+}
+
+/*
+ * Range inputs (sliders)
+ */
+
+input[type="range"] {
+ background: transparent;
}
\ No newline at end of file
diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index 8dd7c0185..2a433887e 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -1319,6 +1319,14 @@ body .calendar-dropdown-widget .calendar-body a:hover {
background: transparent !important;
}
+/*
+ * Note Map
+ */
+
+.note-detail-note-map .fixnodes-type-switcher .tn-tool-button.toggled {
+ color: var(--tab-close-button-hover-background);
+}
+
/*
* Recent changes list
*/
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json
index 9e7cd6454..4c0220d9c 100644
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@@ -645,6 +645,9 @@
"show-cheatsheet": "Show Cheatsheet",
"toggle-zen-mode": "Zen Mode"
},
+ "zen_mode": {
+ "button_exit": "Exit Zen Mode"
+ },
"sync_status": {
"unknown": "Sync status will be known once the next sync attempt starts.
Click to trigger sync now.
",
"connected_with_changes": "Connected to the sync server.
There are some outstanding changes yet to be synced.
Click to trigger sync.
",
diff --git a/src/services/import/enex.ts b/src/services/import/enex.ts
index 9ac064109..ae248ab75 100644
--- a/src/services/import/enex.ts
+++ b/src/services/import/enex.ts
@@ -315,14 +315,10 @@ function importEnex(taskContext: TaskContext, file: File, parentNote: BNote): Pr
resource.mime = resource.mime || "application/octet-stream";
const createFileNote = () => {
- if (typeof resource.content !== "string") {
- throw new Error("Missing or wrong content type for resource.");
- }
-
const resourceNote = noteService.createNewNote({
parentNoteId: noteEntity.noteId,
title: resource.title,
- content: resource.content,
+ content: resource.content ?? "",
type: "file",
mime: resource.mime,
isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable()