client/pageurl: adjust Info bar order

.github/workflows/main-docker.yml

@@ -155,10 +155,6 @@ jobs:
       - name: Update build info
         run: pnpm run chore:update-build-info
 
-      - name: Update nightly version
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        run: pnpm run chore:ci-update-nightly-version
-
       - name: Run the TypeScript build
         run: pnpm run server:build
 

.github/workflows/nightly.yml

@@ -57,7 +57,7 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Update nightly version
-        run: pnpm run chore:ci-update-nightly-version
+        run: npm run chore:ci-update-nightly-version
       - name: Run the build
         uses: ./.github/actions/build-electron
         with:

_regroup/package.json

@@ -39,14 +39,14 @@
     "@stylistic/eslint-plugin": "5.5.0",        
     "@types/express": "5.0.5",    
     "@types/node": "24.10.1",    
-    "@types/yargs": "17.0.35",
+    "@types/yargs": "17.0.34",
     "@vitest/coverage-v8": "3.2.4",
     "eslint": "9.39.1",
     "eslint-plugin-simple-import-sort": "12.1.1",
     "esm": "3.2.25",
     "jsdoc": "4.0.5",
     "lorem-ipsum": "2.0.8",    
-    "rcedit": "5.0.1",
+    "rcedit": "5.0.0",
     "rimraf": "6.1.0",    
     "tslib": "2.8.1" 
   },

apps/client/package.json

@@ -25,7 +25,7 @@
     "@fullcalendar/timegrid": "6.1.19",
     "@maplibre/maplibre-gl-leaflet": "0.1.3",
     "@mermaid-js/layout-elk": "0.2.0",
-    "@mind-elixir/node-menu": "5.0.1",
+    "@mind-elixir/node-menu": "5.0.0",
     "@popperjs/core": "2.11.8",
     "@triliumnext/ckeditor5": "workspace:*",
     "@triliumnext/codemirror": "workspace:*",
@@ -36,7 +36,7 @@
     "autocomplete.js": "0.38.1",
     "bootstrap": "5.3.8",
     "boxicons": "2.1.4",
-    "color": "5.0.3",
+    "color": "5.0.2",
     "dayjs": "1.11.19",
     "dayjs-plugin-utc": "0.1.2",
     "debounce": "3.0.0",
@@ -59,7 +59,7 @@
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
     "preact": "10.27.2",
-    "react-i18next": "16.3.3",
+    "react-i18next": "16.3.1",
     "reveal.js": "5.2.1",
     "svg-pan-zoom": "3.6.2",
     "tabulator-tables": "6.3.1",

apps/client/src/entities/fnote.ts

