Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-01-01 05:00:00 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/main' into feature/minor_tweaks

Browse Source
This commit is contained in:
Elian Doran
2025-12-24 00:20:29 +02:00
parent 3e50262665 86307b482f
commit 04fffb7ee0
20 changed files with 337 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/User Guide/User Guide/Advanced Usage/Database/Demo Notes.md vendored
View File

@@ -13,7 +13,7 @@ There are some cases in which you may want to restore the original demo notes. F
You can easily restore the demo notes by using Trilium's built-in import feature by importing them:
* Download [this .zip archive](https://github.com/TriliumNext/Trilium/raw/develop/db/demo.zip) with the latest version of the demo notes
* Download [the .zip archive](https://github.com/TriliumNext/Trilium/raw/refs/heads/main/apps/server/src/assets/db/demo.zip) with the latest version of the demo notes
* Right click on any note in your tree under which you would like the demo notes to be imported
* Click "Import into note"
* Select the .zip archive to import it

11
docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Note Navigation.md vendored
View File

@@ -3,15 +3,14 @@ One of the Trilium's goals is to provide fast and comfortable navigation between
## Backwards and forward
To move back and forward in history of viewed pages:
You can use alt-left and alt-right to move back and forward in history of viewed pages.
* The <a class="reference-link" href="../UI%20Elements/Launch%20Bar.md">Launch Bar</a> can be configured to display navigation buttons (see _Go to Next Note_ and _Go to Previous Note_ in _Available Launchers_).
* On the left side of the [tab bar](../UI%20Elements/Tabs.md), there are two dedicated buttons.
* These buttons will appear only if the launch bar is not already displaying the history navigation buttons to avoid duplication.
* Alternatively, use the <kbd>Alt</kbd> + <kbd>Left</kbd> and <kbd>Alt</kbd> + <kbd>Right</kbd> keyboard shortcuts.
This works identically to browser backwards / forwards, it's actually using built-in browser support for this.
![](Note%20Navigation_image.png)
## Jump to note
This is useful to quickly find and view arbitrary notes - click on `Jump to` button on the top or press <kbd>Ctrl</kbd> + <kbd>J</kbd> . Then type part of the note name and autocomplete will help you pick the desired note.
See <a class="reference-link" href="Jump%20to.md">Jump to...</a> for more information.
See <a class="reference-link" href="Jump%20to.md">Jump to Note</a> for more information.

BIN
docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Note Navigation_image.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

2
docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.md vendored
View File

@@ -17,8 +17,6 @@ Depending on the <a class="reference-link" href="Vertical%20and%20horizontal%20
* For multitasking, tabs can be used alongside <a class="reference-link" href="Split%20View.md">Split View</a>. Each tab can have one or more notes, displayed horizontally.
* Tabs can be reordered by drag-and-dropping it into a new position.
* An existing tab can be displayed in a new window by dragging the tab upwards or downwards. It is not possible to combine tabs back into another window.
* On the left side of the tab bar there are two buttons to navigate through the note history backwards or forwards (see <a class="reference-link" href="../Navigation/Note%20Navigation.md">Note Navigation</a>).
* This feature is only enabled if the <a class="reference-link" href="Launch%20Bar.md">Launch Bar</a> doesn't already contain the history navigation buttons.
## Keyboard interaction

5
docs/User Guide/User Guide/Scripting/Frontend Basics/Custom Widgets.md vendored
View File

@@ -35,9 +35,8 @@ get parentWidget() { return "center-pane" }
doRender() {
this.&lt;!--FORMULA_INLINE_1766517018225_0--&gt;("&amp;lt;span&amp;gt;Center pane&amp;lt;/span&amp;gt;");
}</code></pre><p>}</p><p>module.exports = new HelloNoteDetail();</p></code></pre></td><td><pre><code class="language-text-x-trilium-auto">import { defineWidget } from "trilium:preact";<p></p><p>export default defineWidget({
parent: "center-pane",
render: () =&gt; &lt;span&gt;Center pane from Preact.&lt;/span&gt;
});</p></code></pre></td></tr></tbody></table>
</p><pre><code class="language-text-x-trilium-auto">parent: "center-pane",
render: () =&amp;gt; &amp;lt;span&amp;gt;Center pane from Preact.&amp;lt;/span&amp;gt;</code></pre><p>});</p></code></pre></td></tr></tbody></table>
[Refresh the application](../../Troubleshooting/Refreshing%20the%20application.md) and the widget should appear underneath the content area.