\ 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 Tree/Note tree contextual menu.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.html
index c8dc3a86b..0488c7d36 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.html
@@ -8,12 +8,12 @@
Interaction
The contextual menu can operate:
-
On a single note, by right clicking it in the note tree.
On multiple notes, by selecting them first. See Multiple selection on how to do
so.
-
When right clicking, do note that usually the note being right clicked
+
When right clicking, do note that usually the note being right clicked
is also included in the affected notes, regardless of whether it was selected
or not.
@@ -25,133 +25,146 @@
The ones that do support multiple notes will mention this in the list below.
If the note is already archived, it will be unarchived instead.
+
Multiple notes can be selected as well. However, all the selected notes
+ must be in the same state (archived or not), otherwise the option will
+ be disabled.
-
-
Import into note
-
-
Opens the import dialog and places
- the imported notes as child notes of the selected one.
Copies a URL fragment representing the full path to this branch for a
- note, such as #root/Hb2E70L7HPuf/4sRFgMZhYFts/2IVuShedRJ3U/LJVMvKXOFv7n.
-
The URL to manually create Links within
- notes, or for note Navigation.
+
+
Copy note path to clipboard
+
+
Copies a URL fragment representing the full path to this branch for a
+ note, such as #root/Hb2E70L7HPuf/4sRFgMZhYFts/2IVuShedRJ3U/LJVMvKXOFv7n.
+
The URL to manually create Links within
+ notes, or for note Navigation.
-
-
Recent changes in subtree
-
-
This will open Recent Changes,
- but filtered to only the changes related to this note or one of its descendants.
-
-
+
+
Recent changes in subtree
+
+
This will open Recent Changes,
+ but filtered to only the changes related to this note or one of its descendants.
+
+
\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Quick edit.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit.html
similarity index 100%
rename from apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Quick edit.html
rename to apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit.html
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/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
similarity index 100%
rename from apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Quick edit_image.png
rename to apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Quick edit_image.png
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections.html
index 7b255c880..8ec44b5ad 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections.html
@@ -4,29 +4,31 @@
child notes into one continuous view. This makes it ideal for reading extensive
information broken into smaller, manageable segments.
Grid View which
is the default presentation method for child notes (see Note List), where the notes are displayed
as tiles with their title and content being visible.
List View is
similar to Grid View,
but it displays the notes one under the other with the content being expandable/collapsible,
but also works recursively.
More specialized collections were introduced, such as the:
Calendar View which
displays a week, month or year calendar with the notes being shown as events.
New events can be added easily by dragging across the calendar.
Geo Map View which
displays a geographical map in which the notes are represented as markers/pins
on the map. New events can be easily added by pointing on the map.
-
Table View displays
- each note as a row in a table, with Promoted Attributes being
- shown as well. This makes it easy to visualize attributes of notes, as
- well as making them easily editable.
-
Board View (Kanban)
- displays notes in columns, grouped by the value of a label.
+
Table View displays
+ each note as a row in a table, with Promoted Attributes being
+ shown as well. This makes it easy to visualize attributes of notes, as
+ well as making them easily editable.
+
Board View (Kanban)
+ displays notes in columns, grouped by the value of a label.
For a quick presentation of all the supported view types, see the child
notes of this help page, including screenshots.
@@ -42,8 +44,8 @@
Adding a description to a collection
To add a text before the collection, for example to describe it:
In the Ribbon,
go to Basic Properties and select Collection as the note
type.
-
Still in the ribbon, go to Collection Properties and select the
+
Still in the ribbon, go to Collection Properties and select the
desired view type.
-
Consult the help page of the corresponding view type in order to understand
+
Consult the help page of the corresponding view type in order to understand
how to configure them.
+
Archived notes
+
By default, archived notes will not be shown in collections. This behaviour
+ can be changed by going to Collection Properties in the
+ Ribbon and checking Show archived notes.
+
Archived notes will be generally indicated by being greyed out as opposed
+ to the normal ones.
Under the hood
Collections by themselves are simply notes with no content that rely on
the Note List mechanism
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Board View.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Board View.html
index 3c13a81d8..6dc4e1029 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Board View.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Board View.html
@@ -15,53 +15,60 @@
in a hierarchy.
Interaction with columns
-
Create a new column by pressing Add Column near the last column.
+
Create a new column by pressing Add Column near the last column.
-
Once pressed, a text box will be displayed to set the name of the column.
- Press Enter to confirm.
+
Once pressed, a text box will be displayed to set the name of the column.
+ Press Enter to confirm, or Escape to dismiss.
-
To reorder a column, simply hold the mouse over the title and drag it
+
To reorder a column, simply hold the mouse over the title and drag it
to the desired position.
-
To delete a column, right click on its title and select Delete column.
-
To rename a column, click on the note title.
+
To delete a column, right click on its title and select Delete column.
+
To rename a column, click on the note title.
-
Press Enter to confirm.
-
Upon renaming a column, the corresponding status attribute of all its
+
Press Enter to confirm.
+
Upon renaming a column, the corresponding status attribute of all its
notes will be changed in bulk.
-
-
If there are many columns, use the mouse wheel to scroll.
+
+
If there are many columns, use the mouse wheel to scroll.
Interaction with notes
-
Create a new note in any column by pressing New item
+
Create a new note in any column by pressing New item
-
Enter the name of the note and press Enter.
-
Doing so will create a new note. The new note will have an attribute (status label
+
Enter the name of the note and press Enter or click away. To
+ dismiss the creation of a new note, simply press Escape or leave
+ the name empty.
+
Once created, the new note will have an attribute (status label
by default) set to the name of the column.
-
To change the state of a note, simply drag a note from one column to the
+
To open the note, simply click on it.
+
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.
+
To change the state of a note, simply drag a note from one column to the
other to change its state.
-
The order of the notes in each column corresponds to their position in
+
The order of the notes in each column corresponds to their position in
the tree.
-
It's possible to reorder notes simply by dragging them to the desired
+
It's possible to reorder notes simply by dragging them to the desired
position within the same columns.
-
It's also possible to drag notes across columns, at the desired position.
+
It's also possible to drag notes across columns, at the desired position.
-
For more options, right click on a note to display a context menu with
+
For more options, right click on a note to display a context menu with
the following options:
-
Open the note in a new tab/split/window or quick edit.
-
Move the note to any column.
-
Insert a new note above/below the current one.
-
Delete the current note.
+
Open the note in a new tab/split/window or quick edit.
+
Move the note to any column.
+
Insert a new note above/below the current one.
+
Archive/unarchive the current note.
+
Delete the current note.
-
If there are many notes within the column, move the mouse over the column
+
If there are many notes within the column, move the mouse over the column
and use the mouse wheel to scroll.
Configuration
@@ -77,5 +84,5 @@ class="admonition note">
Interaction
Limitations
-
It is not possible yet to use group by a relation, only by label.
+
It is not possible yet to use group by a relation, only by label.
\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Geo Map View.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Geo Map View.html
index cbda5b977..9e0d2cf9c 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Geo Map View.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Geo Map View.html
@@ -12,128 +12,138 @@
on an attribute. It is also possible to add new notes at a specific location
using the built-in interface.
Creating a new geo map
-
-
-
-
-
-
-
-
-
-
-
1
-
-
-
-
-
-
Right click on any note on the note tree and select Insert child note → Geo Map (beta).
-
-
-
2
-
-
-
-
-
-
By default the map will be empty and will show the entire world.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
1
+
+
+
+
+
+
Right click on any note on the note tree and select Insert child note → Geo Map (beta).
+
+
+
2
+
+
+
+
+
+
By default the map will be empty and will show the entire world.
+
+
+
+
Repositioning the map
-
Click and drag the map in order to move across the map.
-
Use the mouse wheel, two-finger gesture on a touchpad or the +/- buttons
+
Click and drag the map in order to move across the map.
+
Use the mouse wheel, two-finger gesture on a touchpad or the +/- buttons
on the top-left to adjust the zoom.
The position on the map and the zoom are saved inside the map note and
restored when visiting again the note.
Adding a marker using the map
Adding a new note using the plus button
-
-
-
-
-
-
-
-
-
-
-
1
-
To create a marker, first navigate to the desired point on the map. Then
- press the
- button in the Floating buttons (top-right)
- area.
-
- If the button is not visible, make sure the button section is visible
- by pressing the chevron button (
- ) in the top-right of the map.
-
-
-
-
2
-
-
-
-
Once pressed, the map will enter in the insert mode, as illustrated by
- the notification.
-
- Simply click the point on the map where to place the marker, or the Escape
- key to cancel.
-
-
-
3
-
-
-
-
Enter the name of the marker/note to be created.
-
-
-
4
-
-
-
-
Once confirmed, the marker will show up on the map and it will also be
- displayed as a child note of the map.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
1
+
To create a marker, first navigate to the desired point on the map. Then
+ press the
+ button in the Floating buttons (top-right)
+ area.
+
+ If the button is not visible, make sure the button section is visible
+ by pressing the chevron button (
+ ) in the top-right of the map.
+
+
+
+
2
+
+
+
+
Once pressed, the map will enter in the insert mode, as illustrated by
+ the notification.
+
+ Simply click the point on the map where to place the marker, or the Escape
+ key to cancel.
+
+
+
3
+
+
+
+
Enter the name of the marker/note to be created.
+
+
+
4
+
+
+
+
Once confirmed, the marker will show up on the map and it will also be
+ displayed as a child note of the map.
+
+
+
+
Adding a new note using the contextual menu
-
Right click anywhere on the map, where to place the newly created marker
+
Right click anywhere on the map, where to place the newly created marker
(and corresponding note).
-
Select Add a marker at this location.
-
Enter the name of the newly created note.
-
The map should be updated with the new marker.
+
Select Add a marker at this location.
+
Enter the name of the newly created note.
+
The map should be updated with the new marker.
Adding an existing note on note from the note tree
Hold the mouse on the note and drag it to the map to the desired location.
+
The map should be updated with the new marker.
This works for:
-
Notes that are not part of the geo map, case in which a clone will
+
Notes that are not part of the geo map, case in which a clone will
be created.
-
Notes that are a child of the geo map but not yet positioned on the map.
-
Notes that are a child of the geo map and also positioned, case in which
+
Notes that are a child of the geo map but not yet positioned on the map.
+
Notes that are a child of the geo map and also positioned, case in which
the marker will be relocated to the new position.
+
How the location of the markers is stored
The location of a marker is stored in the #geolocation attribute
of the child notes:
-
+
+
+
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.
Repositioning markers
@@ -145,16 +155,17 @@ height="278">
page (Ctrl+R ) to cancel it.
Interaction with the markers
-
Hovering over a marker will display a Note Tooltip with
+
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
+
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 (as described below).
-
If the map is in read-only mode, clicking on a marker will open a
+
Middle-clicking the marker will open the note in a new tab.
+
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.
@@ -162,24 +173,24 @@ height="278">
It's possible to press the right mouse button to display a contextual
menu.
-
If right-clicking an empty section of the map (not on a marker), it allows
+
If right-clicking an empty section of the map (not on a marker), it allows
to:
-
Displays the latitude and longitude. Clicking this option will copy them
+
Displays the latitude and longitude. Clicking this option will copy them
to the clipboard.
-
Open the location using an external application (if the operating system
+
Open the location using an external application (if the operating system
supports it).
-
Adding a new marker at that location.
+
Adding a new marker at that location.
-
If right-clicking on a marker, it allows to:
+
If right-clicking on a marker, it allows to:
-
Displays the latitude and longitude. Clicking this option will copy them
+
Displays the latitude and longitude. Clicking this option will copy them
to the clipboard.
-
Open the location using an external application (if the operating system
+
Open the location using an external application (if the operating system
supports it).
-
Open the note in a new tab, split or window.
-
Remove the marker from the map, which will remove the #geolocation attribute
+
Open the note in a new tab, split or window.
+
Remove the marker from the map, which will remove the #geolocation attribute
of the note. To add it back again, the coordinates have to be manually
added back in.
@@ -199,209 +210,215 @@ height="278">
The value of the attribute is made up of the latitude and longitude separated
by a comma.
Adding from Google Maps
-
-
-
-
-
-
-
-
-
-
-
1
-
-
-
-
-
-
Go to Google Maps on the web and look for a desired location, right click
- on it and a context menu will show up.
-
- Simply click on the first item displaying the coordinates and they will
- be copied to clipboard.
-
- 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
-
-
-
-
-
-
In Trilium, create a child note under the map.
-
-
-
3
-
-
-
-
-
-
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.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
1
+
+
+
+
+
+
Go to Google Maps on the web and look for a desired location, right click
+ on it and a context menu will show up.
+
+ Simply click on the first item displaying the coordinates and they will
+ be copied to clipboard.
+
+ 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
+
+
+
+
+
+
In Trilium, create a child note under the map.
+
+
+
3
+
+
+
+
+
+
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.
+
+
+
+
Adding from OpenStreetMap
Similarly to the Google Maps approach:
-
-
-
-
-
-
-
-
-
-
-
1
-
-
-
-
Go to any location on openstreetmap.org and right click to bring up the
- context menu. Select the “Show address” item.
-
-
-
2
-
-
-
-
The address will be visible in the top-left of the screen, in the place
- of the search bar.
-
- Select the coordinates and copy them into the clipboard.
-
-
-
3
-
-
-
-
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.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
1
+
+
+
+
Go to any location on openstreetmap.org and right click to bring up the
+ context menu. Select the “Show address” item.
+
+
+
2
+
+
+
+
The address will be visible in the top-left of the screen, in the place
+ of the search bar.
+
+ Select the coordinates and copy them into the clipboard.
+
+
+
3
+
+
+
+
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)
Trilium has basic support for displaying GPS tracks on the geo map.
-
-
-
-
-
-
-
-
-
-
-
1
-
-
-
-
-
-
To add a track, simply drag & drop a .gpx file inside the geo map
- in the note tree.
-
-
-
2
-
-
-
-
-
-
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
-
-
-
-
-
-
When going back to the map, the track should now be visible.
-
- The start and end points of the track are indicated by the two blue markers.
-
-
-
-
-
Read-only mode
-
When a map is in read-only all editing features will be disabled such
- as:
Editing from the contextual menu (removing locations or adding new items).
+
+
To enable read-only mode simply press the Lock icon from the
+ Floating buttons. To disable it, press the button again.
+
Configuration
+
Map Style
+
The styling of the map can be adjusted in the Collection Properties tab
+ in the Ribbon or
+ manually via the #map:style attribute.
+
The geo map comes with two different types of styles:
+
+
Raster styles
+
+
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.
+
Zoom is slightly restricted.
+
Currently, the only raster theme is the original OpenStreetMap style.
-
-
Vector styles
-
-
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.
-
The map can be zoomed in much further.
-
These come both in a light and a dark version.
-
The vector styles come from VersaTiles,
- a free and open-source project providing map tiles based on OpenStreetMap.
-
-
-
-
-
Scale
-
Activating this option via the Ribbon or
- manually via #map:scale will display an indicator in the bottom-left
- of the scale of the map.
-
Troubleshooting
-
-
-
-
-
Grid-like artifacts on the map
-
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 Ctrl+0).
\ No newline at end of file
+
+
Vector styles
+
+
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.
+
The map can be zoomed in much further.
+
These come both in a light and a dark version.
+
The vector styles come from VersaTiles,
+ a free and open-source project providing map tiles based on OpenStreetMap.
+
+
+
+
+
Scale
+
Activating this option via the Ribbon or
+ manually via #map:scale will display an indicator in the bottom-left
+ of the scale of the map.
+
Troubleshooting
+
+
+
+
Grid-like artifacts on the map
+
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 Ctrl+0).
\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Table View.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Table View.html
index 3c6e3fc9b..e256b4cb3 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Table View.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Collections/Table View.html
@@ -8,31 +8,31 @@
How it works
The tabular structure is represented as such:
-
Each child note is a row in the table.
-
If child rows also have children, they will be displayed under an expander
+
Each child note is a row in the table.
+
If child rows also have children, they will be displayed under an expander
(nested notes).
The editing will respect the type of the promoted attribute, by presenting
+
The editing will respect the type of the promoted attribute, by presenting
a normal text box, a number selector or a date selector for example.
-
It also possible to change the title of a note.
-
Editing relations is also possible
-
-
Simply click on a relation and it will become editable. Enter the text
- to look for a note and click on it.
-
To remove a relation, remove the title of the note from the text box and
- click outside the cell.
-
-
+
It also possible to change the title of a note.
+
Editing relations is also possible
+
+
Simply click on a relation and it will become editable. Enter the text
+ to look for a note and click on it.
+
To remove a relation, remove the title of the note from the text box and
+ click outside the cell.
+
+
Editing columns
It is possible to edit a column by right clicking it and selecting Edit column. This
@@ -114,18 +119,19 @@
href="#root/_help_oPVyFC7WL2Lp">Note Tree. However, it is possible
to sort the data by the values of a column:
-
To do so, simply click on a column.
-
To switch between ascending or descending sort, simply click again on
+
To do so, simply click on a column.
+
To switch between ascending or descending sort, simply click again on
the same column. The arrow next to the column will indicate the direction
of the sort.
-
To disable sorting and fall back to the original order, right click any
+
To disable sorting and fall back to the original order, right click any
column on the header and select Clear sorting.
Reordering and hiding columns
-
Columns can be reordered by dragging the header of the columns.
-
Columns can be hidden or shown by right clicking on a column and clicking
+
Columns can be reordered by dragging the header of the columns.
+
Columns can be hidden or shown by right clicking on a column and clicking
the item corresponding to the column.
If the parent note has #sorted, reordering will be disabled.
-
If using nested tables, then reordering will also be disabled.
-
Currently, it's possible to reorder notes even if column sorting is used,
- but the result might be inconsistent.
+
If the parent note has #sorted, reordering will be disabled.
+
If using nested tables, then reordering will also be disabled.
+
Currently, it's possible to reorder notes even if column sorting is used,
+ but the result might be inconsistent.
Nested trees
If the child notes of the collection also have their own child notes,
@@ -150,27 +158,27 @@
to a certain number of levels or even disable it completely. To do so,
either:
Columns are supported, by being defined as Promoted Attributes to the
diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json
index 7a1d0831b..2a90f721a 100644
--- a/docs/User Guide/!!!meta.json
+++ b/docs/User Guide/!!!meta.json
@@ -1728,6 +1728,13 @@
"value": "bx bx-menu",
"isInheritable": false,
"position": 10
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "MKmLg5x6xkor",
+ "isInheritable": false,
+ "position": 200
}
],
"format": "markdown",
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.md b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.md
index 2df2536cf..5ecb4bbd3 100644
--- a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.md
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu.md
@@ -52,6 +52,10 @@ The contextual menu can operate:
* Creates a copy of the note and its descendants.
* This process is different from Cloning Notes since the duplicated note can be edited independently from the original.
* An alternative to this, if done regularly, would be Templates.
+* **Archive/Unarchive**
+ * Marks a note as [archived](../../Notes/Archived%20Notes.md).
+ * If the note is already archived, it will be unarchived instead.
+ * Multiple notes can be selected as well. However, all the selected notes must be in the same state (archived or not), otherwise the option will be disabled.
* **Delete**
* Will delete the given notes, asking for confirmation first.
* In the dialog, the following options can be configured:
diff --git a/docs/User Guide/User Guide/Note Types/Collections.md b/docs/User Guide/User Guide/Note Types/Collections.md
index 81f177fd5..03bc5140c 100644
--- a/docs/User Guide/User Guide/Note Types/Collections.md
+++ b/docs/User Guide/User Guide/Note Types/Collections.md
@@ -47,6 +47,12 @@ By default, collections come with a default configuration and sometimes even sam
3. Still in the ribbon, go to _Collection Properties_ and select the desired view type.
4. Consult the help page of the corresponding view type in order to understand how to configure them.
+## Archived notes
+
+By default, archived notes will not be shown in collections. This behaviour can be changed by going to _Collection Properties_ in the Ribbon and checking _Show archived notes_.
+
+Archived notes will be generally indicated by being greyed out as opposed to the normal ones.
+
## Under the hood
Collections by themselves are simply notes with no content that rely on the Note List mechanism (the one that lists the children notes at the bottom of a note) to display information.
diff --git a/docs/User Guide/User Guide/Note Types/Collections/Board View.md b/docs/User Guide/User Guide/Note Types/Collections/Board View.md
index 6a631bd75..4b8bcbdbc 100644
--- a/docs/User Guide/User Guide/Note Types/Collections/Board View.md
+++ b/docs/User Guide/User Guide/Note Types/Collections/Board View.md
@@ -12,7 +12,7 @@ Notes are displayed recursively, so even the child notes of the child notes will
## Interaction with columns
* Create a new column by pressing _Add Column_ near the last column.
- * Once pressed, a text box will be displayed to set the name of the column. Press Enter to confirm.
+ * Once pressed, a text box will be displayed to set the name of the column. Press Enter to confirm, or Escape to dismiss.
* To reorder a column, simply hold the mouse over the title and drag it to the desired position.
* To delete a column, right click on its title and select _Delete column_.
* To rename a column, click on the note title.
@@ -23,8 +23,10 @@ Notes are displayed recursively, so even the child notes of the child notes will
## Interaction with notes
* Create a new note in any column by pressing _New item_
- * Enter the name of the note and press _Enter_.
- * Doing so will create a new note. The new note will have an attribute (`status` label by default) set to the name of the column.
+ * Enter the name of the note and press Enter or click away. To dismiss the creation of a new note, simply press Escape or leave the name empty.
+ * Once created, the new note will have an attribute (`status` label by default) set to the name of the column.
+* To open the note, simply click on it.
+* 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.
* To change the state of a note, simply drag a note from one column to the other to change its state.
* The order of the notes in each column corresponds to their position in the tree.
* It's possible to reorder notes simply by dragging them to the desired position within the same columns.
@@ -33,6 +35,7 @@ Notes are displayed recursively, so even the child notes of the child notes will
* Open the note in a new tab/split/window or quick edit.
* Move the note to any column.
* Insert a new note above/below the current one.
+ * Archive/unarchive the current note.
* 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.
diff --git a/docs/User Guide/User Guide/Note Types/Collections/Geo Map View.md b/docs/User Guide/User Guide/Note Types/Collections/Geo Map View.md
index ae0be91ce..a060d385e 100644
--- a/docs/User Guide/User Guide/Note Types/Collections/Geo Map View.md
+++ b/docs/User Guide/User Guide/Note Types/Collections/Geo Map View.md
@@ -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  button in the [Floating buttons](../../Basic%20Concepts%20and%20Features/UI%20Elements/Floating%20buttons.md) (top-right) area.
If the button is not visible, make sure the button section is visible by pressing the chevron button () in the top-right of the map. | |
-| 2 | | Once pressed, the map will enter in the insert mode, as illustrated by the notification.
Simply click the point on the map where to place the marker, or the Escape key to cancel. |
+| 1 | To create a marker, first navigate to the desired point on the map. Then press the  button in the [Floating buttons](../../Basic%20Concepts%20and%20Features/UI%20Elements/Floating%20buttons.md) (top-right) area.
If the button is not visible, make sure the button section is visible by pressing the chevron button () in the top-right of the map. | |
+| 2 | | Once pressed, the map will enter in the insert mode, as illustrated by the notification.
Simply click the point on the map where to place the marker, or the Escape key to cancel. |
| 3 | | Enter the name of the marker/note to be created. |
| 4 | | Once confirmed, the marker will show up on the map and it will also be displayed as a child note of the map. |
@@ -50,6 +50,9 @@ This works for:
* Notes that are a child of the geo map but not yet positioned on the map.
* Notes that are a child of the geo map and also positioned, case in which the marker will be relocated to the new position.
+> [!NOTE]
+> Dragging existing notes only works if the map is in editing mode. See the _Read-only_ section for more information.
+
## How the location of the markers is stored
The location of a marker is stored in the `#geolocation` attribute of the child notes:
@@ -106,7 +109,7 @@ The value of the attribute is made up of the latitude and longitude separated by
| | | |
| --- | --- | --- |
-| 1 | | Go to Google Maps on the web and look for a desired location, right click on it and a context menu will show up.
Simply click on the first item displaying the coordinates and they will be copied to clipboard.
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 | | Go to Google Maps on the web and look for a desired location, right click on it and a context menu will show up.
Simply click on the first item displaying the coordinates and they will be copied to clipboard.
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 | | In Trilium, create a child note under the map. |
| 3 | | 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. |
@@ -117,7 +120,7 @@ Similarly to the Google Maps approach:
| | | |
| --- | --- | --- |
| 1 | | Go to any location on openstreetmap.org and right click to bring up the context menu. Select the “Show address” item. |
-| 2 | | The address will be visible in the top-left of the screen, in the place of the search bar.
Select the coordinates and copy them into the clipboard. |
+| 2 | | The address will be visible in the top-left of the screen, in the place of the search bar.
Select the coordinates and copy them into the clipboard. |
| 3 | | 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)
@@ -128,7 +131,7 @@ Trilium has basic support for displaying GPS tracks on the geo map.
| --- | --- | --- |
| 1 | | To add a track, simply drag & drop a .gpx file inside the geo map in the note tree. |
| 2 | | 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 | | When going back to the map, the track should now be visible.
The start and end points of the track are indicated by the two blue markers. |
+| 3 | | When going back to the map, the track should now be visible.
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.
diff --git a/docs/User Guide/User Guide/Note Types/Collections/Table View.md b/docs/User Guide/User Guide/Note Types/Collections/Table View.md
index 0454b0a93..78774734a 100644
--- a/docs/User Guide/User Guide/Note Types/Collections/Table View.md
+++ b/docs/User Guide/User Guide/Note Types/Collections/Table View.md
@@ -65,7 +65,8 @@ There are multiple menus:
* Adding new columns.
* Right clicking on a row, allows:
* Opening the corresponding note of the row in a new tab, split, window or quick editing it.
- * Inserting rows above, below or as a child note.
+ * Inserting a new note above or below the selected row. These options are only enabled if the table is not sorted.
+ * Inserting a new child note for the selected row.
* Deleting the row.
### Editing data
- 
- 
button in the Floating buttons (top-right)
- area.
- 
) in the top-right of the map.
- 
- 
- 
+
- 
- 
- 
- 
- 
- 
- 
- 
- 
-