@@ -257,9 +257,7 @@ export default class FNote {
     }
 
     async getChildNoteIdsWithArchiveFiltering(includeArchived = false) {
-        const isHiddenNote = this.noteId.startsWith("_");
+        if (!includeArchived) {
-        const isSearchNote = this.type === "search";
-        if (!includeArchived && !isHiddenNote && !isSearchNote) {
             const unorderedIds = new Set(await search.searchForNoteIds(`note.parents.noteId="${this.noteId}" #!archived`));
             const results: string[] = [];
             for (const id of this.children) {
@@ -806,16 +804,6 @@ export default class FNote {
         return this.getAttributeValue(LABEL, name);
     }
 
-    getLabelOrRelation(nameWithPrefix: string) {
-        if (nameWithPrefix.startsWith("#")) {
-            return this.getLabelValue(nameWithPrefix.substring(1));
-        } else if (nameWithPrefix.startsWith("~")) {
-            return this.getRelationValue(nameWithPrefix.substring(1));
-        } else {
-            return this.getLabelValue(nameWithPrefix);
-        }
-    }
-
     /**
      * @param name - relation name
      * @returns relation value if relation exists, null otherwise

apps/client/src/layouts/desktop_layout.tsx

@@ -31,6 +31,7 @@ import ScrollingContainer from "../widgets/containers/scrolling_container.js";
 import ScrollPadding from "../widgets/scroll_padding.js";
 import SearchResult from "../widgets/search_result.jsx";
 import SharedInfo from "../widgets/shared_info.jsx";
+import OriginInfo from "../widgets/note_origin.jsx";
 import SpacerWidget from "../widgets/spacer.js";
 import SplitNoteContainer from "../widgets/containers/split_note_container.js";
 import SqlResults from "../widgets/sql_result.js";
@@ -138,6 +139,7 @@ export default class DesktopLayout {
                                                                 .filling()
                                                                 .child(new ContentHeader()
                                                                     .child(<ReadOnlyNoteInfoBar />)
+                                                                    .child(<OriginInfo />)
                                                                     .child(<SharedInfo />)
                                                                 )
                                                                 .child(new PromotedAttributesWidget())

apps/client/src/services/attributes.ts

@@ -22,15 +22,6 @@ export async function setLabel(noteId: string, name: string, value: string = "",
     });
 }
 
-export async function setRelation(noteId: string, name: string, value: string = "", isInheritable = false) {
-    await server.put(`notes/${noteId}/set-attribute`, {
-        type: "relation",
-        name: name,
-        value: value,
-        isInheritable
-    });
-}
-
 async function removeAttributeById(noteId: string, attributeId: string) {
     await server.remove(`notes/${noteId}/attributes/${attributeId}`);
 }
@@ -60,23 +51,6 @@ function removeOwnedLabelByName(note: FNote, labelName: string) {
     return false;
 }
 
-/**
- * Removes a relation identified by its name from the given note, if it exists. Note that the relation must be owned, i.e.
- * it will not remove inherited attributes.
- *
- * @param note the note from which to remove the relation.
- * @param relationName the name of the relation to remove.
- * @returns `true` if an attribute was identified and removed, `false` otherwise.
- */
-function removeOwnedRelationByName(note: FNote, relationName: string) {
-    const relation = note.getOwnedRelation(relationName);
-    if (relation) {
-        removeAttributeById(note.noteId, relation.attributeId);
-        return true;
-    }
-    return false;
-}
-
 /**
  * Sets the attribute of the given note to the provided value if its truthy, or removes the attribute if the value is falsy.
  * For an attribute with an empty value, pass an empty string instead.
@@ -142,10 +116,8 @@ function isAffecting(attrRow: AttributeRow, affectedNote: FNote | null | undefin
 export default {
     addLabel,
     setLabel,
-    setRelation,
     setAttribute,
     removeAttributeById,
     removeOwnedLabelByName,
-    removeOwnedRelationByName,
     isAffecting
 };

apps/client/src/services/doc_renderer.ts

@@ -1,5 +1,4 @@
 import type FNote from "../entities/fnote.js";
-import { applyReferenceLinks } from "../widgets/type_widgets/text/read_only_helper.js";
 import { getCurrentLanguage } from "./i18n.js";
 import { formatCodeBlocks } from "./syntax_highlight.js";
 
@@ -11,18 +10,18 @@ export default function renderDoc(note: FNote) {
         if (docName) {
             // find doc based on language
             const url = getUrl(docName, getCurrentLanguage());
-            $content.load(url, async (response, status) => {
+            $content.load(url, (response, status) => {
                 // fallback to english doc if no translation available
                 if (status === "error") {
                     const fallbackUrl = getUrl(docName, "en");
-                    $content.load(fallbackUrl, async () => {
+                    $content.load(fallbackUrl, () => {
-                        await processContent(fallbackUrl, $content)
+                        processContent(fallbackUrl, $content)
                         resolve($content);
                     });
                     return;
                 }
 
-                await processContent(url, $content);
+                processContent(url, $content);
                 resolve($content);
             });
         } else {
@@ -33,7 +32,7 @@ export default function renderDoc(note: FNote) {
     });
 }
 
-async function processContent(url: string, $content: JQuery<HTMLElement>) {
+function processContent(url: string, $content: JQuery<HTMLElement>) {
     const dir = url.substring(0, url.lastIndexOf("/"));
 
     // Images are relative to the docnote but that will not work when rendered in the application since the path breaks.
@@ -43,9 +42,6 @@ async function processContent(url: string, $content: JQuery<HTMLElement>) {
     });
 
     formatCodeBlocks($content);
-
-    // Apply reference links.
-    await applyReferenceLinks($content[0]);
 }
 
 function getUrl(docNameValue: string, language: string) {

apps/client/src/services/keyboard_actions.ts

@@ -29,8 +29,6 @@ async function getActionsForScope(scope: string) {
 }
 
 async function setupActionsForElement(scope: string, $el: JQuery<HTMLElement>, component: Component) {
-    if (!$el[0]) return [];
-
     const actions = await getActionsForScope(scope);
     const bindings: ShortcutBinding[] = [];
 

apps/client/src/services/link.ts

@@ -150,16 +150,11 @@ async function createLink(notePath: string | undefined, options: CreateLinkOptio
     $container.append($noteLink);
 
     if (showNotePath) {
-        let pathSegments: string[];
-        if (notePath == "root") {
-            pathSegments = ["⌂"];
-        } else {
         const resolvedPathSegments = (await treeService.resolveNotePathToSegments(notePath)) || [];
         resolvedPathSegments.pop(); // Remove last element
 
         const resolvedPath = resolvedPathSegments.join("/");
-            pathSegments = await treeService.getNotePathTitleComponents(resolvedPath);
+        const pathSegments = await treeService.getNotePathTitleComponents(resolvedPath);
-        }
 
         if (pathSegments) {
             if (pathSegments.length) {
@@ -307,8 +302,7 @@ export function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDo
     // Right click is handled separately.
     const isMiddleClick = evt && "which" in evt && evt.which === 2;
     const targetIsBlank = ($link?.attr("target") === "_blank");
-    const isDoubleClick = isLeftClick && evt?.type === "dblclick";
+    const openInNewTab = (isLeftClick && ctrlKey) || isMiddleClick || targetIsBlank;
-    const openInNewTab = (isLeftClick && ctrlKey) || isDoubleClick || isMiddleClick || targetIsBlank;
     const activate = (isLeftClick && ctrlKey && shiftKey) || (isMiddleClick && shiftKey);
     const openInNewWindow = isLeftClick && evt?.shiftKey && !ctrlKey;
 
@@ -329,22 +323,20 @@ export function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDo
         const withinEditLink = $link?.hasClass("ck-link-actions__preview");
         const outsideOfCKEditor = !$link || $link.closest("[contenteditable]").length === 0;
 
-        if (openInNewTab || openInNewWindow || (isLeftClick && (withinEditLink || outsideOfCKEditor))) {
+        if (openInNewTab || (withinEditLink && (isLeftClick || isMiddleClick)) || (outsideOfCKEditor && (isLeftClick || isMiddleClick))) {
             if (hrefLink.toLowerCase().startsWith("http") || hrefLink.startsWith("api/")) {
                 window.open(hrefLink, "_blank");
+            } else if ((hrefLink.toLowerCase().startsWith("file:") || hrefLink.toLowerCase().startsWith("geo:")) && utils.isElectron()) {
+                const electron = utils.dynamicRequire("electron");
+                electron.shell.openPath(hrefLink);
             } else {
                 // Enable protocols supported by CKEditor 5 to be clickable.
                 if (ALLOWED_PROTOCOLS.some((protocol) => hrefLink.toLowerCase().startsWith(protocol + ":"))) {
-                    if ( utils.isElectron()) {
-                        const electron = utils.dynamicRequire("electron");
-                        electron.shell.openExternal(hrefLink);
-                    } else {
                     window.open(hrefLink, "_blank");
                 }
             }
         }
     }
-    }
 
     return true;
 }
@@ -476,9 +468,18 @@ $(document).on("auxclick", "a", goToLink); // to handle the middle button
 // TODO: Check why the event is not supported.
 //@ts-ignore
 $(document).on("contextmenu", "a", linkContextMenu);
-// TODO: Check why the event is not supported.
+$(document).on("dblclick", "a", (e) => {
-//@ts-ignore
+    e.preventDefault();
-$(document).on("dblclick", "a", goToLink);
+    e.stopPropagation();
+
+    const $link = $(e.target).closest("a");
+
+    const address = $link.attr("href");
+
+    if (address && address.startsWith("http")) {
+        window.open(address, "_blank");
+    }
+});
 
 $(document).on("mousedown", "a", (e) => {
     if (e.which === 2) {

apps/client/src/services/load_results.ts

@@ -1,21 +1,11 @@
-import type { AttachmentRow, EtapiTokenRow, NoteType, OptionNames } from "@triliumnext/commons";
+import type { AttachmentRow, EtapiTokenRow, OptionNames } from "@triliumnext/commons";
 import type { AttributeType } from "../entities/fattribute.js";
 import type { EntityChange } from "../server_types.js";
 
 // TODO: Deduplicate with server.
 
 interface NoteRow {
-    blobId: string;
-    dateCreated: string;
-    dateModified: string;
     isDeleted?: boolean;
-    isProtected?: boolean;
-    mime: string;
-    noteId: string;
-    title: string;
-    type: NoteType;
-    utcDateCreated: string;
-    utcDateModified: string;
 }
 
 // TODO: Deduplicate with BranchRow from `rows.ts`/

apps/client/src/services/toast.ts

@@ -77,11 +77,11 @@ function closePersistent(id: string) {
     $(`#toast-${id}`).remove();
 }
 
-function showMessage(message: string, delay = 2000, icon = "check") {
+function showMessage(message: string, delay = 2000) {
     console.debug(utils.now(), "message:", message);
 
     toast({
-        icon,
+        icon: "check",
         message: message,
         autohide: true,
         delay

apps/client/src/stylesheets/theme-next/shell.css

@@ -16,10 +16,6 @@
     background-color: var(--root-background);
 }
 
-body.mobile #root-widget {
-    background-color: var(--main-background-color);
-}
-
 body {
     --native-titlebar-darwin-x-offset: 10;
     --native-titlebar-darwin-y-offset: 12 !important;

apps/client/src/translations/ar/translation.json

@@ -512,7 +512,7 @@
     "title": "الملاحظات المعدلة"
   },
   "note_properties": {
-    "info": "معلومات"
+    "this_note_was_originally_taken_from": ""
   },
   "backend_log": {
     "refresh": "تحديث"

apps/client/src/translations/cn/translation.json

@@ -837,8 +837,7 @@
     "search": "搜索"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "笔记来源:",
+    "this_note_was_originally_taken_from": "笔记来源:"
-    "info": "信息"
   },
   "owned_attribute_list": {
     "owned_attributes": "拥有的属性"

apps/client/src/translations/de/translation.json

@@ -830,8 +830,7 @@
     "search": "Suchen"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Diese Notiz stammt ursprünglich aus:",
+    "this_note_was_originally_taken_from": "Diese Notiz stammt ursprünglich aus:"
-    "info": "Info"
   },
   "owned_attribute_list": {
     "owned_attributes": "Eigene Attribute"

apps/client/src/translations/en/translation.json

@@ -837,8 +837,7 @@
     "search": "Search"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "This note was originally taken from:",
+    "this_note_was_originally_taken_from": "This note was originally taken from:"
-    "info": "Info"
   },
   "owned_attribute_list": {
     "owned_attributes": "Owned Attributes"
@@ -2035,8 +2034,7 @@
     "add-column": "Add Column",
     "add-column-placeholder": "Enter column name...",
     "edit-note-title": "Click to edit note title",
-    "edit-column-title": "Click to edit column title",
+    "edit-column-title": "Click to edit column title"
-    "column-already-exists": "This column already exists on the board."
   },
   "presentation_view": {
     "edit-slide": "Edit this slide",

apps/client/src/translations/es/translation.json

@@ -836,8 +836,7 @@
     "search": "Buscar"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Esta nota fue tomada originalmente de:",
+    "this_note_was_originally_taken_from": "Esta nota fue tomada originalmente de:"
-    "info": "Información"
   },
   "owned_attribute_list": {
     "owned_attributes": "Atributos propios"

apps/client/src/translations/fr/translation.json

@@ -832,8 +832,7 @@
     "search": "Recherche"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Cette note est initialement extraite de :",
+    "this_note_was_originally_taken_from": "Cette note est initialement extraite de :"
-    "info": "Infos"
   },
   "owned_attribute_list": {
     "owned_attributes": "Attributs propres"

apps/client/src/translations/it/translation.json

@@ -1408,8 +1408,7 @@
     "search": "Ricerca"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Questa nota è stata originariamente tratta da:",
+    "this_note_was_originally_taken_from": "Questa nota è stata originariamente tratta da:"
-    "info": "Informazioni"
   },
   "owned_attribute_list": {
     "owned_attributes": "Attributi posseduti"

apps/client/src/translations/ja/translation.json

@@ -688,7 +688,6 @@
     "outside_hoisted": "このパスはホイストされたノートの外側にあるため、ホイストを解除する必要があります。"
   },
   "note_properties": {
-    "info": "情報",
     "this_note_was_originally_taken_from": "このノートは元々以下から引用したものです:"
   },
   "similar_notes": {

apps/client/src/translations/pl/translation.json

@@ -448,8 +448,7 @@
     "search": "Szukaj"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Ta notatka oryginalnie została wzięta z:",
+    "this_note_was_originally_taken_from": "Ta notatka oryginalnie została wzięta z:"
-    "info": "Info"
   },
   "owned_attribute_list": {
     "owned_attributes": "Posiadane atrybuty"

apps/client/src/translations/pt/translation.json

@@ -810,8 +810,7 @@
     "search": "Pesquisar"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:",
+    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:"
-    "info": "Informações"
   },
   "owned_attribute_list": {
     "owned_attributes": "Atributos próprios"

apps/client/src/translations/pt_br/translation.json

@@ -1076,8 +1076,7 @@
     "outside_hoisted": "Este caminho está fora de uma nota fixada e você teria que desafixar."
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:",
+    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:"
-    "info": "Informações"
   },
   "promoted_attributes": {
     "promoted_attributes": "Atributos Promovidos",

apps/client/src/translations/ro/translation.json

@@ -897,7 +897,6 @@
     "title": "Căile notiței"
   },
   "note_properties": {
-    "info": "Informații",
     "this_note_was_originally_taken_from": "Această notiță a fost preluată original de la:"
   },
   "note_type_chooser": {

apps/client/src/translations/ru/translation.json

@@ -1067,7 +1067,6 @@
     "archived": "Архивировано"
   },
   "note_properties": {
-    "info": "Информация",
     "this_note_was_originally_taken_from": "Эта заметка была первоначально взята из:"
   },
   "promoted_attributes": {

apps/client/src/translations/tw/translation.json

@@ -834,8 +834,7 @@
     "search": "搜尋"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "筆記來源：",
+    "this_note_was_originally_taken_from": "筆記來源："
-    "info": "資訊"
   },
   "owned_attribute_list": {
     "owned_attributes": "自有屬性"

apps/client/src/translations/uk/translation.json

@@ -939,8 +939,7 @@
     "outside_hoisted": "Цей шлях знаходиться поза межами закріпленої нотатки і вам доведеться відкріпити."
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Цю нотатку було спочатку взято з:",
+    "this_note_was_originally_taken_from": "Цю нотатку було спочатку взято з:"
-    "info": "Інформація"
   },
   "owned_attribute_list": {
     "owned_attributes": "Власні Атрибути"

apps/client/src/widgets/attribute_widgets/PromotedAttributesDisplay.css

@@ -1,4 +1,4 @@
-.user-attributes {
+.promoted-attributes {
     display: flex;
     flex-wrap: wrap;
     gap: 8px;
@@ -6,7 +6,7 @@
     margin-top: 8px;
 }
 
-.user-attributes .user-attribute {
+.promoted-attributes .promoted-attribute {
     padding: 2px 10px;
     border-radius: 9999px;
     white-space: nowrap;
@@ -17,15 +17,15 @@
     line-height: 1.2;
 }
 
-.user-attributes .user-attribute:hover {
+.promoted-attributes .promoted-attribute:hover {
     background-color: var(--chip-bg-hover, rgba(0, 0, 0, 0.12));
     border-color: var(--chip-border-hover, rgba(0, 0, 0, 0.22));
 }
 
-.user-attributes .user-attribute .name {
+.promoted-attributes .promoted-attribute .name {
     font-weight: 600;
 }
 
-.user-attributes .user-attribute .value {
+.promoted-attributes .promoted-attribute .value {
     opacity: 0.9;
 }

apps/client/src/widgets/attribute_widgets/PromotedAttributesDisplay.tsx

@@ -1,16 +1,16 @@
 import { useState } from "preact/hooks";
 import FNote from "../../entities/fnote";
-import "./UserAttributesList.css";
+import "./PromotedAttributesDisplay.css";
 import { useTriliumEvent } from "../react/hooks";
 import attributes from "../../services/attributes";
 import { DefinitionObject } from "../../services/promoted_attribute_definition_parser";
 import { formatDateTime } from "../../utils/formatters";
-import { ComponentChildren, CSSProperties } from "preact";
+import { ComponentChild, ComponentChildren, CSSProperties } from "preact";
 import Icon from "../react/Icon";
 import NoteLink from "../react/NoteLink";
 import { getReadableTextColor } from "../../services/css_class_manager";
 
-interface UserAttributesListProps {
+interface PromotedAttributesDisplayProps {
     note: FNote;
     ignoredAttributes?: string[];
 }
@@ -23,39 +23,39 @@ interface AttributeWithDefinitions {
     def: DefinitionObject;
 }
 
-export default function UserAttributesDisplay({ note, ignoredAttributes }: UserAttributesListProps) {
+export default function PromotedAttributesDisplay({ note, ignoredAttributes }: PromotedAttributesDisplayProps) {
-    const userAttributes = useNoteAttributesWithDefinitions(note, ignoredAttributes);
+    const promotedDefinitionAttributes = useNoteAttributesWithDefinitions(note, ignoredAttributes);
-    return userAttributes?.length > 0 && (
+    return promotedDefinitionAttributes?.length > 0 && (
-        <div className="user-attributes">
+        <div className="promoted-attributes">
-            {userAttributes?.map(attr => buildUserAttribute(attr))}
+            {promotedDefinitionAttributes?.map(attr => buildPromotedAttribute(attr))}
         </div>
     )
 
 }
 
 function useNoteAttributesWithDefinitions(note: FNote, attributesToIgnore:  string[] = []): AttributeWithDefinitions[] {
-    const [ userAttributes, setUserAttributes ] = useState<AttributeWithDefinitions[]>(getAttributesWithDefinitions(note, attributesToIgnore));
+    const [ promotedDefinitionAttributes, setPromotedDefinitionAttributes ] = useState<AttributeWithDefinitions[]>(getAttributesWithDefinitions(note, attributesToIgnore));
 
     useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
         if (loadResults.getAttributeRows().some(attr => attributes.isAffecting(attr, note))) {
-            setUserAttributes(getAttributesWithDefinitions(note, attributesToIgnore));
+            setPromotedDefinitionAttributes(getAttributesWithDefinitions(note, attributesToIgnore));
         }
     });
 
-    return userAttributes;
+    return promotedDefinitionAttributes;
 }
 
-function UserAttribute({ attr, children, style }: { attr: AttributeWithDefinitions, children: ComponentChildren, style?: CSSProperties }) {
+function PromotedAttribute({ attr, children, style }: { attr: AttributeWithDefinitions, children: ComponentChildren, style?: CSSProperties }) {
     const className = `${attr.type === "label" ? "label" + " " + attr.def.labelType : "relation"}`;
 
     return (
-        <span key={attr.friendlyName} className={`user-attribute type-${className}`} style={style}>
+        <span key={attr.friendlyName} className={`promoted-attribute type-${className}`} style={style}>
             {children}
         </span>
     )
 }
 
-function buildUserAttribute(attr: AttributeWithDefinitions): ComponentChildren {
+function buildPromotedAttribute(attr: AttributeWithDefinitions): ComponentChildren {
     const defaultLabel = <><strong>{attr.friendlyName}:</strong>{" "}</>;
     let content: ComponentChildren;
     let style: CSSProperties | undefined;
@@ -102,13 +102,13 @@ function buildUserAttribute(attr: AttributeWithDefinitions): ComponentChildren {
         content = <>{defaultLabel}<NoteLink notePath={attr.value} showNoteIcon /></>;
     }
 
-    return <UserAttribute attr={attr} style={style}>{content}</UserAttribute>
+    return <PromotedAttribute attr={attr} style={style}>{content}</PromotedAttribute>
 }
 
 function getAttributesWithDefinitions(note: FNote, attributesToIgnore: string[] = []): AttributeWithDefinitions[] {
-    const attributeDefintions = note.getAttributeDefinitions();
+    const promotedDefinitionAttributes = note.getAttributeDefinitions();
     const result: AttributeWithDefinitions[] = [];
-    for (const attr of attributeDefintions) {
+    for (const attr of promotedDefinitionAttributes) {
         const def = attr.getDefinition();
         const [ type, name ] = attr.name.split(":", 2);
         const friendlyName = def?.promotedAlias || name;

apps/client/src/widgets/buttons/close_pane_button.tsx

@@ -1,20 +1,18 @@
 import { useEffect, useState } from "preact/hooks";
 import { t } from "../../services/i18n";
 import ActionButton from "../react/ActionButton";
-import { useNoteContext, useTriliumEvents } from "../react/hooks";
+import { useNoteContext, useTriliumEvent } from "../react/hooks";
-import appContext from "../../components/app_context";
 
 export default function ClosePaneButton() {
     const { noteContext, ntxId, parentComponent } = useNoteContext();
-    const [isEnabled, setIsEnabled] = useState(false);
+    const [ isEnabled, setIsEnabled ] = useState(false);
 
     function refresh() {
-        const isMainOfSomeContext = appContext.tabManager.noteContexts.some(c => c.mainNtxId === ntxId);
+        setIsEnabled(!!(noteContext && !!noteContext.mainNtxId));
-        setIsEnabled(!!(noteContext && (!!noteContext.mainNtxId || isMainOfSomeContext)));
     }
 
-    useTriliumEvents(["noteContextRemoved", "noteContextReorder", "newNoteContextCreated"], refresh);
+    useTriliumEvent("noteContextReorder", refresh);
-    useEffect(refresh, [ntxId]);
+    useEffect(refresh, [ ntxId ]);
 
     return (
         <ActionButton

apps/client/src/widgets/collections/NoteList.tsx

@@ -77,8 +77,8 @@ export function CustomNoteList<T extends object>({ note, isEnabled: shouldEnable
         props = {
             note, noteIds, notePath,
             highlightedTokens,
-            viewConfig: viewModeConfig.config,
+            viewConfig: viewModeConfig[0],
-            saveConfig: viewModeConfig.storeFn,
+            saveConfig: viewModeConfig[1],
             onReady: onReady ?? (() => {}),
             ...restProps
         }
@@ -192,11 +192,7 @@ export function useNoteIds(note: FNote | null | undefined, viewType: ViewTypeOpt
 }
 
 export function useViewModeConfig<T extends object>(note: FNote | null | undefined, viewType: ViewTypeOptions | undefined) {
-    const [ viewConfig, setViewConfig ] = useState<{
+    const [ viewConfig, setViewConfig ] = useState<[T | undefined, (data: T) => void]>();
-        config: T | undefined;
-        storeFn: (data: T) => void;
-        note: FNote;
-    }>();
 
     useEffect(() => {
         if (!note || !viewType) return;
@@ -204,14 +200,12 @@ export function useViewModeConfig<T extends object>(note: FNote | null | undefin
         const viewStorage = new ViewModeStorage<T>(note, viewType);
         viewStorage.restore().then(config => {
             const storeFn = (config: T) => {
-                setViewConfig({ note, config, storeFn });
+                setViewConfig([ config, storeFn ]);
                 viewStorage.store(config);
             };
-            setViewConfig({ note, config, storeFn });
+            setViewConfig([ config, storeFn ]);
         });
     }, [ note, viewType ]);
 
-    // Only expose config for the current note, avoid leaking notes when switching between them.
-    if (viewConfig?.note !== note) return undefined;
     return viewConfig;
 }

apps/client/src/widgets/collections/board/api.ts

@@ -1,4 +1,3 @@
-import { BulkAction } from "@triliumnext/commons";
 import { BoardViewData } from ".";
 import appContext from "../../../components/app_context";
 import FNote from "../../../entities/fnote";
@@ -13,25 +12,15 @@ import { ColumnMap } from "./data";
 
 export default class BoardApi {
 
-    private isRelationMode: boolean;
-    statusAttribute: string;
-
     constructor(
         private byColumn: ColumnMap | undefined,
         public columns: string[],
         private parentNote: FNote,
-        statusAttribute: string,
+        readonly statusAttribute: string,
         private viewConfig: BoardViewData,
         private saveConfig: (newConfig: BoardViewData) => void,
         private setBranchIdToEdit: (branchId: string | undefined) => void
-    ) {
+    ) {};
-        this.isRelationMode = statusAttribute.startsWith("~");
-
-        if (statusAttribute.startsWith("~") || statusAttribute.startsWith("#")) {
-            statusAttribute = statusAttribute.substring(1);
-        }
-        this.statusAttribute = statusAttribute;
-    };
 
     async createNewItem(column: string, title: string) {
         try {
@@ -53,12 +42,8 @@ export default class BoardApi {
     }
 
     async changeColumn(noteId: string, newColumn: string) {
-        if (this.isRelationMode) {
-            await attributes.setRelation(noteId, this.statusAttribute, newColumn);
-        } else {
         await attributes.setLabel(noteId, this.statusAttribute, newColumn);
     }
-    }
 
     async addNewColumn(columnName: string) {
         if (!columnName.trim()) {
@@ -75,20 +60,22 @@ export default class BoardApi {
 
         // Add the new column to persisted data if it doesn't exist
         const existingColumn = this.viewConfig.columns.find(col => col.value === columnName);
-        if (existingColumn) return false;
+        if (!existingColumn) {
             this.viewConfig.columns.push({ value: columnName });
             this.saveConfig(this.viewConfig);
-        return true;
+        }
     }
 
     async removeColumn(column: string) {
         // Remove the value from the notes.
         const noteIds = this.byColumn?.get(column)?.map(item => item.note.noteId) || [];
+        await executeBulkActions(noteIds, [
+            {
+                name: "deleteLabel",
+                labelName: this.statusAttribute
+            }
+        ]);
 
-        const action: BulkAction = this.isRelationMode
-            ? { name: "deleteRelation", relationName: this.statusAttribute }
-            : { name: "deleteLabel", labelName: this.statusAttribute }
-        await executeBulkActions(noteIds, [ action ]);
         this.viewConfig.columns = (this.viewConfig.columns ?? []).filter(col => col.value !== column);
         this.saveConfig(this.viewConfig);
     }
@@ -97,10 +84,13 @@ export default class BoardApi {
         const noteIds = this.byColumn?.get(oldValue)?.map(item => item.note.noteId) || [];
 
         // Change the value in the notes.
-        const action: BulkAction = this.isRelationMode
+        await executeBulkActions(noteIds, [
-            ? { name: "updateRelationTarget", relationName: this.statusAttribute, targetNoteId: newValue }
+            {
-            : { name: "updateLabelValue", labelName: this.statusAttribute, labelValue: newValue }
+                name: "updateLabelValue",
-        await executeBulkActions(noteIds, [ action ]);
+                labelName: this.statusAttribute,
+                labelValue: newValue
+            }
+        ]);
 
         // Rename the column in the persisted data.
         for (const column of this.viewConfig.columns || []) {
@@ -177,12 +167,8 @@ export default class BoardApi {
     removeFromBoard(noteId: string) {
         const note = froca.getNoteFromCache(noteId);
         if (!note) return;
-        if (this.isRelationMode) {
-            return attributes.removeOwnedRelationByName(note, this.statusAttribute);
-        } else {
         return attributes.removeOwnedLabelByName(note, this.statusAttribute);
     }
-    }
 
     async moveWithinBoard(noteId: string, sourceBranchId: string, sourceIndex: number, targetIndex: number, sourceColumn: string, targetColumn: string) {
         const targetItems = this.byColumn?.get(targetColumn) ?? [];

apps/client/src/widgets/collections/board/card.tsx

@@ -6,8 +6,7 @@ import { BoardViewContext, TitleEditor } from ".";
 import { ContextMenuEvent } from "../../../menus/context_menu";
 import { openNoteContextMenu } from "./context_menu";
 import { t } from "../../../services/i18n";
-import UserAttributesDisplay from "../../attribute_widgets/UserAttributesList";
+import PromotedAttributesDisplay from "../../attribute_widgets/PromotedAttributesDisplay";
-import { useTriliumEvent } from "../../react/hooks";
 
 export const CARD_CLIPBOARD_TYPE = "trilium/board-card";
 
@@ -41,13 +40,6 @@ export default function Card({
     const [ isVisible, setVisible ] = useState(true);
     const [ title, setTitle ] = useState(note.title);
 
-    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
-        const row = loadResults.getEntityRow("notes", note.noteId);
-        if (row) {
-            setTitle(row.title);
-        }
-    });
-
     const handleDragStart = useCallback((e: DragEvent) => {
         e.dataTransfer!.effectAllowed = 'move';
         const data: CardDragData = { noteId: note.noteId, branchId: branch.branchId, fromColumn: column, index };
@@ -117,7 +109,7 @@ export default function Card({
                         title={t("board_view.edit-note-title")}
                         onClick={handleEdit}
                     />
-                    <UserAttributesDisplay note={note} ignoredAttributes={[api.statusAttribute]} />
+                    <PromotedAttributesDisplay note={note} ignoredAttributes={[api.statusAttribute]} />
                 </>
             ) : (
                 <TitleEditor
@@ -127,7 +119,7 @@ export default function Card({
                         setTitle(newTitle);
                     }}
                     dismiss={() => api.dismissEditingTitle()}
-                    mode="multiline"
+                    multiline
                 />
             )}
         </div>

apps/client/src/widgets/collections/board/column.tsx

@@ -12,7 +12,6 @@ import Card, { CARD_CLIPBOARD_TYPE, CardDragData } from "./card";
 import { JSX } from "preact/jsx-runtime";
 import froca from "../../../services/froca";
 import { DragData, TREE_CLIPBOARD_TYPE } from "../../note_tree";
-import NoteLink from "../../react/NoteLink";
 
 interface DragContext {
     column: string;
@@ -28,14 +27,12 @@ export default function Column({
     api,
     onColumnHover,
     isAnyColumnDragging,
-    isInRelationMode
 }: {
     columnItems?: { note: FNote, branch: FBranch }[];
     isDraggingColumn: boolean,
     api: BoardApi,
     onColumnHover?: (index: number, mouseX: number, rect: DOMRect) => void,
-    isAnyColumnDragging?: boolean,
+    isAnyColumnDragging?: boolean
-    isInRelationMode: boolean
 } & DragContext) {
     const [ isVisible, setVisible ] = useState(true);
     const { columnNameToEdit, setColumnNameToEdit, dropTarget, draggedCard, dropPosition } = useContext(BoardViewContext)!;
@@ -106,11 +103,7 @@ export default function Column({
             >
                 {!isEditing ? (
                     <>
-                        <span className="title">
+                        <span className="title">{column}</span>
-                            {isInRelationMode
-                            ? <NoteLink notePath={column} showNoteIcon />
-                            : column}
-                        </span>
                         <span className="counter-badge">{columnItems?.length ?? 0}</span>
                         <div className="spacer" />
                         <span
@@ -124,7 +117,6 @@ export default function Column({
                         currentValue={column}
                         save={newTitle => api.renameColumn(column, newTitle)}
                         dismiss={() => setColumnNameToEdit?.(undefined)}
-                        mode={isInRelationMode ? "relation" : "normal"}
                     />
                 )}
             </h3>
@@ -188,7 +180,7 @@ function AddNewItem({ column, api }: { column: string, api: BoardApi }) {
                     placeholder={t("board_view.new-item-placeholder")}
                     save={(title) => api.createNewItem(column, title)}
                     dismiss={() => setIsCreatingNewItem(false)}
-                    mode="multiline" isNewItem
+                    multiline isNewItem
                 />
             )}
         </div>

apps/client/src/widgets/collections/board/data.ts

@@ -57,8 +57,7 @@ export async function getBoardData(parentNote: FNote, groupByColumn: string, per
 
     return {
         byColumn,
-        newPersistedData,
+        newPersistedData
-        isInRelationMode: groupByColumn.startsWith("~")
     };
 }
 
@@ -71,7 +70,7 @@ async function recursiveGroupBy(branches: FBranch[], byColumn: ColumnMap, groupB
             await recursiveGroupBy(note.getChildBranches(), byColumn, groupByColumn, includeArchived, seenNoteIds);
         }
 
-        const group = note.getLabelOrRelation(groupByColumn);
+        const group = note.getLabelValue(groupByColumn);
         if (!group || seenNoteIds.has(note.noteId)) {
             continue;
         }

apps/client/src/widgets/collections/board/index.css

@@ -9,12 +9,6 @@
   --card-padding: 0.6em;
 }
 
-body.mobile .board-view {
-  scroll-snap-type: x mandatory;
-  -webkit-overflow-scrolling: touch;
-  scroll-behavior: smooth;
-}
-
 .board-view-container {
   height: 100%;
   display: flex;
@@ -37,12 +31,6 @@ body.mobile .board-view {
   flex-direction: column;
 }
 
-body.mobile .board-view-container .board-column {
-  width: 75vw;
-  max-width: 300px;
-  scroll-snap-align: center;
-}
-
 .board-view-container .board-column.drag-over {
   border-color: var(--main-text-color);
   background-color: var(--hover-item-background-color);
@@ -65,11 +53,6 @@ body.mobile .board-view-container .board-column {
   align-items: center;
 }
 
-.board-view-container .board-column h3 a {
-  text-decoration: none;
-  color: inherit;
-}
-
 .board-view-container .board-column h3 .counter-badge {
   background-color: var(--muted-text-color);
   color: var(--main-background-color);

apps/client/src/widgets/collections/board/index.tsx

@@ -13,8 +13,6 @@ import Column from "./column";
 import BoardApi from "./api";
 import FormTextArea from "../../react/FormTextArea";
 import FNote from "../../../entities/fnote";
-import NoteAutocomplete from "../../react/NoteAutocomplete";
-import toast from "../../../services/toast";
 
 export interface BoardViewData {
     columns?: BoardColumnData[];
@@ -44,11 +42,10 @@ interface BoardViewContextData {
 export const BoardViewContext = createContext<BoardViewContextData | undefined>(undefined);
 
 export default function BoardView({ note: parentNote, noteIds, viewConfig, saveConfig }: ViewModeProps<BoardViewData>) {
-    const [ statusAttributeWithPrefix ] = useNoteLabelWithDefault(parentNote, "board:groupBy", "status");
+    const [ statusAttribute ] = useNoteLabelWithDefault(parentNote, "board:groupBy", "status");
     const [ includeArchived ] = useNoteLabelBoolean(parentNote, "includeArchived");
     const [ byColumn, setByColumn ] = useState<ColumnMap>();
     const [ columns, setColumns ] = useState<string[]>();
-    const [ isInRelationMode, setIsRelationMode ] = useState(false);
     const [ draggedCard, setDraggedCard ] = useState<{ noteId: string, branchId: string, fromColumn: string, index: number } | null>(null);
     const [ dropTarget, setDropTarget ] = useState<string | null>(null);
     const [ dropPosition, setDropPosition ] = useState<{ column: string, index: number } | null>(null);
@@ -58,8 +55,8 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
     const [ branchIdToEdit, setBranchIdToEdit ] = useState<string>();
     const [ columnNameToEdit, setColumnNameToEdit ] = useState<string>();
     const api = useMemo(() => {
-        return new Api(byColumn, columns ?? [], parentNote, statusAttributeWithPrefix, viewConfig ?? {}, saveConfig, setBranchIdToEdit );
+        return new Api(byColumn, columns ?? [], parentNote, statusAttribute, viewConfig ?? {}, saveConfig, setBranchIdToEdit );
-    }, [ byColumn, columns, parentNote, statusAttributeWithPrefix, viewConfig, saveConfig, setBranchIdToEdit ]);
+    }, [ byColumn, columns, parentNote, statusAttribute, viewConfig, saveConfig, setBranchIdToEdit ]);
     const boardViewContext = useMemo<BoardViewContextData>(() => ({
         api,
         parentNote,
@@ -81,9 +78,8 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
     ]);
 
     function refresh() {
-        getBoardData(parentNote, statusAttributeWithPrefix, viewConfig ?? {}, includeArchived).then(({ byColumn, newPersistedData, isInRelationMode }) => {
+        getBoardData(parentNote, statusAttribute, viewConfig ?? {}, includeArchived).then(({ byColumn, newPersistedData }) => {
             setByColumn(byColumn);
-            setIsRelationMode(isInRelationMode);
 
             if (newPersistedData) {
                 viewConfig = { ...newPersistedData };
@@ -98,7 +94,7 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
         });
     }
 
-    useEffect(refresh, [ parentNote, noteIds, viewConfig, statusAttributeWithPrefix ]);
+    useEffect(refresh, [ parentNote, noteIds, viewConfig ]);
 
     const handleColumnDrop = useCallback((fromIndex: number, toIndex: number) => {
         const newColumns = api.reorderColumn(fromIndex, toIndex);
@@ -114,7 +110,7 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
         // Check if any changes affect our board
         const hasRelevantChanges =
             // React to changes in status attribute for notes in this board
-            loadResults.getAttributeRows().some(attr => attr.name === api.statusAttribute && noteIds.includes(attr.noteId!)) ||
+            loadResults.getAttributeRows().some(attr => attr.name === statusAttribute && noteIds.includes(attr.noteId!)) ||
             // React to changes in note title
             loadResults.getNoteIds().some(noteId => noteIds.includes(noteId)) ||
             // React to changes in branches for subchildren (e.g., moved, added, or removed notes)
@@ -175,7 +171,6 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
                                 <div className="column-drop-placeholder show" />
                             )}
                             <Column
-                                isInRelationMode={isInRelationMode}
                                 api={api}
                                 column={column}
                                 columnIndex={index}
@@ -190,14 +185,14 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
                         <div className="column-drop-placeholder show" />
                     )}
 
-                    <AddNewColumn api={api} isInRelationMode={isInRelationMode} />
+                    <AddNewColumn api={api} />
                 </div>
             </BoardViewContext.Provider>
         </div>
     )
 }
 
-function AddNewColumn({ api, isInRelationMode }: { api: BoardApi, isInRelationMode: boolean }) {
+function AddNewColumn({ api }: { api: BoardApi }) {
     const [ isCreatingNewColumn, setIsCreatingNewColumn ] = useState(false);
 
     const addColumnCallback = useCallback(() => {
@@ -214,28 +209,22 @@ function AddNewColumn({ api, isInRelationMode }: { api: BoardApi, isInRelationMo
             : (
                 <TitleEditor
                     placeholder={t("board_view.add-column-placeholder")}
-                    save={async (columnName) => {
+                    save={(columnName) => api.addNewColumn(columnName)}
-                        const created = await api.addNewColumn(columnName);
-                        if (!created) {
-                            toast.showMessage(t("board_view.column-already-exists"), undefined, "bx bx-duplicate");
-                        }
-                    }}
                     dismiss={() => setIsCreatingNewColumn(false)}
                     isNewItem
-                    mode={isInRelationMode ? "relation" : "normal"}
                 />
             )}
         </div>
     )
 }
 
-export function TitleEditor({ currentValue, placeholder, save, dismiss, mode, isNewItem }: {
+export function TitleEditor({ currentValue, placeholder, save, dismiss, multiline, isNewItem }: {
     currentValue?: string;
     placeholder?: string;
     save: (newValue: string) => void;
     dismiss: () => void;
+    multiline?: boolean;
     isNewItem?: boolean;
-    mode?: "normal" | "multiline" | "relation";
 }) {
     const inputRef = useRef<any>(null);
     const focusElRef = useRef<Element>(null);
@@ -243,11 +232,13 @@ export function TitleEditor({ currentValue, placeholder, save, dismiss, mode, is
     const shouldDismiss = useRef(false);
 
     useEffect(() => {
-        focusElRef.current = document.activeElement !== document.body ? document.activeElement : null;
+        focusElRef.current = document.activeElement;
         inputRef.current?.focus();
         inputRef.current?.select();
     }, [ inputRef ]);
 
+    const Element = multiline ? FormTextArea : FormTextBox;
+
     useEffect(() => {
         if (dismissOnNextRefreshRef.current) {
             dismiss();
@@ -255,62 +246,31 @@ export function TitleEditor({ currentValue, placeholder, save, dismiss, mode, is
         }
     });
 
-    const onKeyDown = (e: TargetedKeyboardEvent<HTMLInputElement | HTMLTextAreaElement> | KeyboardEvent) => {
-        if (e.key === "Enter" || e.key === "Escape") {
-            e.preventDefault();
-            e.stopPropagation();
-            if (focusElRef.current instanceof HTMLElement) {
-                shouldDismiss.current = (e.key === "Escape");
-                focusElRef.current.focus();
-            } else {
-                dismiss();
-            }
-        }
-    };
-
-    const onBlur = (newValue: string) => {
-        if (!shouldDismiss.current && newValue.trim() && (newValue !== currentValue || isNewItem)) {
-            save(newValue);
-            dismissOnNextRefreshRef.current = true;
-        } else {
-            dismiss();
-        }
-    };
-
-    if (mode !== "relation") {
-        const Element = mode === "multiline" ? FormTextArea : FormTextBox;
-
     return (
         <Element
             inputRef={inputRef}
             currentValue={currentValue ?? ""}
             placeholder={placeholder}
             autoComplete="trilium-title-entry" // forces the auto-fill off better than the "off" value.
-                rows={mode === "multiline" ? 4 : undefined}
+            rows={multiline ? 4 : undefined}
-                onKeyDown={onKeyDown}
+            onKeyDown={(e: TargetedKeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => {
-                onBlur={onBlur}
+                if (e.key === "Enter" || e.key === "Escape") {
-            />
+                    e.preventDefault();
-        );
+                    e.stopPropagation();
-    } else {
+                    shouldDismiss.current = (e.key === "Escape");
-        return (
+                    if (focusElRef.current instanceof HTMLElement) {
-            <NoteAutocomplete
+                        focusElRef.current.focus();
-                inputRef={inputRef}
+                    }
-                noteId={currentValue ?? ""}
-                opts={{
-                    hideAllButtons: true,
-                    allowCreatingNotes: true
-                }}
-                onKeyDown={(e) => {
-                    if (e.key === "Escape") {
-                        dismiss();
                 }
             }}
-                onBlur={() => dismiss()}
+            onBlur={(newValue) => {
-                noteIdChanged={(newValue) => {
+                if (!shouldDismiss.current && newValue.trim() && (newValue !== currentValue || isNewItem)) {
                     save(newValue);
+                    dismissOnNextRefreshRef.current = true;
+                } else {
                     dismiss();
+                }
             }}
         />
     );
-    }
 }

apps/client/src/widgets/collections/calendar/context_menu.ts

@@ -2,7 +2,6 @@ import FNote from "../../../entities/fnote";
 import contextMenu, { ContextMenuEvent } from "../../../menus/context_menu";
 import link_context_menu from "../../../menus/link_context_menu";
 import branches from "../../../services/branches";
-import froca from "../../../services/froca";
 import { t } from "../../../services/i18n";
 
 export function openCalendarContextMenu(e: ContextMenuEvent, noteId: string, parentNote: FNote) {
@@ -19,20 +18,8 @@ export function openCalendarContextMenu(e: ContextMenuEvent, noteId: string, par
                 title: t("calendar_view.delete_note"),
                 uiIcon: "bx bx-trash",
                 handler: async () => {
-                    const noteToDelete = await froca.getNote(noteId);
+                    const branchId = parentNote.childToBranch[noteId];
-                    if (!noteToDelete) return;
+                    await branches.deleteNotes([ branchId ], false, false);
-
-                    let branchIdToDelete: string | null = null;
-                    for (const parentBranch of noteToDelete.getParentBranches()) {
-                        const parentNote = await parentBranch.getNote();
-                        if (parentNote?.hasAncestor(parentNote.noteId)) {
-                            branchIdToDelete = parentBranch.branchId;
-                        }
-                    }
-
-                    if (branchIdToDelete) {
-                        await branches.deleteNotes([ branchIdToDelete ], false, false);
-                    }
                 }
             }
         ],

apps/client/src/widgets/containers/split_note_container.ts

@@ -100,24 +100,10 @@ export default class SplitNoteContainer extends FlexContainer<SplitNoteWidget> {
     }
 
     async closeThisNoteSplitCommand({ ntxId }: CommandListenerData<"closeThisNoteSplit">) {
-        if (!ntxId) return;
+        if (ntxId) {
-        const contexts = appContext.tabManager.noteContexts;
-
-        const currentIndex = contexts.findIndex((c) => c.ntxId === ntxId);
-        if (currentIndex === -1) return;
-
-        const isRemoveMainContext = !contexts[currentIndex].mainNtxId;
-        if (isRemoveMainContext && currentIndex + 1 <= contexts.length) {
-            const ntxIds = contexts.map((c) => c.ntxId).filter((c) => !!c) as string[];
-            this.triggerCommand("noteContextReorder", {
-                ntxIdsInOrder: ntxIds,
-                oldMainNtxId: ntxId,
-                newMainNtxId: ntxIds[currentIndex + 1]
-            });
-        }
-
             await appContext.tabManager.removeNoteContext(ntxId);
         }
+    }
 
     async moveThisNoteSplitCommand({ ntxId, isMovingLeft }: CommandListenerData<"moveThisNoteSplit">) {
         if (!ntxId) {

apps/client/src/widgets/note_origin.tsx

@@ -0,0 +1,43 @@
+import { t } from "../services/i18n";
+import { useNoteContext, useTriliumEvent, useTriliumOption } from "./react/hooks";
+import { useEffect, useState } from "preact/hooks";
+import attributes from "../services/attributes";
+import InfoBar from "./react/InfoBar";
+import RawHtml from "./react/RawHtml";
+import FNote from "../entities/fnote";
+
+export default function OriginInfo() {
+    const { note } = useNoteContext();
+    const [link, setLink] = useState<string>();
+
+    function refresh() {
+        if (!note) return;
+        const pageUrl = getPageUrl(note);
+        if (!pageUrl) {
+            setLink(undefined);
+            return;
+        }
+        setLink(`<a href="${pageUrl}" class="external tn-link">${pageUrl}</a>`);
+    }
+
+    useEffect(refresh, [note]);
+    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
+        if (loadResults.getAttributeRows().find((attr) => attr.type === "label" && attr.name?.toString() === "pageUrl" && attributes.isAffecting(attr, note))) {
+            refresh();
+        }
+    });
+
+    return (
+        <InfoBar className="origin-info-widget" type="subtle" style={{ display: (!link) ? "none" : undefined }}>
+            {link && (
+                <RawHtml
+                    html={`${t("note_properties.this_note_was_originally_taken_from")} ${link}`}
+                />
+            )}
+        </InfoBar>
+    )
+}
+
+function getPageUrl(note: FNote) {
+    return note.getOwnedLabelValue("pageUrl");
+}

apps/client/src/widgets/react/NoteAutocomplete.tsx

@@ -15,13 +15,11 @@ interface NoteAutocompleteProps {
     opts?: Omit<Options, "container">;
     onChange?: (suggestion: Suggestion | null) => void;
     onTextChange?: (text: string) => void;
-    onKeyDown?: (e: KeyboardEvent) => void;
-    onBlur?: (newValue: string) => void;
     noteIdChanged?: (noteId: string) => void;
     noteId?: string;
 }
 
-export default function NoteAutocomplete({ id, inputRef: externalInputRef, text, placeholder, onChange, onTextChange, container, containerStyle, opts, noteId, noteIdChanged, onKeyDown, onBlur }: NoteAutocompleteProps) {
+export default function NoteAutocomplete({ id, inputRef: externalInputRef, text, placeholder, onChange, onTextChange, container, containerStyle, opts, noteId, noteIdChanged }: NoteAutocompleteProps) {
     const ref = useSyncedRef<HTMLInputElement>(externalInputRef);
     
     useEffect(() => {
@@ -59,12 +57,6 @@ export default function NoteAutocomplete({ id, inputRef: externalInputRef, text,
         if (onTextChange) {
             $autoComplete.on("input", () => onTextChange($autoComplete[0].value));
         }
-        if (onKeyDown) {
-            $autoComplete.on("keydown", (e) => e.originalEvent && onKeyDown(e.originalEvent));
-        }
-        if (onBlur) {
-            $autoComplete.on("blur", () => onBlur($autoComplete.getSelectedNoteId() ?? ""));
-        }
     }, [opts, container?.current]);
 
     useEffect(() => {

apps/client/src/widgets/react/NoteLink.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from "preact/hooks";
 import link, { ViewScope } from "../../services/link";
-import { useImperativeSearchHighlighlighting, useTriliumEvent } from "./hooks";
+import { useImperativeSearchHighlighlighting } from "./hooks";
 
 interface NoteLinkOpts {
     className?: string;
@@ -19,11 +19,9 @@ interface NoteLinkOpts {
 
 export default function NoteLink({ className, notePath, showNotePath, showNoteIcon, style, noPreview, noTnLink, highlightedTokens, title, viewScope, noContextMenu }: NoteLinkOpts) {
     const stringifiedNotePath = Array.isArray(notePath) ? notePath.join("/") : notePath;
-    const noteId = stringifiedNotePath.split("/").at(-1);
     const ref = useRef<HTMLSpanElement>(null);
     const [ jqueryEl, setJqueryEl ] = useState<JQuery<HTMLElement>>();
     const highlightSearch = useImperativeSearchHighlighlighting(highlightedTokens);
-    const [ noteTitle, setNoteTitle ] = useState<string>();
 
     useEffect(() => {
         link.createLink(stringifiedNotePath, {
@@ -32,7 +30,7 @@ export default function NoteLink({ className, notePath, showNotePath, showNoteIc
             showNoteIcon,
             viewScope
         }).then(setJqueryEl);
-    }, [ stringifiedNotePath, showNotePath, title, viewScope, noteTitle ]);
+    }, [ stringifiedNotePath, showNotePath, title, viewScope ]);
 
     useEffect(() => {
         if (!ref.current || !jqueryEl) return;
@@ -40,16 +38,6 @@ export default function NoteLink({ className, notePath, showNotePath, showNoteIc
         highlightSearch(ref.current);
     }, [ jqueryEl, highlightedTokens ]);
 
-    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
-        // React to note title changes, but only if the title is not overwritten.
-        if (!title && noteId) {
-            const entityRow = loadResults.getEntityRow("notes", noteId);
-            if (entityRow) {
-                setNoteTitle(entityRow.title);
-            }
-        }
-    });
-
     if (style) {
         jqueryEl?.css(style);
     }

apps/client/src/widgets/ribbon/NotePropertiesTab.tsx

@@ -1,20 +0,0 @@
-import { t } from "../../services/i18n";
-import { useNoteLabel } from "../react/hooks";
-import { TabContext } from "./ribbon-interface";
-
-/**
- * TODO: figure out better name or conceptualize better.
- */
-export default function NotePropertiesTab({ note }: TabContext) {
-    const [ pageUrl ] = useNoteLabel(note, "pageUrl");
-
-    return (
-        <div className="note-properties-widget" style={{ padding: "12px", color: "var(--muted-text-color)" }}>
-            { pageUrl && (
-                <div style={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
-                    {t("note_properties.this_note_was_originally_taken_from")} <a href={pageUrl} class="page-url external">{pageUrl}</a>
-                </div>
-            )}
-        </div>
-    )
-}

apps/client/src/widgets/ribbon/RibbonDefinition.ts

@@ -1,6 +1,5 @@
 import ScriptTab from "./ScriptTab";
 import EditedNotesTab from "./EditedNotesTab";
-import NotePropertiesTab from "./NotePropertiesTab";
 import NoteInfoTab from "./NoteInfoTab";
 import SimilarNotesTab from "./SimilarNotesTab";
 import FilePropertiesTab from "./FilePropertiesTab";
@@ -59,13 +58,6 @@ export const RIBBON_TAB_DEFINITIONS: TabConfiguration[] = [
         show: ({ note }) => note?.type === "book" || note?.type === "search",
         toggleCommand: "toggleRibbonTabBookProperties"
     },
-    {
-        title: t("note_properties.info"),
-        icon: "bx bx-info-square",
-        content: NotePropertiesTab,
-        show: ({ note }) => !!note?.getLabelValue("pageUrl"),
-        activate: true
-    },
     {
         title: t("file_properties.title"),
         icon: "bx bx-file",

apps/client/src/widgets/type_widgets/Doc.tsx

@@ -7,6 +7,7 @@ import { useTriliumEvent } from "../react/hooks";
 import { refToJQuerySelector } from "../react/react_utils";
 
 export default function Doc({ note, viewScope, ntxId }: TypeWidgetProps) {
+    const [ html, setHtml ] = useState<string>();
     const initialized = useRef<Promise<void> | null>(null);
     const containerRef = useRef<HTMLDivElement>(null);
 
@@ -14,7 +15,7 @@ export default function Doc({ note, viewScope, ntxId }: TypeWidgetProps) {
         if (!note) return;
 
         initialized.current = renderDoc(note).then($content => {
-            containerRef.current?.replaceChildren(...$content);
+            setHtml($content.html());
         });
     }, [ note ]);
 
@@ -25,9 +26,10 @@ export default function Doc({ note, viewScope, ntxId }: TypeWidgetProps) {
     });
 
     return (
-        <div
+        <RawHtmlBlock
-            ref={containerRef}
+            containerRef={containerRef}
             className={`note-detail-doc-content ck-content ${viewScope?.viewMode === "contextual-help" ? "contextual-help" : ""}`}
+            html={html}
         />
     );
 }

apps/client/src/widgets/type_widgets/options/appearance.tsx

@@ -203,7 +203,7 @@ function Font({ title, fontFamilyOption, fontSizeOption }: { title: string, font
                     <FormTextBoxWithUnit
                         name="tree-font-size"
                         type="number" min={50} max={200} step={10}
-                        currentValue={fontSize} onBlur={setFontSize}
+                        currentValue={fontSize} onChange={setFontSize}
                         unit={t("units.percentage")}
                     />
                 </FormGroup>

apps/client/src/widgets/type_widgets/text/CKEditorWithWatchdog.tsx

@@ -1,7 +1,7 @@
 import { HTMLProps, RefObject, useEffect, useImperativeHandle, useRef, useState } from "preact/compat";
 import { PopupEditor, ClassicEditor, EditorWatchdog, type WatchdogConfig, CKTextEditor, TemplateDefinition } from "@triliumnext/ckeditor5";
 import { buildConfig, BuildEditorOptions } from "./config";
-import { useKeyboardShortcuts, useLegacyImperativeHandlers, useNoteContext, useSyncedRef } from "../../react/hooks";
+import { useLegacyImperativeHandlers, useSyncedRef } from "../../react/hooks";
 import link from "../../../services/link";
 import froca from "../../../services/froca";
 
@@ -38,9 +38,6 @@ export default function CKEditorWithWatchdog({ containerRef: externalContainerRe
     const containerRef = useSyncedRef<HTMLDivElement>(externalContainerRef, null);
     const watchdogRef = useRef<EditorWatchdog>(null);
     const [ editor, setEditor ] = useState<CKTextEditor>();
-    const { parentComponent } = useNoteContext();
-
-    useKeyboardShortcuts("text-detail", containerRef, parentComponent);
 
     useImperativeHandle(editorApi, () => ({
         hasSelection() {

apps/client/src/widgets/type_widgets/text/EditableText.css

@@ -32,11 +32,11 @@ body.mobile .note-detail-editable-text {
 .note-detail-editable-text h5 { font-size: 1.1em; }
 .note-detail-editable-text h6 { font-size: 1.0em; }
 
-body.heading-style-markdown .note-detail-editable-text h2::before { content: "##\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-editable-text h2::before { content: "##\\2004"; color: var(--muted-text-color); }
-body.heading-style-markdown .note-detail-editable-text h3::before { content: "###\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-editable-text h3::before { content: "###\\2004"; color: var(--muted-text-color); }
-body.heading-style-markdown .note-detail-editable-text h4:not(.include-note-title)::before { content: "####\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-editable-text h4:not(.include-note-title)::before { content: "####\\2004"; color: var(--muted-text-color); }
-body.heading-style-markdown .note-detail-editable-text h5::before { content: "#####\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-editable-text h5::before { content: "#####\\2004"; color: var(--muted-text-color); }
-body.heading-style-markdown .note-detail-editable-text h6::before { content: "######\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-editable-text h6::before { content: "######\\2004"; color: var(--muted-text-color); }
 
 body.heading-style-underline .note-detail-editable-text h2 { border-bottom: 1px solid var(--main-border-color); }
 body.heading-style-underline .note-detail-editable-text h3 { border-bottom: 1px solid var(--main-border-color); }

apps/client/src/widgets/type_widgets/text/EditableText.tsx

@@ -196,12 +196,14 @@ export default function EditableText({ note, parentComponent, ntxId, noteContext
         });
     }
 
+    useKeyboardShortcuts("text-detail", containerRef, parentComponent);
     useTriliumEvent("insertDateTimeToText", ({ ntxId: eventNtxId }) => {
         if (eventNtxId !== ntxId) return;
         const date = new Date();
         const customDateTimeFormat = options.get("customDateTimeFormat");
         const dateString = utils.formatDateTime(date, customDateTimeFormat);
 
+        console.log("Insert text ", ntxId, eventNtxId, dateString);
         addTextToEditor(dateString);
     });
     useTriliumEvent("addTextToActiveEditor", ({ text }) => {

apps/client/src/widgets/type_widgets/text/ReadOnlyText.css

@@ -6,12 +6,12 @@
 .note-detail-readonly-text h5 { font-size: 1.1em; }
 .note-detail-readonly-text h6 { font-size: 1.0em; }
 
-body.heading-style-markdown .note-detail-readonly-text h1::before { content: "#\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-readonly-text h1::before { content: "#\\2004"; color: var(--muted-text-color); }
-body.heading-style-markdown .note-detail-readonly-text h2::before { content: "##\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-readonly-text h2::before { content: "##\\2004"; color: var(--muted-text-color); }
-body.heading-style-markdown .note-detail-readonly-text h3::before { content: "###\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-readonly-text h3::before { content: "###\\2004"; color: var(--muted-text-color); }
-body.heading-style-markdown .note-detail-readonly-text h4:not(.include-note-title)::before { content: "####\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-readonly-text h4:not(.include-note-title)::before { content: "####\\2004"; color: var(--muted-text-color); }
-body.heading-style-markdown .note-detail-readonly-text h5::before { content: "#####\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-readonly-text h5::before { content: "#####\\2004"; color: var(--muted-text-color); }
-body.heading-style-markdown .note-detail-readonly-text h6::before { content: "######\2004"; color: var(--muted-text-color); }
+body.heading-style-markdown .note-detail-readonly-text h6::before { content: "######\\2004"; color: var(--muted-text-color); }
 
 body.heading-style-underline .note-detail-readonly-text h1 { border-bottom: 1px solid var(--main-border-color); }
 body.heading-style-underline .note-detail-readonly-text h2 { border-bottom: 1px solid var(--main-border-color); }

apps/client/src/widgets/type_widgets/text/ReadOnlyText.tsx

@@ -17,7 +17,6 @@ import link from "../../../services/link";
 import { formatCodeBlocks } from "../../../services/syntax_highlight";
 import TouchBar, { TouchBarButton, TouchBarSpacer } from "../../react/TouchBar";
 import appContext from "../../../components/app_context";
-import { applyReferenceLinks } from "./read_only_helper";
 
 export default function ReadOnlyText({ note, noteContext, ntxId }: TypeWidgetProps) {
     const blob = useNoteBlob(note);
@@ -123,3 +122,10 @@ function applyMath(container: HTMLDivElement) {
         renderMathInElement(equation, { trust: true });
     }
 }
+
+function applyReferenceLinks(container: HTMLDivElement) {
+    const referenceLinks = container.querySelectorAll<HTMLDivElement>("a.reference-link");
+    for (const referenceLink of referenceLinks) {
+        link.loadReferenceLinkTitle($(referenceLink));
+    }
+}

apps/client/src/widgets/type_widgets/text/read_only_helper.ts

@@ -1,13 +0,0 @@
-import link from "../../../services/link";
-
-export async function applyReferenceLinks(container: HTMLDivElement | HTMLElement) {
-    const referenceLinks = container.querySelectorAll<HTMLDivElement>("a.reference-link");
-    for (const referenceLink of referenceLinks) {
-        await link.loadReferenceLinkTitle($(referenceLink));
-
-        // Wrap in a <span> to match the design while in CKEditor.
-        const spanEl = document.createElement("span");
-        spanEl.replaceChildren(...referenceLink.childNodes);
-        referenceLink.replaceChildren(spanEl);
-    }
-}

apps/desktop/package.json

@@ -35,7 +35,7 @@
     "@triliumnext/commons": "workspace:*",
     "@triliumnext/server": "workspace:*",
     "copy-webpack-plugin": "13.0.1",
-    "electron": "38.7.0",
+    "electron": "38.6.0",
     "@electron-forge/cli": "7.10.2",
     "@electron-forge/maker-deb": "7.10.2",
     "@electron-forge/maker-dmg": "7.10.2",

apps/dump-db/package.json

@@ -13,7 +13,7 @@
   "devDependencies": {
     "@types/better-sqlite3": "7.6.13",
     "@types/mime-types": "3.0.1",
-    "@types/yargs": "17.0.35"
+    "@types/yargs": "17.0.34"
   },
   "scripts": {
     "dev": "tsx src/main.ts",

apps/edit-docs/package.json

@@ -12,7 +12,7 @@
     "@triliumnext/desktop": "workspace:*",
     "@types/fs-extra": "11.0.4",
     "copy-webpack-plugin": "13.0.1",
-    "electron": "38.7.0",
+    "electron": "38.6.0",
     "fs-extra": "11.3.2"
   },
   "scripts": {

apps/server/package.json

@@ -30,7 +30,7 @@
     "node-html-parser": "7.0.1"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.69.0",
+    "@anthropic-ai/sdk": "0.68.0",
     "@braintree/sanitize-url": "7.1.1",
     "@electron/remote": "2.1.3",
     "@preact/preset-vite": "2.10.2",
@@ -81,7 +81,7 @@
     "debounce": "3.0.0",
     "debug": "4.4.3",
     "ejs": "3.1.10",
-    "electron": "38.7.0",
+    "electron": "38.6.0",
     "electron-debug": "4.1.0",
     "electron-window-state": "5.0.3",
     "escape-html": "1.0.3",
@@ -98,7 +98,7 @@
     "http-proxy-agent": "7.0.2",
     "https-proxy-agent": "7.0.6",
     "i18next": "25.6.2",
-    "i18next-fs-backend": "2.6.1",
+    "i18next-fs-backend": "2.6.0",
     "image-type": "6.0.0",
     "ini": "6.0.0",
     "is-animated": "2.0.2",
@@ -109,8 +109,8 @@
     "mime-types": "3.0.1",
     "multer": "2.0.2",
     "normalize-strings": "1.1.1",
-    "ollama": "0.6.3",
+    "ollama": "0.6.2",
-    "openai": "6.9.0",
+    "openai": "6.8.1",
     "rand-token": "1.0.1",
     "safe-compare": "1.1.4",
     "sanitize-filename": "1.6.3",

apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes.html

@@ -5,14 +5,14 @@
 <p>In Trilium, attributes are key-value pairs assigned to notes, providing
   additional metadata or functionality. There are two primary types of attributes:</p>
 <ol>
-  <li data-list-item-id="ef9c097e5af906754a4056ace4d16dbee">
+  <li>
     <p><a class="reference-link" href="#root/_help_HI6GBBIduIgv">Labels</a>&nbsp;can
       be used for a variety of purposes, such as storing metadata or configuring
       the behavior of notes. Labels are also searchable, enhancing note retrieval.</p>
     <p>For more information, including predefined labels, see&nbsp;<a class="reference-link"
       href="#root/_help_HI6GBBIduIgv">Labels</a>.</p>
   </li>
-  <li data-list-item-id="e8416f6f5188a4d8a25917c610a1482c0">
+  <li>
     <p><a class="reference-link" href="#root/_help_Cq5X6iKQop6R">Relations</a>&nbsp;define
       connections between notes, similar to links. These can be used for metadata
       and scripting purposes.</p>
@@ -23,30 +23,6 @@
 </ol>
 <p>These attributes play a crucial role in organizing, categorizing, and
   enhancing the functionality of notes.</p>
-<h2>Types of attributes</h2>
-<p>Conceptually there are two types of attributes (applying to both labels
-  and relations):</p>
-<ol>
-  <li data-list-item-id="e778cee42c209e30e41f7d2c99895495d"><strong>System attributes</strong>
-    <br>As the name suggest, these attributes have a special meaning since they
-    are interpreted by Trilium. For example the <code>color</code> attribute
-    will change the color of the note as displayed in the&nbsp;<a class="reference-link"
-    href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_oPVyFC7WL2Lp">Note Tree</a>&nbsp;and
-    links, and <code>iconClass</code> will change the icon of a note.
-    <br>&nbsp;</li>
-  <li data-list-item-id="e0ca0ab889b471e7c18e3d4f6ae6a61e0"><strong>User-defined attributes</strong>
-    <br>These are free-form labels or relations that can be used by the user.
-    They can be used purely for categorization purposes (especially if combined
-    with&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/wArbEsdSae6g/_help_eIg8jdvaoNNd">Search</a>),
-    or they can be given meaning through the use of&nbsp;<a class="reference-link"
-    href="#root/pOsGYCXsbNQG/_help_CdNpE2pqjmI6">Scripting</a>.</li>
-</ol>
-<p>In practice, Trilium makes no direct distinction of whether an attribute
-  is a system one or a user-defined one. A label or relation is considered
-  a system attribute if it matches one of the built-in names (e.g. like the
-  aforementioned <code>iconClass</code>). Keep this in mind when creating
-  &nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_OFXdgB2nNk1F">Promoted Attributes</a>&nbsp;in
-  order not to accidentally alter a system attribute (unless intended).</p>
 <h2>Viewing the list of attributes</h2>
 <p>Both the labels and relations for the current note are displayed in the <em>Owned Attributes</em> section
   of the&nbsp;<a class="reference-link" href="#root/_help_BlN9DFI679QC">Ribbon</a>,
@@ -55,15 +31,13 @@
   only be viewed.</p>
 <p>In the list of attributes, labels are prefixed with the <code>#</code> character
   whereas relations are prefixed with the <code>~</code> character.</p>
-<h2>Attribute Definitions and Promoted Attributes</h2>
-<p><a class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_OFXdgB2nNk1F">Promoted Attributes</a>&nbsp;create
-  a form-like editing experience for attributes, which makes it easy to enhancing
-  the organization and management of attributes</p>
 <h2>Multiplicity</h2>
 <p>Attributes in Trilium can be "multi-valued", meaning multiple attributes
-  with the same name can co-exist. This can be combined with&nbsp;<a class="reference-link"
+  with the same name can co-exist.</p>
-  href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_OFXdgB2nNk1F">Promoted Attributes</a>&nbsp;to
+<h2>Attribute Definitions and Promoted Attributes</h2>
-  easily add them.</p>
+<p>Special labels create "label/attribute" definitions, enhancing the organization
+  and management of attributes. For more details, see&nbsp;<a class="reference-link"
+  href="#root/_help_OFXdgB2nNk1F">Promoted Attributes</a>.</p>
 <h2>Attribute Inheritance</h2>
 <p>Trilium supports attribute inheritance, allowing child notes to inherit
   attributes from their parents. For more information, see&nbsp;<a class="reference-link"

apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Promoted Attributes.html

@@ -1,118 +1,31 @@
-<figure class="image image_resized" style="width:61.4%;">
-  <img style="aspect-ratio:938/368;" src="Promoted Attributes_image.png"
-  width="938" height="368">
-</figure>
 <p>Promoted attributes are <a href="#root/_help_zEY4DaJG4YT5">attributes</a> which
-  are displayed prominently in the UI which allow them to be easily viewed
+  are considered important and thus are "promoted" onto the main note UI.
-  and edited.</p>
+  See example below:</p>
-<p>One way of seeing promoted attributes is as a kind of form with several
+<p>
-  fields. Each field is just regular attribute, the only difference is that
+  <img src="Promoted Attributes_promot.png">
-  they appear on the note itself.</p>
+</p>
+<p>You can see the note having kind of form with several fields. Each of
+  these is just regular attribute, the only difference is that they appear
+  on the note itself.</p>
 <p>Attributes can be pretty useful since they allow for querying and script
   automation etc. but they are also inconveniently hidden. This allows you
   to select few of the important ones and push them to the front of the user.</p>
+<p>Now, how do we make attribute to appear on the UI?</p>
 <h2>Attribute definition</h2>
-<p>In order to have promoted attributes, there needs to be a way to define
+<p>Attribute is always name-value pair where both name and value are strings.</p>
-  them.</p>
+<p><em>Attribute definition</em> specifies how should this value be interpreted
-<figure class="image image-style-align-right image_resized" style="width:38.82%;">
+  - is it just string, or is it a date? Should we allow multiple values or
-  <img style="aspect-ratio:492/346;" src="1_Promoted Attributes_image.png"
+  note? And importantly, should we <em>promote</em> the attribute or not?</p>
-  width="492" height="346">
+<p>
-</figure>
+  <img src="Promoted Attributes_image.png">
-<p>Technically, attributes are only name-value pairs where both name and
+</p>
-  value are strings.</p>
+<p>You can notice tag attribute definition. These "definition" attributes
-<p>The <em>Attribute definition</em> specifies how should this value be interpreted:</p>
+  define how the "value" attributes should behave.</p>
-<ul>
-  <li data-list-item-id="e73e2d8dffca4fe59d009bfc5a245da88">Is it just string, or is it a date?</li>
-  <li data-list-item-id="e115a58c2d81149f481c385479cf06965">Should we allow multiple values or note?</li>
-  <li data-list-item-id="eb8cab0b2fdcefb7af9128f63b3b9f4ee">Should we <em>promote</em> the attribute or not?</li>
-</ul>
-<h2>Creating a new promoted attribute definition</h2>
-<p>To create a new promoted attribute:</p>
-<ol>
-  <li data-list-item-id="e118d34c98d285e3a7492876f73a49ed5">Go to a note.</li>
-  <li data-list-item-id="e480cc90d938f7f728011679df29f6ce0">Go to <em>Owned Attributes</em> in the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_BlN9DFI679QC">Ribbon</a>.</li>
-  <li
-  data-list-item-id="e40a26a8a32714572e670d8c7c18d1355">Press the + button.</li>
-    <li data-list-item-id="e5ba4dcc8ae48c7f043de2c8fc5ec1c2c">Select either <em>Add new label definition</em> or <em>Add new relation definition</em>.</li>
-    <li
-    data-list-item-id="e14e894cf6d207a410adbe87c56143799">Select the name which will be name of the label or relation that will
-      be created when the promoted attribute is edited.</li>
-      <li data-list-item-id="e5d803cd5a37a7169a5aa770d769f2dd4">Ensure <em>Promoted</em> is checked in order to display it at the top of
-        notes.</li>
-      <li data-list-item-id="e50c81da6343840b2a06b46a20e21181e">Optionally, choose an <em>Alias</em> which will be displayed next to the
-        promoted attribute instead of the attribute name. Generally it's best to
-        choose a “user-friendly” name since it can contain spaces and other characters
-        which are not supported as attribute names.</li>
-      <li data-list-item-id="e0e08c63296b88ea8ec8ae17104eed366">Check <em>Inheritable</em> to apply it to this note and all its descendants.
-        To keep it only for the current note, un-check it.</li>
-      <li data-list-item-id="ededc09be314b651d919aebd026cc5b86">Press “Save &amp; Close” to apply the changes.</li>
-</ol>
-<h2>How attribute definitions actually work</h2>
-<p>When a new promoted attribute definition is created, it creates a corresponding
-  label prefixed with either <code>label</code> or <code>relation</code>, depending
-  on the definition type:</p><pre><code class="language-text-x-trilium-auto">#label:myColor(inheritable)="promoted,alias=Color,multi,color"</code></pre>
-<p>The only purpose of the attribute definition is to set up a template.
-  If the attribute was marked as promoted, then it's also displayed to the
-  user for easy editing.</p>
-<figure class="table" style="width:100%;">
-  <table class="ck-table-resized">
-    <colgroup>
-      <col style="width:47.64%;">
-        <col style="width:52.36%;">
-    </colgroup>
-    <tbody>
-      <tr>
-        <td>
-          <figure class="image">
-            <img style="aspect-ratio:495/157;" src="2_Promoted Attributes_image.png"
-            width="495" height="157">
-          </figure>
-        </td>
-        <td>Notice how the promoted attribute definition only creates a “Due date”
-          box above the text content.</td>
-      </tr>
-      <tr>
-        <td>
-          <figure class="image">
-            <img style="aspect-ratio:663/160;" src="3_Promoted Attributes_image.png"
-            width="663" height="160">
-          </figure>
-        </td>
-        <td>Once a value is set by the user, a new label (or relation, depending on
-          the type) is created. The name of the attribute matches one set when creating
-          the promoted attribute.</td>
-      </tr>
-    </tbody>
-  </table>
-</figure>
 <p>So there's one attribute for value and one for definition. But notice
-  how an definition attribute can be made <a href="#root/_help_bwZpz2ajCEwO">Inheritable</a>,
+  how definition attribute is <a href="#root/_help_bwZpz2ajCEwO">Inheritable</a>,
-  meaning that it's also applied to all descendant notes. In this case, the
+  meaning that it's also applied to all descendant note. So in a way, this
-  definition used for the whole sub-tree while "value" attributes are for
+  definition is used for the whole subtree while "value" attributes are applied
-  each not individually.</p>
+  only for this note.</p>
-<h2>Using system attributes</h2>
-<p>It's possible to create promoted attributes out of system attributes,
-  to be able to easily alter them.</p>
-<p>Here are a few practical examples:</p>
-<ul>
-  <li data-list-item-id="eb7e4e362b582d6bf480375d1e5648ac3"><a class="reference-link" href="#root/pOsGYCXsbNQG/_help_GTwFsgaA0lCt">Collections</a>&nbsp;already
-    make use of this practice, for example:
-    <ul>
-      <li data-list-item-id="e0831925d935c7a90f90bd5fed94d089e">Calendars add “Start Date”, “End Date”, “Start Time” and “End Time” as
-        promoted attributes. These map to system attributes such as <code>startDate</code> which
-        are then interpreted by the calendar view.</li>
-      <li data-list-item-id="e4a235f12a7934803ba7706e309511c82"><a class="reference-link" href="#root/pOsGYCXsbNQG/GTwFsgaA0lCt/_help_zP3PMqaG71Ct">Presentation</a>&nbsp;adds
-        a “Background” promoted attribute for each of the slide to easily be able
-        to customize.</li>
-    </ul>
-  </li>
-  <li data-list-item-id="e9069ad779c177b7ed0d3ece786e73cd3">The Trilium documentation (which is edited in Trilium) uses a promoted
-    attribute to be able to easily edit the <code>#shareAlias</code> (see&nbsp;
-    <a
-    class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/_help_R9pX4DGra2Vt">Sharing</a>) in order to form clean URLs.</li>
-  <li data-list-item-id="ed14685a7279b42a1769be97ffe7f5e8f">If you always edit a particular system attribute such as <code>#color</code>,
-    simply create a promoted attribute for it to make it easier.</li>
-</ul>
 <h3>Inverse relation</h3>
 <p>Some relations always occur in pairs - my favorite example is on the family.
   If you have a note representing husband and note representing wife, then
@@ -120,7 +33,7 @@
   This is bidirectional relationship - meaning that if a relation is pointing
   from husband to wife then there should be always another relation pointing
   from wife to husband.</p>
-<p>Another example is with parent-child relationship. Again these always
+<p>Another example is with parent - child relationship. Again these always
   occur in pairs, but in this case it's not exact same relation - the one
   going from parent to child might be called <code>isParentOf</code> and the
   other one going from child to parent might be called <code>isChildOf</code>.</p>

apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Geo Map.html

@@ -1,8 +1,5 @@
 <aside class="admonition important">
-  <p><a class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/_help_zEY4DaJG4YT5">Attributes</a>
+  <p>Starting with Trilium v0.97.0, the geo map has been converted from a standalone
-    <a
-    class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_OFXdgB2nNk1F">Promoted Attributes</a><a class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/_help_zEY4DaJG4YT5">Attributes</a>Starting
-      with Trilium v0.97.0, the geo map has been converted from a standalone
     <a
     href="#root/_help_KSZ04uQ2D1St">note type</a>to a type of view for the&nbsp;<a class="reference-link"
       href="#root/_help_0ESUbbAxVnoK">Note List</a>.&nbsp;</p>
@@ -15,13 +12,12 @@
   on an attribute. It is also possible to add new notes at a specific location
   using the built-in interface.</p>
 <h2>Creating a new geo map</h2>
-<figure class="table">
+<table>
-  <table>
   <thead>
     <tr>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
     </tr>
   </thead>
   <tbody>
@@ -46,25 +42,24 @@
       <td>By default the map will be empty and will show the entire world.</td>
     </tr>
   </tbody>
-  </table>
+</table>
-</figure>
+
 <h2>Repositioning the map</h2>
 <ul>
-  <li data-list-item-id="ec3df228f80922b4531e2dd1a977d81b8">Click and drag the map in order to move across the map.</li>
+  <li>Click and drag the map in order to move across the map.</li>
-  <li data-list-item-id="ee505c643c5bacffffc42119cc2f19c60">Use the mouse wheel, two-finger gesture on a touchpad or the +/- buttons
+  <li>Use the mouse wheel, two-finger gesture on a touchpad or the +/- buttons
     on the top-left to adjust the zoom.</li>
 </ul>
 <p>The position on the map and the zoom are saved inside the map note and
   restored when visiting again the note.</p>
 <h2>Adding a marker using the map</h2>
 <h3>Adding a new note using the plus button</h3>
-<figure class="table">
+<table>
-  <table>
   <thead>
     <tr>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
     </tr>
   </thead>
   <tbody>
@@ -73,12 +68,12 @@
       <td>To create a marker, first navigate to the desired point on the map. Then
         press the
         <img src="10_Geo Map_image.png">button in the&nbsp;<a href="#root/_help_XpOYSgsLkTJy">Floating buttons</a>&nbsp;(top-right)
-          area.&nbsp;&nbsp;&nbsp;&nbsp;
+        area.&nbsp;&nbsp;&nbsp;
         <br>
         <br>If the button is not visible, make sure the button section is visible
         by pressing the chevron button (
         <img src="17_Geo Map_image.png">) in the top-right of the map.</td>
-        <td>&nbsp;</td>
+      <td></td>
     </tr>
     <tr>
       <td>2</td>
@@ -87,7 +82,7 @@
         width="1730" height="416">
       </td>
       <td>Once pressed, the map will enter in the insert mode, as illustrated by
-          the notification.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        the notification.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <br>
         <br>Simply click the point on the map where to place the marker, or the Escape
         key to cancel.</td>
@@ -110,32 +105,28 @@
         displayed as a child note of the map.</td>
     </tr>
   </tbody>
-  </table>
+</table>
-</figure>
+
 <h3>Adding a new note using the contextual menu</h3>
 <ol>
-  <li data-list-item-id="ea014287557d9fbca07dd30b32405f92a">Right click anywhere on the map, where to place the newly created marker
+  <li>Right click anywhere on the map, where to place the newly created marker
     (and corresponding note).</li>
-  <li data-list-item-id="ef758bd1a52c2ced75e402fd68e3d1e67">Select <em>Add a marker at this location</em>.</li>
+  <li>Select <em>Add a marker at this location</em>.</li>
-  <li data-list-item-id="e6f1d66e9d872ac4908a7c11b401a9d80">Enter the name of the ne<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_oPVyFC7WL2Lp">Note Tree</a>wly
+  <li>Enter the name of the newly created note.</li>
-    created note.</li>
+  <li>The map should be updated with the new marker.</li>
-  <li data-list-item-id="eed9a3fbe500d61c76729f6147ceed925">The map should be updated with the new marker.</li>
 </ol>
 <h3>Adding an existing note on note from the note tree</h3>
 <ol>
-  <li data-list-item-id="ecba60e77600a1660e947ce54c633df04">Select the desired note in the&nbsp;<a class="reference-link" href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>.</li>
+  <li>Select the desired note in the&nbsp;<a class="reference-link" href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>.</li>
-  <li
+  <li>Hold the mouse on the note and drag it to the map to the desired location.</li>
-  data-list-item-id="e00bb8f41cf79fef2b5ce215bc678f808">Hold the mouse on the note and drag it to the map to the desired location.</li>
+  <li>The map should be updated with the new marker.</li>
-    <li
-    data-list-item-id="e3fc69dc9e44db125872274e68223cd4e">The map should be updated with the new marker.</li>
 </ol>
 <p>This works for:</p>
 <ul>
-  <li data-list-item-id="e0821dbcf20fa4a83a9cfada4bea95521">Notes that are not part of the geo map, case in which a <a href="#root/_help_IakOLONlIfGI">clone</a> will
+  <li>Notes that are not part of the geo map, case in which a <a href="#root/_help_IakOLONlIfGI">clone</a> will
     be created.</li>
-  <li data-list-item-id="e859aa76bcb592afd7414cccb60cdd3ed">Notes that are a child of the geo map but not yet positioned on the map.</li>
+  <li>Notes that are a child of the geo map but not yet positioned on the map.</li>
-  <li
+  <li>Notes that are a child of the geo map and also positioned, case in which
-  data-list-item-id="e74fb2b74919aba44e1a457a5f8aec6b8">Notes that are a child of the geo map and also positioned, case in which
     the marker will be relocated to the new position.</li>
 </ul>
 <aside class="admonition note">
@@ -145,10 +136,8 @@
 <h2>How the location of the markers is stored</h2>
 <p>The location of a marker is stored in the <code>#geolocation</code> attribute
   of the child notes:</p>
-<p>
+<img src="18_Geo Map_image.png"
-  <img src="18_Geo Map_image.png" width="1288"
+width="1288" height="278">
-  height="278">
-</p>
 <p>This value can be added manually if needed. The value of the attribute
   is made up of the latitude and longitude separated by a comma.</p>
 <h2>Repositioning markers</h2>
@@ -160,17 +149,16 @@
   page (<kbd>Ctrl</kbd>+<kbd>R</kbd> ) to cancel it.</p>
 <h2>Interaction with the markers</h2>
 <ul>
-  <li data-list-item-id="e953e0022167e10d476bbf438b71029ee">Hovering over a marker will display a&nbsp;<a class="reference-link" href="#root/_help_lgKX7r3aL30x">Note Tooltip</a>&nbsp;with
+  <li>Hovering over a marker will display a&nbsp;<a class="reference-link" href="#root/_help_lgKX7r3aL30x">Note Tooltip</a>&nbsp;with
     the content of the note it belongs to.
     <ul>
-      <li data-list-item-id="e24f6ec1307f470fc8a9c0681282dd424">Clicking on the note title in the tooltip will navigate to the note in
+      <li>Clicking on the note title in the tooltip will navigate to the note in
         the current view.</li>
     </ul>
   </li>
-  <li data-list-item-id="ea6f9b375776db475c00f3d308f170cb1">Middle-clicking the marker will open the note in a new tab.</li>
+  <li>Middle-clicking the marker will open the note in a new tab.</li>
-  <li data-list-item-id="e26942774d668ca9d49e1cfc797801516">Right-clicking the marker will open a contextual menu (as described below).</li>
+  <li>Right-clicking the marker will open a contextual menu (as described below).</li>
-  <li
+  <li>If the map is in read-only mode, clicking on a marker will open a&nbsp;
-  data-list-item-id="edcf8a4a4e252ae3757303fc28c6e549e">If the map is in read-only mode, clicking on a marker will open a&nbsp;
     <a
     class="reference-link" href="#root/_help_ZjLYv08Rp3qC">Quick edit</a>&nbsp;popup for the corresponding note.</li>
 </ul>
@@ -178,24 +166,24 @@
 <p>It's possible to press the right mouse button to display a contextual
   menu.</p>
 <ol>
-  <li data-list-item-id="e529cc53e555215e949135d9998ac4d06">If right-clicking an empty section of the map (not on a marker), it allows
+  <li>If right-clicking an empty section of the map (not on a marker), it allows
     to:
     <ol>
-      <li data-list-item-id="e18b27ec2d655ca2e29328c6cc899cccf">Displays the latitude and longitude. Clicking this option will copy them
+      <li>Displays the latitude and longitude. Clicking this option will copy them
         to the clipboard.</li>
-      <li data-list-item-id="ebecfc3495ce94589ebdaa3479e70a8ea">Open the location using an external application (if the operating system
+      <li>Open the location using an external application (if the operating system
         supports it).</li>
-      <li data-list-item-id="e1e1e816904064ed2457553dbcf58f373">Adding a new marker at that location.</li>
+      <li>Adding a new marker at that location.</li>
     </ol>
   </li>
-  <li data-list-item-id="eadf4de9e1e967bfcbf7274b8e7613c8e">If right-clicking on a marker, it allows to:
+  <li>If right-clicking on a marker, it allows to:
     <ol>
-      <li data-list-item-id="ebd32992e411b3a755008b1036448f7e9">Displays the latitude and longitude. Clicking this option will copy them
+      <li>Displays the latitude and longitude. Clicking this option will copy them
         to the clipboard.</li>
-      <li data-list-item-id="e5e8bf64b872e1bf32a53459b05d05263">Open the location using an external application (if the operating system
+      <li>Open the location using an external application (if the operating system
         supports it).</li>
-      <li data-list-item-id="ec83b4469031db305a1d3f9a4d36b395d">Open the note in a new tab, split or window.</li>
+      <li>Open the note in a new tab, split or window.</li>
-      <li data-list-item-id="e49f6d549515bec0d6bd8bccf3d34d269">Remove the marker from the map, which will remove the <code>#geolocation</code> attribute
+      <li>Remove the marker from the map, which will remove the <code>#geolocation</code> attribute
         of the note. To add it back again, the coordinates have to be manually
         added back in.</li>
     </ol>
@@ -215,13 +203,12 @@
 <p>The value of the attribute is made up of the latitude and longitude separated
   by a comma.</p>
 <h3>Adding from Google Maps</h3>
-<figure class="table">
+<table>
-  <table>
   <thead>
     <tr>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
     </tr>
   </thead>
   <tbody>
@@ -234,10 +221,10 @@
         </figure>
       </td>
       <td>Go to Google Maps on the web and look for a desired location, right click
-          on it and a context menu will show up.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        on it and a context menu will show up.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <br>
         <br>Simply click on the first item displaying the coordinates and they will
-          be copied to clipboard.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        be copied to clipboard.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <br>
         <br>Then paste the value inside the text box into the <code>#geolocation</code> attribute
         of a child note of the map (don't forget to surround the value with a <code>"</code> character).</td>
@@ -266,17 +253,16 @@
         new note.</td>
     </tr>
   </tbody>
-  </table>
+</table>
-</figure>
+
 <h3>Adding from OpenStreetMap</h3>
 <p>Similarly to the Google Maps approach:</p>
-<figure class="table">
+<table>
-  <table>
   <thead>
     <tr>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
     </tr>
   </thead>
   <tbody>
@@ -296,7 +282,7 @@
         width="696" height="480">
       </td>
       <td>The address will be visible in the top-left of the screen, in the place
-          of the search bar.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        of the search bar.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <br>
         <br>Select the coordinates and copy them into the clipboard.</td>
     </tr>
@@ -310,18 +296,16 @@
         of a child note of the map and then it should be displayed on the map.</td>
     </tr>
   </tbody>
-  </table>
+</table>
-</figure>
+
 <h2>Adding GPS tracks (.gpx)</h2>
 <p>Trilium has basic support for displaying GPS tracks on the geo map.</p>
-<figure
+<table>
-class="table">
-  <table>
   <thead>
     <tr>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
-        <th>&nbsp;</th>
+      <th></th>
     </tr>
   </thead>
   <tbody>
@@ -355,75 +339,73 @@ class="table">
           width="620" height="530">
         </figure>
       </td>
-        <td>When going back to the map, the track should now be visible.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <td>When going back to the map, the track should now be visible.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <br>
         <br>The start and end points of the track are indicated by the two blue markers.</td>
     </tr>
   </tbody>
-  </table>
+</table>
-  </figure>
+<aside class="admonition note">
-  <aside class="admonition note">
   <p>The starting point of the track will be displayed as a marker, with the
     name of the note underneath. The start marker will also respect the icon
     and the <code>color</code> of the note. The end marker is displayed with
     a distinct icon.</p>
   <p>If the GPX contains waypoints, they will also be displayed. If they have
     a name, it is displayed when hovering over it with the mouse.</p>
-  </aside>
+</aside>
-  <h2>Read-only mode</h2>
+<h2>Read-only mode</h2>
-  <p>When a map is in read-only all editing features will be disabled such
+<p>When a map is in read-only all editing features will be disabled such
   as:</p>
-  <ul>
+<ul>
-    <li data-list-item-id="e78bca8f945a953c13efaf287001d0edb">The add button in the&nbsp;<a class="reference-link" href="#root/_help_XpOYSgsLkTJy">Floating buttons</a>.</li>
+  <li>The add button in the&nbsp;<a class="reference-link" href="#root/_help_XpOYSgsLkTJy">Floating buttons</a>.</li>
-    <li
+  <li>Dragging markers.</li>
-    data-list-item-id="e022d4fc44c13cf5f529ea18729df3897">Dragging markers.</li>
+  <li>Editing from the contextual menu (removing locations or adding new items).</li>
-      <li data-list-item-id="e0d024b930867c0253e98c322d3bea021">Editing from the contextual menu (removing locations or adding new items).</li>
+</ul>
-  </ul>
+<p>To enable read-only mode simply press the <em>Lock</em> icon from the&nbsp;
-  <p>To enable read-only mode simply press the <em>Lock</em> icon from the&nbsp;
   <a
   class="reference-link" href="#root/_help_XpOYSgsLkTJy">Floating buttons</a>. To disable it, press the button again.</p>
-  <h2>Configuration</h2>
+<h2>Configuration</h2>
-  <h3>Map Style</h3>
+<h3>Map Style</h3>
-  <p>The styling of the map can be adjusted in the <em>Collection Properties</em> tab
+<p>The styling of the map can be adjusted in the <em>Collection Properties</em> tab
   in the&nbsp;<a class="reference-link" href="#root/_help_BlN9DFI679QC">Ribbon</a>&nbsp;or
   manually via the <code>#map:style</code> attribute.</p>
-  <p>The geo map comes with two different types of styles:</p>
+<p>The geo map comes with two different types of styles:</p>
+<ul>
+  <li>Raster styles
     <ul>
-    <li data-list-item-id="ee111daf471290ce8f16adb8ff6255e78">Raster styles
+      <li>For these styles the map is represented as a grid of images at different
-      <ul>
-        <li data-list-item-id="ebecb845ceda41068a106693c5a1244e3">For these styles the map is represented as a grid of images at different
         zoom levels. This is the traditional way OpenStreetMap used to work.</li>
-        <li
+      <li>Zoom is slightly restricted.</li>
-        data-list-item-id="e60a827a1f29105ea8321184d4fb4f0a2">Zoom is slightly restricted.</li>
+      <li>Currently, the only raster theme is the original OpenStreetMap style.</li>
-    <li data-list-item-id="e2eb8282db9496f32beeddd53a72fea2a">Currently, the only raster theme is the original OpenStreetMap style.</li>
     </ul>
   </li>
-    <li data-list-item-id="e01494841aec47f71245855fe95ad4adb">Vector styles
+  <li>Vector styles
     <ul>
-        <li data-list-item-id="e87e7f879a4c7475769e73f1cfa1bc1b8">Vector styles are not represented as images, but as geometrical shapes.
+      <li>Vector styles are not represented as images, but as geometrical shapes.
         This makes the rendering much smoother, especially when zooming and looking
         at the building edges, for example.</li>
-        <li data-list-item-id="ef95260bc6fcb49e63ff708077929b263">The map can be zoomed in much further.</li>
+      <li>The map can be zoomed in much further.</li>
-        <li data-list-item-id="e339157e4fdacc1b59f6c44cf29711032">These come both in a light and a dark version.</li>
+      <li>These come both in a light and a dark version.</li>
-        <li data-list-item-id="e9be34d3c44b5dc1ecaa8c856642fc610">The vector styles come from <a href="https://versatiles.org/">VersaTiles</a>,
+      <li>The vector styles come from <a href="https://versatiles.org/">VersaTiles</a>,
         a free and open-source project providing map tiles based on OpenStreetMap.</li>
     </ul>
   </li>
-  </ul>
+</ul>
-  <aside class="admonition note">
+<aside class="admonition note">
   <p>Currently it is not possible to use a custom map style.</p>
-  </aside>
+</aside>
-  <h3>Scale</h3>
+<h3>Scale</h3>
-  <p>Activating this option via the&nbsp;<a class="reference-link" href="#root/_help_BlN9DFI679QC">Ribbon</a>&nbsp;or
+<p>Activating this option via the&nbsp;<a class="reference-link" href="#root/_help_BlN9DFI679QC">Ribbon</a>&nbsp;or
   manually via <code>#map:scale</code> will display an indicator in the bottom-left
   of the scale of the map.</p>
-  <h2>Troubleshooting</h2>
+<h2>Troubleshooting</h2>
-  <figure class="image image-style-align-right image_resized" style="width:34.06%;">
+<figure class="image image-style-align-right image_resized" style="width:34.06%;">
   <img style="aspect-ratio:678/499;" src="13_Geo Map_image.png"
   width="678" height="499">
-  </figure>
+</figure>
-  <h3>Grid-like artifacts on the map</h3>
+
-  <p>This occurs if the application is not at 100% zoom which causes the pixels
+<h3>Grid-like artifacts on the map</h3>
+<p>This occurs if the application is not at 100% zoom which causes the pixels
   of the map to not render correctly due to fractional scaling. The only
   possible solution is to set the UI zoom at 100% (default keyboard shortcut
   is <kbd>Ctrl</kbd>+<kbd>0</kbd>).</p>

apps/server/src/assets/doc_notes/en/User Guide/User Guide/Collections/Kanban Board.html

@@ -1,5 +1,5 @@
 <figure class="image">
-  <img style="aspect-ratio:918/248;" src="2_Kanban Board_image.png"
+  <img style="aspect-ratio:918/248;" src="Kanban Board_image.png"
   width="918" height="248">
 </figure>
 <p>The Board view presents sub-notes in columns for a Kanban-like experience.
@@ -15,168 +15,83 @@
 <h2>Interaction</h2>
 <h3>Working with columns</h3>
 <ul>
-  <li data-list-item-id="ed78b9e2ac3200e097ae29e2d528c5e89">Create a new column by pressing <em>Add Column</em> near the last column.
+  <li>Create a new column by pressing <em>Add Column</em> near the last column.
     <ul>
-      <li data-list-item-id="ed5ddfffe11d0b328a8072e52be9c7492">Once pressed, a text box will be displayed to set the name of the column.
+      <li>Once pressed, a text box will be displayed to set the name of the column.
         Press <kbd>Enter</kbd> to confirm, or <kbd>Escape</kbd> to dismiss.</li>
     </ul>
   </li>
-  <li data-list-item-id="eeecd7ac7b32b1c29e7088ad172411862">To reorder a column, simply hold the mouse over the title and drag it
+  <li>To reorder a column, simply hold the mouse over the title and drag it
     to the desired position.</li>
-  <li data-list-item-id="e6bc6a4b20236a9d2c382a9564eef528f">To delete a column, right click on its title and select <em>Delete column</em>.</li>
+  <li>To delete a column, right click on its title and select <em>Delete column</em>.</li>
-  <li
+  <li>To rename a column, click on the note title.
-  data-list-item-id="ea3bd7adf8521c4c2fb2f3ef0cf4def28">To rename a column, click on the note title.
     <ul>
-      <li data-list-item-id="eb1b0ee1c933e5ca2f4cb57a05b5c07eb">Press Enter to confirm.</li>
+      <li>Press Enter to confirm.</li>
-      <li data-list-item-id="eabddc4dae9e10189e9c7dc087496e846">Upon renaming a column, the corresponding status attribute of all its
+      <li>Upon renaming a column, the corresponding status attribute of all its
         notes will be changed in bulk.</li>
     </ul>
   </li>
-    <li data-list-item-id="efc70bbc5f0d1dc25e919a5b9e41a54e2">If there are many columns, use the mouse wheel to scroll.</li>
+  <li>If there are many columns, use the mouse wheel to scroll.</li>
 </ul>
 <h3>Working with notes</h3>
 <ul>
-  <li data-list-item-id="ee1000666f3c92f251a0262d5e2e30cbf">Create a new note in any column by pressing <em>New item</em>
+  <li>Create a new note in any column by pressing <em>New item</em>
     <ul>
-      <li data-list-item-id="ea3d86963b86f6820335c3994e3c7a00c">Enter the name of the note and press <kbd>Enter</kbd> or click away. To
+      <li>Enter the name of the note and press <kbd>Enter</kbd> or click away. To
         dismiss the creation of a new note, simply press <kbd>Escape</kbd> or leave
         the name empty.</li>
-      <li data-list-item-id="ee8280e96edd38a1bc247ee34ea514c88">Once created, the new note will have an attribute (<code>status</code> label
+      <li>Once created, the new note will have an attribute (<code>status</code> label
         by default) set to the name of the column.</li>
     </ul>
   </li>
-  <li data-list-item-id="eb03f96167236a14a55a7538b588bed05">To open the note, simply click on it.</li>
+  <li>To open the note, simply click on it.</li>
-  <li data-list-item-id="e29a6c1186c096f5ec6316edd9d44e626">To change the title of the note directly from the board, hover the mouse
+  <li>To change the title of the note directly from the board, hover the mouse
     over its card and press the edit button on the right.</li>
-  <li data-list-item-id="e201e4e28bad20f532c5e2c0ada6398f7">To change the state of a note, simply drag a note from one column to the
+  <li>To change the state of a note, simply drag a note from one column to the
     other to change its state.</li>
-  <li data-list-item-id="e98766e577d03db3dfd8acb850ddf8268">The order of the notes in each column corresponds to their position in
+  <li>The order of the notes in each column corresponds to their position in
     the tree.
     <ul>
-      <li data-list-item-id="e905430d6d0a5e51e2596611ccb3a0f2a">It's possible to reorder notes simply by dragging them to the desired
+      <li>It's possible to reorder notes simply by dragging them to the desired
         position within the same columns.</li>
-      <li data-list-item-id="e66108d33aee9387b325a554e12a85a73">It's also possible to drag notes across columns, at the desired position.</li>
+      <li>It's also possible to drag notes across columns, at the desired position.</li>
     </ul>
   </li>
-  <li data-list-item-id="ebb5b8df8459f8b32d2e1712d268b63df">For more options, right click on a note to display a context menu with
+  <li>For more options, right click on a note to display a context menu with
     the following options:
     <ul>
-      <li data-list-item-id="efe7840fa83c41d4a23759927bbe824d2">Open the note in a new tab/split/window or quick edit.</li>
+      <li>Open the note in a new tab/split/window or quick edit.</li>
-      <li data-list-item-id="ea44a2cd0895413620eff0720524e9938">Move the note to any column.</li>
+      <li>Move the note to any column.</li>
-      <li data-list-item-id="e505699fc18903f73f96ddfe29a4cc694">Insert a new note above/below the current one.</li>
+      <li>Insert a new note above/below the current one.</li>
-      <li data-list-item-id="e153bf42c4f955bb1421d586f9e7b5498">Archive/unarchive the current note.</li>
+      <li>Archive/unarchive the current note.</li>
-      <li data-list-item-id="e3c0a0113e5bb4a69a9dfe90862f5ee1e">Delete the current note.</li>
+      <li>Delete the current note.</li>
     </ul>
   </li>
-  <li data-list-item-id="e1d6b1303eb3567b51fec1174993dcb71">If there are many notes within the column, move the mouse over the column
+  <li>If there are many notes within the column, move the mouse over the column
     and use the mouse wheel to scroll.</li>
 </ul>
-<h3>Working with the note tree</h3>
+<h2>Keyboard interaction</h2>
-<p>It's also possible to add items on the board using the&nbsp;<a class="reference-link"
-  href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>.</p>
-<ol>
-  <li data-list-item-id="ef31c436ab587f75725f224880891c063">Select the desired note in the&nbsp;<a class="reference-link" href="#root/_help_oPVyFC7WL2Lp">Note Tree</a>.</li>
-  <li
-  data-list-item-id="e4e3b01f6a772fe9f5ea2bbb91f2b1f6d">Hold the mouse on the note and drag it to the to the desired column.</li>
-</ol>
-<p>This works for:</p>
-<ul>
-  <li data-list-item-id="e4b395d82d6e6220afbacdca93b80bea3">Notes that are not children of the board, case in which a <a href="#root/_help_IakOLONlIfGI">clone</a> will
-    be created.</li>
-  <li data-list-item-id="ef1eeff2b993c6285ed33440520254f7f">Notes that are children of the board, but not yet assigned on the board.</li>
-  <li
-  data-list-item-id="ee4610f6d74645e030570bfa9420dad61">Notes that are children of the board, case in which they will be moved
-    to the new column.</li>
-</ul>
-<h3>Keyboard interaction</h3>
 <p>The board view has mild support for keyboard-based navigation:</p>
 <ul>
-  <li data-list-item-id="ef209d621d05adddb8648e11c1aff106a">Use <kbd>Tab</kbd> and <kbd>Shift</kbd>+<kbd>Tab</kbd> to navigate between
+  <li>Use <kbd>Tab</kbd> and <kbd>Shift</kbd>+<kbd>Tab</kbd> to navigate between
     column titles, notes and the “New item” button for each of the columns,
     in sequential order.</li>
-  <li data-list-item-id="e48cffbf4ee1a7452c1e01277c8dd2cbf">To rename a column or a note, press <kbd>F2</kbd> while it is focused.</li>
+  <li>To rename a column or a note, press <kbd>F2</kbd> while it is focused.</li>
-  <li
+  <li>To open a specific note or create a new item, press <kbd>Enter</kbd> while
-  data-list-item-id="e02a6fb1c98d4e4b75e9e4245cf7cf6b1">To open a specific note or create a new item, press <kbd>Enter</kbd> while
     it is focused.</li>
-    <li data-list-item-id="eec6f2285fa4d8e95f6a3d40cf51e3d69">To dismiss a rename of a note or a column, press <kbd>Escape</kbd>.</li>
+  <li>To dismiss a rename of a note or a column, press <kbd>Escape</kbd>.</li>
 </ul>
 <h2>Configuration</h2>
-<h3>Displaying custom attributes</h3>
+<h3>Grouping by another attribute</h3>
-<figure class="image image-style-align-center">
-  <img style="aspect-ratio:531/485;" src="Kanban Board_image.png"
-  width="531" height="485">
-</figure>
-<p>Note attributes can be displayed on the board to enhance it with custom
-  information such as adding a Due date for your tasks.</p>
-<p>This feature works exclusively via attribute definitions (<a class="reference-link"
-  href="#root/zEY4DaJG4YT5/_help_OFXdgB2nNk1F">Promoted Attributes</a>). The easiest
-  way to add these is:</p>
-<ol>
-  <li data-list-item-id="eb2220bf769a14b4d3c3763ddb412215a">Go to board note.</li>
-  <li data-list-item-id="ef2b3775a79f59cc97c77a69ca78a345e">In the ribbon select <em>Owned Attributes</em> → plus button → <em>Add new label/relation definition</em>.</li>
-  <li
-  data-list-item-id="e2565a4dfea04fba704b37927e6252ce4">Configure the attribute as desired.</li>
-    <li data-list-item-id="ee18605ea5b4a07f7b3f5529ba00b2a57">Check <em>Inheritable</em> to make it applicable to child notes automatically.</li>
-</ol>
-<p>After creating the attribute, click on a note and fill in the promoted
-  attributes which should then reflect inside the board.</p>
-<p>Of note:</p>
-<ul>
-  <li data-list-item-id="e5a19ed95dbafe9a850690bea201deba1">Both promoted and non-promoted attribute definitions are supported. The
-    only difference is that non-promoted attributes don't have an “Alias” for
-    assigning a custom name.</li>
-  <li data-list-item-id="e7ec69af7257cfe86e14bb803910872b4">Both “Single value” and “Multi value” attributes are supported. In case
-    of multi-value, a badge is displayed for every instance of the attribute.</li>
-  <li
-  data-list-item-id="e810a5dbe56db7e59f9091e45c545a611">All label types are supported, including dates, booleans and URLs.</li>
-    <li
-    data-list-item-id="e49414fe2d9d206692332cd7d7ff1d4c0">Relation attributes are also supported as well, showing a link with the
-      target note title and icon.</li>
-      <li data-list-item-id="e1c3fb07ae71ca498c04613917eca93d4">Currently, it's not possible to adjust which promoted attributes are displayed,
-        since all promoted attributes will be displayed (except the <code>board:groupBy</code> one).
-        There are plans to improve upon this being able to hide promoted attributes
-        individually.</li>
-</ul>
-<h3>Grouping by another label</h3>
 <p>By default, the label used to group the notes is <code>#status</code>.
   It is possible to use a different label if needed by defining a label named <code>#board:groupBy</code> with
-  the value being the attribute to use (with or without <code>#</code> attribute
+  the value being the attribute to use (without <code>#</code> attribute prefix).</p>
-  prefix).</p>
+<aside
-<h3>Grouping by relations</h3>
+class="admonition note">
-<figure class="image image-style-align-right">
+  <p>It's currently not possible to set a relation as the grouping criteria.
-  <img style="aspect-ratio:535/245;" src="1_Kanban Board_image.png"
+    There are plans to add support for it.</p>
-  width="535" height="245">
+  </aside>
-</figure>
+  <h2>Limitations</h2>
-<p>A more advanced use-case is grouping by <a href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_Cq5X6iKQop6R">Relations</a>.</p>
+  <ul>
-<p>During this mode:</p>
+    <li>It is not possible yet to use group by a relation, only by label.</li>
-<ul>
+  </ul>
-  <li data-list-item-id="e597b9ecddfae34bb858559de09ee1f6a">The columns represent the <em>target notes</em> of a relation.</li>
-  <li data-list-item-id="eb59f890b2223d7f3f43e7ebae747002d">When creating a new column, a note is selected instead of a column name.</li>
-  <li
-  data-list-item-id="e566f9ab556f5c47b00ce0854def37bea">The column icon will match the target note.</li>
-    <li data-list-item-id="e43d3786e7e6590a003f16f3eb437bba5">Moving notes between columns will change its relation.</li>
-    <li data-list-item-id="e5c2a414d0c80f0d1a67066078c7a4f79">Renaming an existing column will change the target note of all the notes
-      in that column.</li>
-</ul>
-<p>Using relations instead of labels has some benefits:</p>
-<ul>
-  <li data-list-item-id="e580344f5638c09e80f566dc789db656a">The status/grouping of the notes is visible outside the Kanban board,
-    for example on the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/KSZ04uQ2D1St/_help_bdUJEHsAPYQR">Note Map</a>.</li>
-  <li
-  data-list-item-id="e1d59fe7873950babd8e1f3dbcb913e1a">Columns can have icons.</li>
-    <li data-list-item-id="e9933195c1f7708326f434321482cd917">Renaming columns is less intensive since it simply involves changing the
-      note title of the target note instead of having to do a bulk rename.</li>
-</ul>
-<p>To do so:</p>
-<ol>
-  <li data-list-item-id="e66855292cf2639a13ecd642482681653">First, create a Kanban board from scratch and not a template:</li>
-  <li
-  data-list-item-id="eaf16b94767674ca24de65ae102b84fc7">Assign <code>#viewType=board #hidePromotedAttributes</code> to emulate the
-    default template.</li>
-    <li data-list-item-id="e861d2859085e0dba83a44946fdc67c32">Set <code>#board:groupBy</code> to the name of a relation to group by, <strong>including the </strong><code><strong>~</strong></code><strong> prefix</strong> (e.g. <code>~status</code>).</li>
-    <li
-    data-list-item-id="efd300f3e766d485e28b7c8fd0a73364c">
-      <p>Optionally, use&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/zEY4DaJG4YT5/_help_OFXdgB2nNk1F">Promoted Attributes</a>&nbsp;for
-        easy status change within the note:</p><pre><code class="language-text-x-trilium-auto">#relation:status(inheritable)="promoted,alias=Status,single"</code></pre>
-      </li>
-</ol>

apps/server/src/services/tree.spec.ts

@@ -5,7 +5,6 @@ import BBranch from "../becca/entities/bbranch.js";
 import BNote from "../becca/entities/bnote.js";
 import tree from "./tree.js";
 import cls from "./cls.js";
-import { buildNote } from "../test/becca_easy_mocking.js";
 
 describe("Tree", () => {
     let rootNote!: NoteBuilder;
@@ -74,43 +73,4 @@ describe("Tree", () => {
             expect(order).toStrictEqual(expectedOrder);
         }
     });
-
-    it("pins to the top and bottom", () => {
-        const note = buildNote({
-            children: [
-                { title: "bottom", "#bottom": "" },
-                { title: "5" },
-                { title: "3" },
-                { title: "2" },
-                { title: "1" },
-                { title: "top", "#top": "" }
-            ],
-            "#sorted": ""
-        });
-        cls.init(() => {
-            tree.sortNotesIfNeeded(note.noteId);
-        });
-        const orderedTitles = note.children.map((child) => child.title);
-        expect(orderedTitles).toStrictEqual([ "top", "1", "2", "3", "5", "bottom" ]);
-    });
-
-    it("pins to the top and bottom in reverse order", () => {
-        const note = buildNote({
-            children: [
-                { title: "bottom", "#bottom": "" },
-                { title: "1" },
-                { title: "2" },
-                { title: "3" },
-                { title: "5" },
-                { title: "top", "#top": "" }
-            ],
-            "#sorted": "",
-            "#sortDirection": "desc"
-        });
-        cls.init(() => {
-            tree.sortNotesIfNeeded(note.noteId);
-        });
-        const orderedTitles = note.children.map((child) => child.title);
-        expect(orderedTitles).toStrictEqual([ "top", "5", "3", "2", "1", "bottom" ]);
-    });
 });

apps/server/src/services/tree.ts

@@ -136,8 +136,8 @@ function sortNotes(parentNoteId: string, customSortBy: string = "title", reverse
             const topBEl = fetchValue(b, "top");
 
             if (topAEl !== topBEl) {
-                if (topAEl === null) return reverse ? -1 : 1;
+                if (topAEl === null) return 1;
-                if (topBEl === null) return reverse ? 1 : -1;
+                if (topBEl === null) return -1;
 
                 // since "top" should not be reversible, we'll reverse it once more to nullify this effect
                 return compare(topAEl, topBEl) * (reverse ? -1 : 1);
@@ -147,8 +147,8 @@ function sortNotes(parentNoteId: string, customSortBy: string = "title", reverse
             const bottomBEl = fetchValue(b, "bottom");
 
             if (bottomAEl !== bottomBEl) {
-                if (bottomAEl === null) return reverse ? 1 : -1;
+                if (bottomAEl === null) return -1;
-                if (bottomBEl === null) return reverse ? -1 : 1;
+                if (bottomBEl === null) return 1;
 
                 // since "bottom" should not be reversible, we'll reverse it once more to nullify this effect
                 return compare(bottomBEl, bottomAEl) * (reverse ? -1 : 1);

apps/server/src/services/window.ts

@@ -342,11 +342,8 @@ async function registerGlobalShortcuts() {
                             return;
                         }
 
-                        if (action.actionName === "toggleTray") {
+                        // window may be hidden / not in focus
-                            targetWindow.focus();
-                        } else {
                         showAndFocusWindow(targetWindow);
-                        }
 
                         targetWindow.webContents.send("globalShortcut", action.actionName);
                     })

apps/website/package.json

@@ -14,7 +14,7 @@
 		"preact": "10.27.2",
 		"preact-iso": "2.11.0",
 		"preact-render-to-string": "6.6.3",
-		"react-i18next": "16.3.3"
+		"react-i18next": "16.3.1"
 	},
 	"devDependencies": {
 		"@preact/preset-vite": "2.10.2",

apps/website/src/translations/ko/translation.json

@@ -1,20 +1,6 @@
 {
     "hero_section": {
         "github": "깃허브",
-        "dockerhub": "도커 허브",
+        "dockerhub": "도커 허브"
-        "get_started": "시작하기",
-        "title": "생각을 정리하고, 개인 지식 기반을 구축하세요.",
-        "subtitle": "Trilium은 개인 지식 베이스를 정리하고 노트를 작성하는 오픈소스 솔루션입니다. 데스크톱에서 로컬로 사용하거나, 자체 호스팅 서버와 동기화하여 어디에서나 노트를 보관할 수 있습니다.",
-        "screenshot_alt": "Trilium Notes 데스크톱 애플리케이션의 스크린샷"
-    },
-    "get-started": {
-        "title": "시작하기",
-        "desktop_title": "데스크탑 애플리케이션 내려받기 (v{{version}})",
-        "older_releases": "오래된 릴리즈 보기",
-        "architecture": "아키텍쳐:",
-        "server_title": "여러 기기에서 액세스할 수 있는 서버 설정"
-    },
-    "download_now": {
-        "text": "지금 내려받기 "
     }
 }

docs/Developer Guide/!!!meta.json

@@ -1,6 +1,6 @@
 {
     "formatVersion": 2,
-    "appVersion": "0.99.5",
+    "appVersion": "0.99.4",
     "files": [
         {
             "isClone": false,
@@ -110,13 +110,6 @@
                     "type": "text",
                     "mime": "text/html",
                     "attributes": [
-                        {
-                            "type": "relation",
-                            "name": "internalLink",
-                            "value": "4nwtTJyjNDKd",
-                            "isInheritable": false,
-                            "position": 10
-                        },
                         {
                             "type": "label",
                             "name": "iconClass",
@@ -124,6 +117,13 @@
                             "isInheritable": false,
                             "position": 20
                         },
+                        {
+                            "type": "relation",
+                            "name": "internalLink",
+                            "value": "4nwtTJyjNDKd",
+                            "isInheritable": false,
+                            "position": 30
+                        },
                         {
                             "type": "label",
                             "name": "shareAlias",
@@ -1260,19 +1260,12 @@
                             "type": "text",
                             "mime": "text/html",
                             "attributes": [
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "ccIoz7nqgDRK",
-                                    "isInheritable": false,
-                                    "position": 10
-                                },
                                 {
                                     "type": "relation",
                                     "name": "internalLink",
                                     "value": "zdQzavvHDl1k",
                                     "isInheritable": false,
-                                    "position": 20
+                                    "position": 10
                                 },
                                 {
                                     "type": "label",
@@ -1287,6 +1280,13 @@
                                     "value": "releasing",
                                     "isInheritable": false,
                                     "position": 40
+                                },
+                                {
+                                    "type": "relation",
+                                    "name": "internalLink",
+                                    "value": "ccIoz7nqgDRK",
+                                    "isInheritable": false,
+                                    "position": 50
                                 }
                             ],
                             "format": "markdown",

docs/Developer Guide/Developer Guide/Documentation.md

@@ -1,5 +1,5 @@
 # Documentation
-There are multiple types of documentation for Trilium:<img class="image-style-align-right" src="api/images/cJTTOrI5C1jn/Documentation_image.png" width="205" height="162">
+There are multiple types of documentation for Trilium:<img class="image-style-align-right" src="api/images/E6pFkO6VwPFI/Documentation_image.png" width="205" height="162">
 
 *   The _User Guide_ represents the user-facing documentation. This documentation can be browsed by users directly from within Trilium, by pressing <kbd>F1</kbd>.
 *   The _Developer's Guide_ represents a set of Markdown documents that present the internals of Trilium, for developers.

docs/README-ko.md

@@ -9,7 +9,7 @@
 
 <hr />
 
-# 트릴리움 노트
+# Trilium Notes
 
 ![GitHub Sponsors](https://img.shields.io/github/sponsors/eliandoran)
 ![LiberaPay patrons](https://img.shields.io/liberapay/patrons/ElianDoran)\
@@ -20,32 +20,36 @@ releases)](https://img.shields.io/github/downloads/triliumnext/trilium/total)\
 [![Translation
 status](https://hosted.weblate.org/widget/trilium/svg-badge.svg)](https://hosted.weblate.org/engage/trilium/)
 
-[영어](./README.md) | [중국어 (간체)](./docs/README-ZH_CN.md) | [중국어
+[English](./README.md) | [Chinese (Simplified)](./docs/README-ZH_CN.md) |
-(번체)](./docs/README-ZH_TW.md) | [러시아어](./docs/README-ru.md) |
+[Chinese (Traditional)](./docs/README-ZH_TW.md) | [Russian](./docs/README-ru.md)
-[일본어](./docs/README-ja.md) | [이탈리아어](./docs/README-it.md) |
+| [Japanese](./docs/README-ja.md) | [Italian](./docs/README-it.md) |
-[스페인어](./docs/README-es.md)
+[Spanish](./docs/README-es.md)
 
-Trilium Notes는 대규모 개인 지식 기반 구축에 중점을 둔 무료 오픈 소스 크로스 플랫폼 계층적 메모 작성 애플리케이션입니다.
+Trilium Notes is a free and open-source, cross-platform hierarchical note taking
+application with focus on building large personal knowledge bases.
 
 See [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) for
 quick overview:
 
 <a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="./docs/app.png" alt="Trilium Screenshot" width="1000"></a>
 
-## ⏬ 내려받기
+## ⏬ Download
-- [최신 릴리스](https://github.com/TriliumNext/Trilium/releases/latest) – 안정된 버전으로
+- [Latest release](https://github.com/TriliumNext/Trilium/releases/latest) –
-  대부분의 사용자에게 권장됩니다.
+  stable version, recommended for most users.
-- [야간 빌드](https://github.com/TriliumNext/Trilium/releases/tag/nightly) – 불안정한 개발
+- [Nightly build](https://github.com/TriliumNext/Trilium/releases/tag/nightly) –
-  버전으로, 최신 기능과 수정 사항이 매일 업데이트됩니다.
+  unstable development version, updated daily with the latest features and
+  fixes.
 
-## 📚 문서
+## 📚 Documentation
 
-**[docs.triliumnotes.org](https://docs.triliumnotes.org/)에서 포괄적인 문서를 방문하세요**
+**Visit our comprehensive documentation at
+[docs.triliumnotes.org](https://docs.triliumnotes.org/)**
 
-저희 문서는 다양한 형식으로 제공됩니다.
+Our documentation is available in multiple formats:
-- **온라인 문서**: [docs.triliumnotes.org](https://docs.triliumnotes.org/)에서 모든 문서를
+- **Online Documentation**: Browse the full documentation at
-  보여줍니다
+  [docs.triliumnotes.org](https://docs.triliumnotes.org/)
-- **도움말**: 트릴리움 어플리케이션에서 `F1` 버튼을 눌러 같은 문서를 직접 볼 수 있습니다
+- **In-App Help**: Press `F1` within Trilium to access the same documentation
+  directly in the application
 - **GitHub**: Navigate through the [User
   Guide](./docs/User%20Guide/User%20Guide/) in this repository
 
@@ -129,7 +133,7 @@ related goodies:
   themes, scripts, plugins and more.
 - [TriliumRocks!](https://trilium.rocks/) for tutorials, guides, and much more.
 
-## ❓왜 TriliumNext일까?
+## ❓Why TriliumNext?
 
 The original Trilium developer ([Zadam](https://github.com/zadam)) has
 graciously given the Trilium repository to the community project which resides
@@ -165,7 +169,7 @@ features, suggestions, or issues you may have!
 
 ## 🏗 Installation
 
-### 윈도우 / 맥OS
+### Windows / MacOS
 
 Download the binary release for your platform from the [latest release
 page](https://github.com/TriliumNext/Trilium/releases/latest), unzip the package
@@ -193,7 +197,7 @@ interface (which is almost identical to the desktop app).
 Currently only the latest versions of Chrome & Firefox are supported (and
 tested).
 
-### 모바일
+### Mobile
 
 To use TriliumNext on a mobile device, you can use a mobile web browser to
 access the mobile interface of a server installation (see below).
@@ -208,7 +212,7 @@ repository](https://github.com/FliegendeWurst/TriliumDroid). Note: It is best to
 disable automatic updates on your server installation (see below) when using
 TriliumDroid since the sync version must match between Trilium and TriliumDroid.
 
-### 서버
+### Server
 
 To install TriliumNext on your own server (including via Docker from
 [Dockerhub](https://hub.docker.com/r/triliumnext/trilium)) follow [the server
@@ -259,9 +263,8 @@ pnpm install
 pnpm run --filter desktop electron-forge:make --arch=x64 --platform=win32
 ```
 
-자세한 내용은 [development
+For more details, see the [development
-docs](https://github.com/TriliumNext/Trilium/tree/main/docs/Developer%20Guide/Developer%20Guide)를
+docs](https://github.com/TriliumNext/Trilium/tree/main/docs/Developer%20Guide/Developer%20Guide).
-참고하세요.
 
 ### Developer Documentation
 

docs/Release Notes/!!!meta.json

@@ -1,6 +1,6 @@
 {
     "formatVersion": 2,
-    "appVersion": "0.99.5",
+    "appVersion": "0.99.4",
     "files": [
         {
             "isClone": false,

docs/User Guide/!!!meta.json

@@ -1,6 +1,6 @@
 {
     "formatVersion": 2,
-    "appVersion": "0.99.5",
+    "appVersion": "0.99.4",
     "files": [
         {
             "isClone": false,
@@ -9884,69 +9884,18 @@
                                     "value": "kanban-board",
                                     "isInheritable": false,
                                     "position": 20
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "Cq5X6iKQop6R",
-                                    "isInheritable": false,
-                                    "position": 30
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "OFXdgB2nNk1F",
-                                    "isInheritable": false,
-                                    "position": 40
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "bdUJEHsAPYQR",
-                                    "isInheritable": false,
-                                    "position": 50
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "oPVyFC7WL2Lp",
-                                    "isInheritable": false,
-                                    "position": 60
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "IakOLONlIfGI",
-                                    "isInheritable": false,
-                                    "position": 70
                                 }
                             ],
                             "format": "markdown",
                             "dataFileName": "Kanban Board.md",
                             "attachments": [
-                                {
-                                    "attachmentId": "3ze7RpkjIWdW",
-                                    "title": "image.png",
-                                    "role": "image",
-                                    "mime": "image/png",
-                                    "position": 10,
-                                    "dataFileName": "Kanban Board_image.png"
-                                },
-                                {
-                                    "attachmentId": "IrIeh59VGjHq",
-                                    "title": "image.png",
-                                    "role": "image",
-                                    "mime": "image/png",
-                                    "position": 10,
-                                    "dataFileName": "1_Kanban Board_image.png"
-                                },
                                 {
                                     "attachmentId": "usSSa0WI6dDK",
                                     "title": "image.png",
                                     "role": "image",
                                     "mime": "image/png",
                                     "position": 10,
-                                    "dataFileName": "2_Kanban Board_image.png"
+                                    "dataFileName": "Kanban Board_image.png"
                                 }
                             ]
                         },
@@ -10034,20 +9983,6 @@
                                     "value": "geomap",
                                     "isInheritable": false,
                                     "position": 90
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "zEY4DaJG4YT5",
-                                    "isInheritable": false,
-                                    "position": 100
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "OFXdgB2nNk1F",
-                                    "isInheritable": false,
-                                    "position": 110
                                 }
                             ],
                             "format": "markdown",
@@ -11271,27 +11206,6 @@
                                     "value": "bx bx-list-check",
                                     "isInheritable": false,
                                     "position": 110
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "oPVyFC7WL2Lp",
-                                    "isInheritable": false,
-                                    "position": 120
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "eIg8jdvaoNNd",
-                                    "isInheritable": false,
-                                    "position": 130
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "CdNpE2pqjmI6",
-                                    "isInheritable": false,
-                                    "position": 140
                                 }
                             ],
                             "format": "markdown",
@@ -11756,71 +11670,27 @@
                                             "name": "iconClass",
                                             "value": "bx bx-table",
                                             "isInheritable": false,
-                                            "position": 20
+                                            "position": 40
-                                        },
-                                        {
-                                            "type": "relation",
-                                            "name": "internalLink",
-                                            "value": "BlN9DFI679QC",
-                                            "isInheritable": false,
-                                            "position": 50
-                                        },
-                                        {
-                                            "type": "relation",
-                                            "name": "internalLink",
-                                            "value": "GTwFsgaA0lCt",
-                                            "isInheritable": false,
-                                            "position": 60
-                                        },
-                                        {
-                                            "type": "relation",
-                                            "name": "internalLink",
-                                            "value": "zP3PMqaG71Ct",
-                                            "isInheritable": false,
-                                            "position": 70
-                                        },
-                                        {
-                                            "type": "relation",
-                                            "name": "internalLink",
-                                            "value": "R9pX4DGra2Vt",
-                                            "isInheritable": false,
-                                            "position": 80
                                         }
                                     ],
                                     "format": "markdown",
                                     "dataFileName": "Promoted Attributes.md",
                                     "attachments": [
                                         {
-                                            "attachmentId": "8ue55DaAJ82K",
+                                            "attachmentId": "4EcBRWF9iCk2",
                                             "title": "image.png",
                                             "role": "image",
-                                            "mime": "image/png",
+                                            "mime": "image/jpg",
                                             "position": 10,
                                             "dataFileName": "Promoted Attributes_image.png"
                                         },
                                         {
-                                            "attachmentId": "bLMPNRtMAaKo",
+                                            "attachmentId": "Txf5Jdm2vqt2",
-                                            "title": "image.png",
+                                            "title": "promoted-attributes.png",
                                             "role": "image",
                                             "mime": "image/png",
                                             "position": 10,
-                                            "dataFileName": "1_Promoted Attributes_image.png"
+                                            "dataFileName": "Promoted Attributes_promot.png"
-                                        },
-                                        {
-                                            "attachmentId": "FbNQB8xcY0Nu",
-                                            "title": "image.png",
-                                            "role": "image",
-                                            "mime": "image/png",
-                                            "position": 10,
-                                            "dataFileName": "2_Promoted Attributes_image.png"
-                                        },
-                                        {
-                                            "attachmentId": "yBIe1DyxuL2e",
-                                            "title": "image.png",
-                                            "role": "image",
-                                            "mime": "image/png",
-                                            "position": 10,
-                                            "dataFileName": "3_Promoted Attributes_image.png"
                                         }
                                     ]
                                 }

docs/User Guide/User Guide/Advanced Usage/Attributes.md

@@ -12,30 +12,19 @@ In Trilium, attributes are key-value pairs assigned to notes, providing addition
 
 These attributes play a crucial role in organizing, categorizing, and enhancing the functionality of notes.
 
-## Types of attributes
-
-Conceptually there are two types of attributes (applying to both labels and relations):
-
-1.  **System attributes**  
-    As the name suggest, these attributes have a special meaning since they are interpreted by Trilium. For example the `color` attribute will change the color of the note as displayed in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a> and links, and `iconClass` will change the icon of a note.
-2.  **User-defined attributes**  
-    These are free-form labels or relations that can be used by the user. They can be used purely for categorization purposes (especially if combined with <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Navigation/Search.md">Search</a>), or they can be given meaning through the use of <a class="reference-link" href="../Scripting.md">Scripting</a>.
-
-In practice, Trilium makes no direct distinction of whether an attribute is a system one or a user-defined one. A label or relation is considered a system attribute if it matches one of the built-in names (e.g. like the aforementioned `iconClass`). Keep this in mind when creating  <a class="reference-link" href="Attributes/Promoted%20Attributes.md">Promoted Attributes</a> in order not to accidentally alter a system attribute (unless intended).
-
 ## Viewing the list of attributes
 
 Both the labels and relations for the current note are displayed in the _Owned Attributes_ section of the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Ribbon.md">Ribbon</a>, where they can be viewed and edited. Inherited attributes are displayed in the _Inherited Attributes_ section of the ribbon, where they can only be viewed.
 
 In the list of attributes, labels are prefixed with the `#` character whereas relations are prefixed with the `~` character.
 
-## Attribute Definitions and Promoted Attributes
-
-<a class="reference-link" href="Attributes/Promoted%20Attributes.md">Promoted Attributes</a> create a form-like editing experience for attributes, which makes it easy to enhancing the organization and management of attributes
-
 ## Multiplicity
 
-Attributes in Trilium can be "multi-valued", meaning multiple attributes with the same name can co-exist. This can be combined with <a class="reference-link" href="Attributes/Promoted%20Attributes.md">Promoted Attributes</a> to easily add them.
+Attributes in Trilium can be "multi-valued", meaning multiple attributes with the same name can co-exist.
+
+## Attribute Definitions and Promoted Attributes
+
+Special labels create "label/attribute" definitions, enhancing the organization and management of attributes. For more details, see <a class="reference-link" href="Attributes/Promoted%20Attributes.md">Promoted Attributes</a>.
 
 ## Attribute Inheritance
 

docs/User Guide/User Guide/Advanced Usage/Attributes/Promoted Attributes.md

@@ -1,74 +1,31 @@
 # Promoted Attributes
-<figure class="image image_resized" style="width:61.4%;"><img style="aspect-ratio:938/368;" src="Promoted Attributes_image.png" width="938" height="368"></figure>
+Promoted attributes are [attributes](../Attributes.md) which are considered important and thus are "promoted" onto the main note UI. See example below:
 
-Promoted attributes are [attributes](../Attributes.md) which are displayed prominently in the UI which allow them to be easily viewed and edited.
+![](Promoted%20Attributes_promot.png)
 
-One way of seeing promoted attributes is as a kind of form with several fields. Each field is just regular attribute, the only difference is that they appear on the note itself.
+You can see the note having kind of form with several fields. Each of these is just regular attribute, the only difference is that they appear on the note itself.
 
 Attributes can be pretty useful since they allow for querying and script automation etc. but they are also inconveniently hidden. This allows you to select few of the important ones and push them to the front of the user.
 
+Now, how do we make attribute to appear on the UI?
+
 ## Attribute definition
 
-In order to have promoted attributes, there needs to be a way to define them.
+Attribute is always name-value pair where both name and value are strings.
 
-<figure class="image image-style-align-right image_resized" style="width:38.82%;"><img style="aspect-ratio:492/346;" src="1_Promoted Attributes_image.png" width="492" height="346"></figure>
+_Attribute definition_ specifies how should this value be interpreted - is it just string, or is it a date? Should we allow multiple values or note? And importantly, should we _promote_ the attribute or not?
 
-Technically, attributes are only name-value pairs where both name and value are strings.
+![](Promoted%20Attributes_image.png)
 
-The _Attribute definition_ specifies how should this value be interpreted:
+You can notice tag attribute definition. These "definition" attributes define how the "value" attributes should behave.
 
-*   Is it just string, or is it a date?
+So there's one attribute for value and one for definition. But notice how definition attribute is [Inheritable](Attribute%20Inheritance.md), meaning that it's also applied to all descendant note. So in a way, this definition is used for the whole subtree while "value" attributes are applied only for this note.
-*   Should we allow multiple values or note?
-*   Should we _promote_ the attribute or not?
-
-## Creating a new promoted attribute definition
-
-To create a new promoted attribute:
-
-1.  Go to a note.
-2.  Go to _Owned Attributes_ in the <a class="reference-link" href="../../Basic%20Concepts%20and%20Features/UI%20Elements/Ribbon.md">Ribbon</a>.
-3.  Press the + button.
-4.  Select either _Add new label definition_ or _Add new relation definition_.
-5.  Select the name which will be name of the label or relation that will be created when the promoted attribute is edited.
-6.  Ensure _Promoted_ is checked in order to display it at the top of notes.
-7.  Optionally, choose an _Alias_ which will be displayed next to the promoted attribute instead of the attribute name. Generally it's best to choose a “user-friendly” name since it can contain spaces and other characters which are not supported as attribute names.
-8.  Check _Inheritable_ to apply it to this note and all its descendants. To keep it only for the current note, un-check it.
-9.  Press “Save & Close” to apply the changes.
-
-## How attribute definitions actually work
-
-When a new promoted attribute definition is created, it creates a corresponding label prefixed with either `label` or `relation`, depending on the definition type:
-
-```
-#label:myColor(inheritable)="promoted,alias=Color,multi,color"
-```
-
-The only purpose of the attribute definition is to set up a template. If the attribute was marked as promoted, then it's also displayed to the user for easy editing.
-
-|     |     |
-| --- | --- |
-| <figure class="image"><img style="aspect-ratio:495/157;" src="2_Promoted Attributes_image.png" width="495" height="157"></figure> | Notice how the promoted attribute definition only creates a “Due date” box above the text content. |
-| <figure class="image"><img style="aspect-ratio:663/160;" src="3_Promoted Attributes_image.png" width="663" height="160"></figure> | Once a value is set by the user, a new label (or relation, depending on the type) is created. The name of the attribute matches one set when creating the promoted attribute. |
-
-So there's one attribute for value and one for definition. But notice how an definition attribute can be made [Inheritable](Attribute%20Inheritance.md), meaning that it's also applied to all descendant notes. In this case, the definition used for the whole sub-tree while "value" attributes are for each not individually.
-
-## Using system attributes
-
-It's possible to create promoted attributes out of system attributes, to be able to easily alter them.
-
-Here are a few practical examples:
-
-*   <a class="reference-link" href="../../Collections.md">Collections</a> already make use of this practice, for example:
-    *   Calendars add “Start Date”, “End Date”, “Start Time” and “End Time” as promoted attributes. These map to system attributes such as `startDate` which are then interpreted by the calendar view.
-    *   <a class="reference-link" href="../../Collections/Presentation.md">Presentation</a> adds a “Background” promoted attribute for each of the slide to easily be able to customize.
-*   The Trilium documentation (which is edited in Trilium) uses a promoted attribute to be able to easily edit the `#shareAlias` (see <a class="reference-link" href="../Sharing.md">Sharing</a>) in order to form clean URLs.
-*   If you always edit a particular system attribute such as `#color`, simply create a promoted attribute for it to make it easier.
 
 ### Inverse relation
 
 Some relations always occur in pairs - my favorite example is on the family. If you have a note representing husband and note representing wife, then there might be a relation between those two of `isPartnerOf`. This is bidirectional relationship - meaning that if a relation is pointing from husband to wife then there should be always another relation pointing from wife to husband.
 
-Another example is with parent-child relationship. Again these always occur in pairs, but in this case it's not exact same relation - the one going from parent to child might be called `isParentOf` and the other one going from child to parent might be called `isChildOf`.
+Another example is with parent - child relationship. Again these always occur in pairs, but in this case it's not exact same relation - the one going from parent to child might be called `isParentOf` and the other one going from child to parent might be called `isChildOf`.
 
 Relation definition allows you to specify such "inverse relation" - for the relation you just define you specify which is the inverse relation. Note that in the second example we should have two relation definitions - one for `isParentOf` which defines `isChildOf` as inverse relation and then second relation definition for `isChildOf` which defines `isParentOf` as inverse relation.
 

docs/User Guide/User Guide/Collections/Geo Map.md

@@ -1,6 +1,6 @@
 # Geo Map
 > [!IMPORTANT]
-> <a class="reference-link" href="../Advanced%20Usage/Attributes.md">Attributes</a><a class="reference-link" href="../Advanced%20Usage/Attributes/Promoted%20Attributes.md">Promoted Attributes</a><a class="reference-link" href="../Advanced%20Usage/Attributes.md">Attributes</a>Starting with Trilium v0.97.0, the geo map has been converted from a standalone [note type](../Note%20Types.md) to a type of view for the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List.md">Note List</a>. 
+> Starting with Trilium v0.97.0, the geo map has been converted from a standalone [note type](../Note%20Types.md) to a type of view for the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/Notes/Note%20List.md">Note List</a>. 
 
 <figure class="image image-style-align-center"><img style="aspect-ratio:892/675;" src="9_Geo Map_image.png" width="892" height="675"></figure>
 
@@ -26,8 +26,8 @@ The position on the map and the zoom are saved inside the map note and restored
 
 |     |     |     |
 | --- | --- | --- |
-| 1   | To create a marker, first navigate to the desired point on the map. Then press the ![](10_Geo%20Map_image.png) button in the [Floating buttons](../Basic%20Concepts%20and%20Features/UI%20Elements/Floating%20buttons.md) (top-right) area.      <br>  <br>If the button is not visible, make sure the button section is visible by pressing the chevron button (![](17_Geo%20Map_image.png)) in the top-right of the map. |     |
+| 1   | To create a marker, first navigate to the desired point on the map. Then press the ![](10_Geo%20Map_image.png) button in the [Floating buttons](../Basic%20Concepts%20and%20Features/UI%20Elements/Floating%20buttons.md) (top-right) area.     <br>  <br>If the button is not visible, make sure the button section is visible by pressing the chevron button (![](17_Geo%20Map_image.png)) in the top-right of the map. |     |
-| 2   | <img class="image_resized" style="aspect-ratio:1730/416;width:100%;" src="2_Geo Map_image.png" width="1730" height="416"> | Once pressed, the map will enter in the insert mode, as illustrated by the notification.         <br>  <br>Simply click the point on the map where to place the marker, or the Escape key to cancel. |
+| 2   | <img class="image_resized" style="aspect-ratio:1730/416;width:100%;" src="2_Geo Map_image.png" width="1730" height="416"> | Once pressed, the map will enter in the insert mode, as illustrated by the notification.        <br>  <br>Simply click the point on the map where to place the marker, or the Escape key to cancel. |
 | 3   | <img class="image_resized" style="aspect-ratio:1586/404;width:100%;" src="7_Geo Map_image.png" width="1586" height="404"> | Enter the name of the marker/note to be created. |
 | 4   | <img class="image_resized" style="aspect-ratio:1696/608;width:100%;" src="16_Geo Map_image.png" width="1696" height="608"> | Once confirmed, the marker will show up on the map and it will also be displayed as a child note of the map. |
 
@@ -35,7 +35,7 @@ The position on the map and the zoom are saved inside the map note and restored
 
 1.  Right click anywhere on the map, where to place the newly created marker (and corresponding note).
 2.  Select _Add a marker at this location_.
-3.  Enter the name of the ne<a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a>wly created note.
+3.  Enter the name of the newly created note.
 4.  The map should be updated with the new marker.
 
 ### Adding an existing note on note from the note tree
@@ -109,7 +109,7 @@ The value of the attribute is made up of the latitude and longitude separated by
 
 |     |     |     |
 | --- | --- | --- |
-| 1   | <figure class="image image-style-align-center image_resized" style="width:56.84%;"><img style="aspect-ratio:732/918;" src="12_Geo Map_image.png" width="732" height="918"></figure> | Go to Google Maps on the web and look for a desired location, right click on it and a context menu will show up.         <br>  <br>Simply click on the first item displaying the coordinates and they will be copied to clipboard.         <br>  <br>Then paste the value inside the text box into the `#geolocation` attribute of a child note of the map (don't forget to surround the value with a `"` character). |
+| 1   | <figure class="image image-style-align-center image_resized" style="width:56.84%;"><img style="aspect-ratio:732/918;" src="12_Geo Map_image.png" width="732" height="918"></figure> | Go to Google Maps on the web and look for a desired location, right click on it and a context menu will show up.        <br>  <br>Simply click on the first item displaying the coordinates and they will be copied to clipboard.        <br>  <br>Then paste the value inside the text box into the `#geolocation` attribute of a child note of the map (don't forget to surround the value with a `"` character). |
 | 2   | <figure class="image image-style-align-center image_resized" style="width:100%;"><img style="aspect-ratio:518/84;" src="4_Geo Map_image.png" width="518" height="84"></figure> | In Trilium, create a child note under the map. |
 | 3   | <figure class="image image-style-align-center image_resized" style="width:100%;"><img style="aspect-ratio:1074/276;" src="11_Geo Map_image.png" width="1074" height="276"></figure> | And then go to Owned Attributes and type `#geolocation="`, then paste from the clipboard as-is and then add the ending `"` character. Press Enter to confirm and the map should now be updated to contain the new note. |
 
@@ -120,7 +120,7 @@ Similarly to the Google Maps approach:
 |     |     |     |
 | --- | --- | --- |
 | 1   | <img class="image_resized" style="aspect-ratio:562/454;width:100%;" src="1_Geo Map_image.png" width="562" height="454"> | Go to any location on openstreetmap.org and right click to bring up the context menu. Select the “Show address” item. |
-| 2   | <img class="image_resized" style="aspect-ratio:696/480;width:100%;" src="Geo Map_image.png" width="696" height="480"> | The address will be visible in the top-left of the screen, in the place of the search bar.         <br>  <br>Select the coordinates and copy them into the clipboard. |
+| 2   | <img class="image_resized" style="aspect-ratio:696/480;width:100%;" src="Geo Map_image.png" width="696" height="480"> | The address will be visible in the top-left of the screen, in the place of the search bar.        <br>  <br>Select the coordinates and copy them into the clipboard. |
 | 3   | <img class="image_resized" style="aspect-ratio:640/276;width:100%;" src="5_Geo Map_image.png" width="640" height="276"> | Simply paste the value inside the text box into the `#geolocation` attribute of a child note of the map and then it should be displayed on the map. |
 
 ## Adding GPS tracks (.gpx)
@@ -131,7 +131,7 @@ Trilium has basic support for displaying GPS tracks on the geo map.
 | --- | --- | --- |
 | 1   | <figure class="image image-style-align-center"><img style="aspect-ratio:226/74;" src="3_Geo Map_image.png" width="226" height="74"></figure> | To add a track, simply drag & drop a .gpx file inside the geo map in the note tree. |
 | 2   | <figure class="image image-style-align-center"><img style="aspect-ratio:322/222;" src="14_Geo Map_image.png" width="322" height="222"></figure> | In order for the file to be recognized as a GPS track, it needs to show up as `application/gpx+xml` in the _File type_ field. |
-| 3   | <figure class="image image-style-align-center"><img style="aspect-ratio:620/530;" src="6_Geo Map_image.png" width="620" height="530"></figure> | When going back to the map, the track should now be visible.         <br>  <br>The start and end points of the track are indicated by the two blue markers. |
+| 3   | <figure class="image image-style-align-center"><img style="aspect-ratio:620/530;" src="6_Geo Map_image.png" width="620" height="530"></figure> | When going back to the map, the track should now be visible.        <br>  <br>The start and end points of the track are indicated by the two blue markers. |
 
 > [!NOTE]
 > The starting point of the track will be displayed as a marker, with the name of the note underneath. The start marker will also respect the icon and the `color` of the note. The end marker is displayed with a distinct icon.

docs/User Guide/User Guide/Collections/Kanban Board.md

@@ -1,5 +1,5 @@
 # Kanban Board
-<figure class="image"><img style="aspect-ratio:918/248;" src="2_Kanban Board_image.png" width="918" height="248"></figure>
+<figure class="image"><img style="aspect-ratio:918/248;" src="Kanban Board_image.png" width="918" height="248"></figure>
 
 The Board view presents sub-notes in columns for a Kanban-like experience. Each column represents a possible value for a status label, which can be adjusted.
 
@@ -41,20 +41,7 @@ Notes are displayed recursively, so even the child notes of the child notes will
     *   Delete the current note.
 *   If there are many notes within the column, move the mouse over the column and use the mouse wheel to scroll.
 
-### Working with the note tree
+## Keyboard interaction
-
-It's also possible to add items on the board using the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a>.
-
-1.  Select the desired note in the <a class="reference-link" href="../Basic%20Concepts%20and%20Features/UI%20Elements/Note%20Tree.md">Note Tree</a>.
-2.  Hold the mouse on the note and drag it to the to the desired column.
-
-This works for:
-
-*   Notes that are not children of the board, case in which a [clone](../Basic%20Concepts%20and%20Features/Notes/Cloning%20Notes.md) will be created.
-*   Notes that are children of the board, but not yet assigned on the board.
-*   Notes that are children of the board, case in which they will be moved to the new column.
-
-### Keyboard interaction
 
 The board view has mild support for keyboard-based navigation:
 
@@ -65,60 +52,13 @@ The board view has mild support for keyboard-based navigation:
 
 ## Configuration
 
-### Displaying custom attributes
+### Grouping by another attribute
 
-<figure class="image image-style-align-center"><img style="aspect-ratio:531/485;" src="Kanban Board_image.png" width="531" height="485"></figure>
+By default, the label used to group the notes is `#status`. It is possible to use a different label if needed by defining a label named `#board:groupBy` with the value being the attribute to use (without `#` attribute prefix).
 
-Note attributes can be displayed on the board to enhance it with custom information such as adding a Due date for your tasks.
+> [!NOTE]
+> It's currently not possible to set a relation as the grouping criteria. There are plans to add support for it.
 
-This feature works exclusively via attribute definitions (<a class="reference-link" href="../Advanced%20Usage/Attributes/Promoted%20Attributes.md">Promoted Attributes</a>). The easiest way to add these is:
+## Limitations
 
-1.  Go to board note.
+*   It is not possible yet to use group by a relation, only by label.
-2.  In the ribbon select _Owned Attributes_ → plus button → _Add new label/relation definition_.
-3.  Configure the attribute as desired.
-4.  Check _Inheritable_ to make it applicable to child notes automatically.
-
-After creating the attribute, click on a note and fill in the promoted attributes which should then reflect inside the board.
-
-Of note:
-
-*   Both promoted and non-promoted attribute definitions are supported. The only difference is that non-promoted attributes don't have an “Alias” for assigning a custom name.
-*   Both “Single value” and “Multi value” attributes are supported. In case of multi-value, a badge is displayed for every instance of the attribute.
-*   All label types are supported, including dates, booleans and URLs.
-*   Relation attributes are also supported as well, showing a link with the target note title and icon.
-*   Currently, it's not possible to adjust which promoted attributes are displayed, since all promoted attributes will be displayed (except the `board:groupBy` one). There are plans to improve upon this being able to hide promoted attributes individually.
-
-### Grouping by another label
-
-By default, the label used to group the notes is `#status`. It is possible to use a different label if needed by defining a label named `#board:groupBy` with the value being the attribute to use (with or without `#` attribute prefix).
-
-### Grouping by relations
-
-<figure class="image image-style-align-right"><img style="aspect-ratio:535/245;" src="1_Kanban Board_image.png" width="535" height="245"></figure>
-
-A more advanced use-case is grouping by [Relations](../Advanced%20Usage/Attributes/Relations.md).
-
-During this mode:
-
-*   The columns represent the _target notes_ of a relation.
-*   When creating a new column, a note is selected instead of a column name.
-*   The column icon will match the target note.
-*   Moving notes between columns will change its relation.
-*   Renaming an existing column will change the target note of all the notes in that column.
-
-Using relations instead of labels has some benefits:
-
-*   The status/grouping of the notes is visible outside the Kanban board, for example on the <a class="reference-link" href="../Note%20Types/Note%20Map.md">Note Map</a>.
-*   Columns can have icons.
-*   Renaming columns is less intensive since it simply involves changing the note title of the target note instead of having to do a bulk rename.
-
-To do so:
-
-1.  First, create a Kanban board from scratch and not a template:
-2.  Assign `#viewType=board #hidePromotedAttributes` to emulate the default template.
-3.  Set `#board:groupBy` to the name of a relation to group by, **including the** `**~**` **prefix** (e.g. `~status`).
-4.  Optionally, use <a class="reference-link" href="../Advanced%20Usage/Attributes/Promoted%20Attributes.md">Promoted Attributes</a> for easy status change within the note:
-    
-    ```
-    #relation:status(inheritable)="promoted,alias=Status,single"
-    ```

flake.nix

@@ -22,7 +22,7 @@
       let
         pkgs = import nixpkgs { inherit system; };
         electron = pkgs."electron_${lib.versions.major packageJsonDesktop.devDependencies.electron}";
-        nodejs = pkgs.nodejs_24;
+        nodejs = pkgs.nodejs_22;
         # pnpm creates an overly long PATH env variable for child processes.
         # This patch deduplicates entries in PATH, which results in an equivalent but shorter entry.
         # https://github.com/pnpm/pnpm/issues/6106
@@ -76,7 +76,7 @@
             preBuildCommands ? "",
           }:
           pnpm2nix.packages.${system}.mkPnpmPackage rec {
-            pname = "trilium-${app}";
+            pname = "triliumnext-${app}";
             version = packageJson.version + (lib.optionalString (self ? shortRev) "-${self.shortRev}");
 
             src = fullCleanSource ./.;

package.json

@@ -106,7 +106,7 @@
       "on-headers@<1.1.0": ">=1.1.0",
       "form-data@>=4.0.0 <4.0.4": ">=4.0.4",
       "form-data@>=3.0.0 <3.0.4": ">=3.0.4",
-      "node-abi": "4.24.0"
+      "node-abi": "4.17.0"
     },
     "ignoredBuiltDependencies": [
       "sqlite3"

packages/ckeditor5-admonition/package.json

@@ -23,7 +23,7 @@
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
     "@ckeditor/ckeditor5-inspector": ">=4.1.0",
-    "@ckeditor/ckeditor5-package-tools": "5.0.1",
+    "@ckeditor/ckeditor5-package-tools": "4.1.1",
     "@typescript-eslint/eslint-plugin": "~8.46.0",
     "@typescript-eslint/parser": "8.46.4",
     "@vitest/browser": "3.2.4",

packages/ckeditor5-footnotes/package.json

@@ -24,7 +24,7 @@
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
     "@ckeditor/ckeditor5-inspector": ">=4.1.0",
-    "@ckeditor/ckeditor5-package-tools": "5.0.1",
+    "@ckeditor/ckeditor5-package-tools": "4.1.1",
     "@typescript-eslint/eslint-plugin": "~8.46.0",
     "@typescript-eslint/parser": "8.46.4",
     "@vitest/browser": "3.2.4",

packages/ckeditor5-keyboard-marker/package.json

@@ -26,7 +26,7 @@
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
     "@ckeditor/ckeditor5-inspector": ">=4.1.0",
-    "@ckeditor/ckeditor5-package-tools": "5.0.1",
+    "@ckeditor/ckeditor5-package-tools": "4.1.1",
     "@typescript-eslint/eslint-plugin": "~8.46.0",
     "@typescript-eslint/parser": "8.46.4",
     "@vitest/browser": "3.2.4",

packages/ckeditor5-math/package.json

@@ -27,7 +27,7 @@
     "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
     "@ckeditor/ckeditor5-dev-utils": "43.1.0",
     "@ckeditor/ckeditor5-inspector": ">=4.1.0",
-    "@ckeditor/ckeditor5-package-tools": "5.0.1",
+    "@ckeditor/ckeditor5-package-tools": "4.1.1",
     "@typescript-eslint/eslint-plugin": "~8.46.0",
     "@typescript-eslint/parser": "8.46.4",
     "@vitest/browser": "3.2.4",

packages/ckeditor5-mermaid/package.json

@@ -26,7 +26,7 @@
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
     "@ckeditor/ckeditor5-inspector": ">=4.1.0",
-    "@ckeditor/ckeditor5-package-tools": "5.0.1",
+    "@ckeditor/ckeditor5-package-tools": "4.1.1",
     "@typescript-eslint/eslint-plugin": "~8.46.0",
     "@typescript-eslint/parser": "8.46.4",
     "@vitest/browser": "3.2.4",

packages/ckeditor5/package.json

@@ -15,7 +15,7 @@
     "ckeditor5-premium-features": "47.2.0"
   },
   "devDependencies": {
-    "@smithy/middleware-retry": "4.4.11",
+    "@smithy/middleware-retry": "4.4.10",
     "@types/jquery": "3.5.33"
   }
 }

packages/codemirror/package.json

@@ -16,7 +16,7 @@
     "@codemirror/lang-xml": "6.1.0",
     "@codemirror/legacy-modes": "6.5.2",
     "@codemirror/search": "6.5.11",
-    "@codemirror/view": "6.38.7",
+    "@codemirror/view": "6.38.6",
     "@fsegurai/codemirror-theme-abcdef": "6.2.2",
     "@fsegurai/codemirror-theme-abyss": "6.2.2",
     "@fsegurai/codemirror-theme-android-studio": "6.2.2",