\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View.html
index 6435f8d4f..320c6bece 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View.html
@@ -47,7 +47,6 @@
-
Creating a new event/note
Clicking on a day will create a new child note and assign it to that particular
@@ -71,9 +70,15 @@
-
Left clicking the event will go to that note. Middle clicking will open
- the note in a new tab and right click will offer more options including
- opening the note in a new split or window.
+
Left clicking the event will open a Quick edit to
+ edit the note in a popup while allowing easy return to the calendar by
+ just dismissing the popup.
+
+
Middle clicking will open the note in a new tab.
+
Right click will offer more options including opening the note in a new
+ split or window.
+
+
Drag and drop an event on the calendar to move it to another day.
The length of an event can be changed by placing the mouse to the right
edge of the event and dragging the mouse around.
@@ -239,8 +244,7 @@ class="table">
-
-
How the calendar works
+
How the calendar works
@@ -276,9 +280,10 @@ class="table">
not having a dateNote attribute. Children of the child notes
will not be displayed.
-
-
-
Using a different attribute as event title
+
+
+
+
Using a different attribute as event title
By default, events are displayed on the calendar by their note title.
However, it is possible to configure a different attribute to be displayed
instead.
@@ -311,8 +316,7 @@ class="table">
-
-
Using a relation attribute as event title
+
Using a relation attribute as event title
Similarly to using an attribute, use #calendar:title and set
it to name where name is the name of the relation
to use.
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Geo Map View.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Geo Map View.html
index 0838f4a46..991d9d94e 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Geo Map View.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Geo Map View.html
@@ -1,8 +1,8 @@
Adding an existing note on note from the note tree
Geo Map View will
disallow all interaction that would otherwise change the map (dragging
notes, adding new items).
\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tooltip.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tooltip.html
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit.html
new file mode 100644
index 000000000..ad55d7b82
--- /dev/null
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit.html
@@ -0,0 +1,70 @@
+
+
+
+
Quick edit provides an alternative to the standard tab-based
+ navigation and editing.
+
Instead of clicking on a note which switches the Note Tree to
+ the newly selected note, or navigating between two different Tabs,
+ the Quick edit feature opens as a popup window that can be easily
+ dismissed.
+
This feature is also well integrated with Collections such
+ as the calendar view, which makes it easy to edit entries without having
+ to go back and forth between the child note and the calendar.
+
Feature highlights
+
+
All note types are supported, including Collections.
+
Note that the Note List will
+ not be displayed, except for notes of type Collections.
+
For Text notes,
+ depending on user preference, both the floating and classic editors are
+ supported. See Formatting toolbar.
+
The title and the note and the icon are editable, just like a normal tab.
Clicking on a marker will open that marker, but only if the map is in
+ read-only mode.
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit_image.png
new file mode 100644
index 000000000..89882f216
Binary files /dev/null and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit_image.png differ
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Book.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections.html
similarity index 96%
rename from apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Book.html
rename to apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections.html
index 3a89cb666..658fe8d99 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Book.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections.html
@@ -3,7 +3,7 @@
book-like reading experience. This format is particularly useful for viewing
multiple smaller notes in a cohesive, continuous manner.
-
+
In the example above, the "node.js" note on the left panel contains several
child notes. The right panel displays the content of these child notes
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Book_image.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections_image.png
similarity index 100%
rename from apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Book_image.png
rename to apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections_image.png
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html
index c1f5114ad..ab4d227e1 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html
@@ -1,75 +1,9 @@
-
Filling in the desired note to link. It's also possible to create notes
- from this dialog by typing a non-existing note title and selecting Create and link child note.
-
-
There are two link types, adjustable when creating the link to the note:
-
-
link title mirrors the note's current title
-
-
This is sometimes also called "reference link".
-
Title of such links cannot be changed, instead it is always mirroring
- the title of linked note.
-
The icon of the note is also displayed.
-
The link title will automatically update if the title of the note is changed.
-
-
-
link title can be changed arbitrarily
-
-
This is the traditional hyperlink, where the text of the link can be different
- to the note title.
-
-
-
-
Once an internal link is created:
-
-
You can follow the note link by double clicking it.
-
Alternatively if you only wish to quickly preview the content, you can
- hover over the link and will see read only preview.
+
External links,
+ for standard hyperlinks to websites or other resources.
Filling in the desired note to link. It's also possible to create notes
+ from this dialog by typing a non-existing note title and selecting Create and link child note.
+
+
There are two link types, adjustable when creating the link to the note:
+
+
link title mirrors the note's current title
+
+
This is sometimes also called "reference link".
+
Title of such links cannot be changed, instead it is always mirroring
+ the title of linked note.
+
The icon of the note is also displayed.
+
The link title will automatically update if the title of the note is changed.
+
+
+
link title can be changed arbitrarily
+
+
This is the traditional hyperlink, where the text of the link can be different
+ to the note title.
+
+
+
+
Once an internal link is created:
+
+
You can follow the note link by double clicking it.
+
Alternatively if you only wish to quickly preview the content, you can
+ hover over the link and will see read only preview.
While the sharing feature is powerful, it has some limitations:
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Quick edit.clone.md b/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Quick edit.clone.md
new file mode 100644
index 000000000..c769505f1
--- /dev/null
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Quick edit.clone.md
@@ -0,0 +1,2 @@
+# Quick edit
+This is a clone of a note. Go to its [primary location](../UI%20Elements/Quick%20edit.md).
\ No newline at end of file
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List.md b/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List.md
index 8eed85e6a..dec95d577 100644
--- a/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List.md
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List.md
@@ -11,7 +11,7 @@ When a note has one or more child notes, they will be listed at the end of the n
By default, the notes will be displayed in a grid, however there are also some other view types available.
> [!TIP]
-> Generally the view type can only be changed in a Book note from the Ribbon, but it can also be changed manually on any type of note using the `#viewType` attribute.
+> Generally the view type can only be changed in a Book note from the Ribbon, but it can also be changed manually on any type of note using the `#viewType` attribute.
### Grid view
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View.md b/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View.md
index aec8046b9..c3773353b 100644
--- a/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View.md
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View.md
@@ -28,7 +28,9 @@ Unlike other Book view types, the Calendar view also allows some kind of interac
* Hovering the mouse over an event will display information about the note.
-* Left clicking the event will go to that note. Middle clicking will open the note in a new tab and right click will offer more options including opening the note in a new split or window.
+* Left clicking the event will open a Quick edit to edit the note in a popup while allowing easy return to the calendar by just dismissing the popup.
+ * Middle clicking will open the note in a new tab.
+ * Right click will offer more options including opening the note in a new split or window.
* Drag and drop an event on the calendar to move it to another day.
* The length of an event can be changed by placing the mouse to the right edge of the event and dragging the mouse around.
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Geo Map View.md b/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Geo Map View.md
index 05bf48662..916038606 100644
--- a/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Geo Map View.md
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Geo Map View.md
@@ -60,10 +60,11 @@ If moved by mistake, there is currently no way to undo the change. If the mouse
## Interaction with the markers
-* Hovering over a marker will display the content of the note it belongs to.
+* Hovering over a marker will display a Note Tooltip with the content of the note it belongs to.
* Clicking on the note title in the tooltip will navigate to the note in the current view.
* Middle-clicking the marker will open the note in a new tab.
-* Right-clicking the marker will open a contextual menu allowing:
+* Right-clicking the marker will open a contextual menu (as described below).
+* If the map is in read-only mode, clicking on a marker will open a Quick edit popup for the corresponding note.
## Contextual menu
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tooltip.md b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tooltip.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit.md b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit.md
new file mode 100644
index 000000000..542513072
--- /dev/null
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit.md
@@ -0,0 +1,33 @@
+# Quick edit
+
+
+_Quick edit_ provides an alternative to the standard tab-based navigation and editing.
+
+Instead of clicking on a note which switches the Note Tree to the newly selected note, or navigating between two different Tabs, the _Quick edit_ feature opens as a popup window that can be easily dismissed.
+
+This feature is also well integrated with Collections such as the calendar view, which makes it easy to edit entries without having to go back and forth between the child note and the calendar.
+
+## Feature highlights
+
+* All note types are supported, including Collections.
+* Note that the Note List will not be displayed, except for notes of type Collections.
+* For Text notes, depending on user preference, both the floating and classic editors are supported. See Formatting toolbar.
+* The title and the note and the icon are editable, just like a normal tab.
+* The Promoted Attributes are also displayed.
+ * This integrates well with Collections where there are predefined attributes such as the _Start date_ and _End date_, allowing for easy editing.
+
+## Accessing the quick edit
+
+* From the Note Tree:
+ * Right click on a note and select _Quick edit_.
+ * or, press Ctrl+Right click on a note.
+* On Internal (reference) links:
+ * Right click and select _Quick edit_.
+ * or, press Ctrl+Right click on the link.
+* On a Note Tooltip, press the quick edit icon.
+* In Collections:
+ * For Calendar View:
+ * Clicking on an event will open that event for quick editing.
+ * If the calendar is for the Day Notes root, clicking on the day number will open the popup for that day note.
+ * For Geo Map View:
+ * Clicking on a marker will open that marker, but only if the map is in read-only mode.
\ No newline at end of file
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit_image.png b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit_image.png
new file mode 100644
index 000000000..89882f216
Binary files /dev/null and b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit_image.png differ
diff --git a/docs/User Guide/User Guide/Note Types.md b/docs/User Guide/User Guide/Note Types.md
index c5870964c..e25edfebf 100644
--- a/docs/User Guide/User Guide/Note Types.md
+++ b/docs/User Guide/User Guide/Note Types.md
@@ -25,4 +25,4 @@ It is possible to change the type of a note after it has been created via the _B
The following note types are supported by Trilium:
-
Stores the information about a search (the search text, criteria, etc.) for later use. Can be used for quick filtering of a large amount of notes, for example. The search can easily be triggered.
Used in Scripting, it displays the HTML content of another note. This allows displaying any kind of content, provided there is a script behind it to generate it.
Displays diagrams such as bar charts, flow charts, state diagrams, etc. Requires a bit of technical knowledge since the diagrams are written in a specialized format.
Displays the children of the note as a geographical map, one use-case would be to plan vacations. It even has basic support for tracks. Notes can also be created from it.
Stores the information about a search (the search text, criteria, etc.) for later use. Can be used for quick filtering of a large amount of notes, for example. The search can easily be triggered.
Used in Scripting, it displays the HTML content of another note. This allows displaying any kind of content, provided there is a script behind it to generate it.
Displays diagrams such as bar charts, flow charts, state diagrams, etc. Requires a bit of technical knowledge since the diagrams are written in a specialized format.
Displays the children of the note as a geographical map, one use-case would be to plan vacations. It even has basic support for tracks. Notes can also be created from it.
Represents an uploaded file such as PDFs, images, video or audio files.
\ No newline at end of file
diff --git a/docs/User Guide/User Guide/Note Types/Book.md b/docs/User Guide/User Guide/Note Types/Collections.md
similarity index 96%
rename from docs/User Guide/User Guide/Note Types/Book.md
rename to docs/User Guide/User Guide/Note Types/Collections.md
index 59543b937..cfc73b27d 100644
--- a/docs/User Guide/User Guide/Note Types/Book.md
+++ b/docs/User Guide/User Guide/Note Types/Collections.md
@@ -1,7 +1,7 @@
-# Book
+# Collections
A **Book Note** in Trilium is a special type of [note](../Basic%20Concepts%20and%20Features/Notes.md) designed to display the contents of its child notes sequentially, creating a linear, book-like reading experience. This format is particularly useful for viewing multiple smaller notes in a cohesive, continuous manner.
-
+
In the example above, the "node.js" note on the left panel contains several child notes. The right panel displays the content of these child notes as a single continuous document.
diff --git a/docs/User Guide/User Guide/Note Types/Book_image.png b/docs/User Guide/User Guide/Note Types/Collections_image.png
similarity index 100%
rename from docs/User Guide/User Guide/Note Types/Book_image.png
rename to docs/User Guide/User Guide/Note Types/Collections_image.png
diff --git a/docs/User Guide/User Guide/Note Types/Text/Links.md b/docs/User Guide/User Guide/Note Types/Text/Links.md
index 8387ce0f1..93d9bfcc9 100644
--- a/docs/User Guide/User Guide/Note Types/Text/Links.md
+++ b/docs/User Guide/User Guide/Note Types/Text/Links.md
@@ -1,51 +1,8 @@
# Links
-## External links
+There are two types of links:
-An external link is a standard web link targeting for example a website. For example, [https://en.wikipedia.org/wiki/South\_China\_Sea](https://en.wikipedia.org/wiki/South_China_Sea) is an external link to a Wikipedia page.
-
-To create a link without a custom text:
-
-* Press in the Formatting toolbar:
- * A popup will appear, type or paste the URL in the box.
- * Press Enter or the check mark icon to confirm.
-* Alternatively, press Ctrl+K to trigger the aforementioned popup.
-* A simpler way is to paste the raw link and press space to turn it automatically into a link.
-
-To create a link with a custom text:
-
-* First, type and select the text which will be turned into a link.
-* Follow the previous steps to open the link interface (via the formatting toolbar, or Ctrl+K).
-* Alternatively, simply paste (Ctrl+V) over the selected text to turn it into a link.
-
-Once a link is inserted:
-
-* The text inside the link can be changed if needed but the link itself will remain.
-* To modify the link, click on the link to display the popup and press the _Edit link_ button.
-* To remove a link, click on it and press the _Unlink_ button.
-
-You can follow external link by either double clicking (will open new tab/window) it or right clicking on them and choosing "Open in new tab".
-
-## Internal links to notes
-
-Unlike external notes, internal links (links to other notes) can be created at the current position by :
-
-1. Pressing Ctrl + L or the button from the Formatting toolbar.
-2. Filling in the desired note to link. It's also possible to create notes from this dialog by typing a non-existing note title and selecting _Create and link child note_.
-
-There are two link types, adjustable when creating the link to the note:
-
-1. _link title mirrors the note's current title_
- 1. This is sometimes also called "reference link".
- 2. Title of such links cannot be changed, instead it is always mirroring the title of linked note.
- 3. The icon of the note is also displayed.
- 4. The link title will automatically update if the title of the note is changed.
-2. _link title can be changed arbitrarily_
- 1. This is the traditional hyperlink, where the text of the link can be different to the note title.
-
-Once an internal link is created:
-
-* You can follow the note link by double clicking it.
-* Alternatively if you only wish to quickly preview the content, you can hover over the link and will see read only preview.
+* External links, for standard hyperlinks to websites or other resources.
+* Internal (reference) links for links to other notes within Trilium.
## Pasting links
diff --git a/docs/User Guide/User Guide/Note Types/Text/2_Links_image.png b/docs/User Guide/User Guide/Note Types/Text/Links/1_External links_image.png
similarity index 100%
rename from docs/User Guide/User Guide/Note Types/Text/2_Links_image.png
rename to docs/User Guide/User Guide/Note Types/Text/Links/1_External links_image.png
diff --git a/docs/User Guide/User Guide/Note Types/Text/3_Links_image.png b/docs/User Guide/User Guide/Note Types/Text/Links/2_External links_image.png
similarity index 100%
rename from docs/User Guide/User Guide/Note Types/Text/3_Links_image.png
rename to docs/User Guide/User Guide/Note Types/Text/Links/2_External links_image.png
diff --git a/docs/User Guide/User Guide/Note Types/Text/Links/External links.md b/docs/User Guide/User Guide/Note Types/Text/Links/External links.md
new file mode 100644
index 000000000..fabc2f21e
--- /dev/null
+++ b/docs/User Guide/User Guide/Note Types/Text/Links/External links.md
@@ -0,0 +1,24 @@
+# External links
+An external link is a standard web link targeting for example a website. For example, [https://en.wikipedia.org/wiki/South\_China\_Sea](https://en.wikipedia.org/wiki/South_China_Sea) is an external link to a Wikipedia page.
+
+To create a link without a custom text:
+
+* Press in the Formatting toolbar:
+ * A popup will appear, type or paste the URL in the box.
+ * Press Enter or the check mark icon to confirm.
+* Alternatively, press Ctrl+K to trigger the aforementioned popup.
+* A simpler way is to paste the raw link and press space to turn it automatically into a link.
+
+To create a link with a custom text:
+
+* First, type and select the text which will be turned into a link.
+* Follow the previous steps to open the link interface (via the formatting toolbar, or Ctrl+K).
+* Alternatively, simply paste (Ctrl+V) over the selected text to turn it into a link.
+
+Once a link is inserted:
+
+* The text inside the link can be changed if needed but the link itself will remain.
+* To modify the link, click on the link to display the popup and press the _Edit link_ button.
+* To remove a link, click on it and press the _Unlink_ button.
+
+You can follow external link by either double clicking (will open new tab/window) it or right clicking on them and choosing "Open in new tab".
\ No newline at end of file
diff --git a/docs/User Guide/User Guide/Note Types/Text/Links_image.png b/docs/User Guide/User Guide/Note Types/Text/Links/External links_image.png
similarity index 100%
rename from docs/User Guide/User Guide/Note Types/Text/Links_image.png
rename to docs/User Guide/User Guide/Note Types/Text/Links/External links_image.png
diff --git a/docs/User Guide/User Guide/Note Types/Text/Links/Internal (reference) links.md b/docs/User Guide/User Guide/Note Types/Text/Links/Internal (reference) links.md
new file mode 100644
index 000000000..e45eb2cf1
--- /dev/null
+++ b/docs/User Guide/User Guide/Note Types/Text/Links/Internal (reference) links.md
@@ -0,0 +1,20 @@
+# Internal (reference) links
+Unlike external notes, internal links (links to other notes) can be created at the current position by :
+
+1. Pressing Ctrl + L or the button from the Formatting toolbar.
+2. Filling in the desired note to link. It's also possible to create notes from this dialog by typing a non-existing note title and selecting _Create and link child note_.
+
+There are two link types, adjustable when creating the link to the note:
+
+1. _link title mirrors the note's current title_
+ 1. This is sometimes also called "reference link".
+ 2. Title of such links cannot be changed, instead it is always mirroring the title of linked note.
+ 3. The icon of the note is also displayed.
+ 4. The link title will automatically update if the title of the note is changed.
+2. _link title can be changed arbitrarily_
+ 1. This is the traditional hyperlink, where the text of the link can be different to the note title.
+
+Once an internal link is created:
+
+* You can follow the note link by double clicking it.
+* Alternatively if you only wish to quickly preview the content, you can hover over the link and will see read only preview.
\ No newline at end of file
diff --git a/docs/User Guide/User Guide/Note Types/Text/1_Links_image.png b/docs/User Guide/User Guide/Note Types/Text/Links/Internal (reference) links.png
similarity index 100%
rename from docs/User Guide/User Guide/Note Types/Text/1_Links_image.png
rename to docs/User Guide/User Guide/Note Types/Text/Links/Internal (reference) links.png
-
-
Floating buttons area.
+
+ 
in the Formatting toolbar:
- 
Edit link button.
Unlink button.
button from the Formatting toolbar.
in the Formatting toolbar:
+ 
Edit link button.
Unlink button. links.png){kind=small}
button from the Formatting toolbar.