diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json index 5e52dec25..14d1aab31 100644 --- a/docs/User Guide/!!!meta.json +++ b/docs/User Guide/!!!meta.json @@ -1542,67 +1542,6 @@ "dataFileName": "Quick Start.md", "attachments": [] }, - { - "isClone": false, - "noteId": "FJ4qLB6X4fyS", - "notePath": [ - "pOsGYCXsbNQG", - "FJ4qLB6X4fyS" - ], - "title": "What's new", - "notePosition": 30, - "prefix": null, - "isExpanded": false, - "type": "text", - "mime": "text/html", - "attributes": [ - { - "type": "relation", - "name": "internalLink", - "value": "81SGnPGMk7Xc", - "isInheritable": false, - "position": 10 - }, - { - "type": "relation", - "name": "internalLink", - "value": "NRnIZmSMc5sj", - "isInheritable": false, - "position": 20 - }, - { - "type": "relation", - "name": "internalLink", - "value": "rC3pL2aptaRE", - "isInheritable": false, - "position": 30 - }, - { - "type": "relation", - "name": "internalLink", - "value": "xWbu3jpNWapp", - "isInheritable": false, - "position": 40 - }, - { - "type": "relation", - "name": "internalLink", - "value": "BMf2nEbYlcUt", - "isInheritable": false, - "position": 50 - }, - { - "type": "label", - "name": "iconClass", - "value": "bx bx-star", - "isInheritable": false, - "position": 60 - } - ], - "format": "markdown", - "dataFileName": "What's new.md", - "attachments": [] - }, { "isClone": false, "noteId": "gh7bpGYxajRS", @@ -2061,6 +2000,13 @@ "value": "OFXdgB2nNk1F", "isInheritable": false, "position": 100 + }, + { + "type": "relation", + "name": "internalLink", + "value": "p9kXRFAkwN4o", + "isInheritable": false, + "position": 110 } ], "format": "markdown", @@ -2239,114 +2185,6 @@ "dataFileName": "Note Icons.md", "attachments": [] }, - { - "isClone": false, - "noteId": "QEAPj01N5f7w", - "notePath": [ - "pOsGYCXsbNQG", - "gh7bpGYxajRS", - "BFs8mudNFgCS", - "QEAPj01N5f7w" - ], - "title": "Links", - "notePosition": 30, - "prefix": null, - "isExpanded": false, - "type": "text", - "mime": "text/markdown", - "attributes": [ - { - "type": "relation", - "name": "imageLink", - "value": "N6O1qfBGcbFH", - "isInheritable": false, - "position": 10 - }, - { - "type": "relation", - "name": "imageLink", - "value": "dPcRcDZwyGAO", - "isInheritable": false, - "position": 20 - }, - { - "type": "relation", - "name": "internalLink", - "value": "BCkXAVs63Ttv", - "isInheritable": false, - "position": 30 - }, - { - "type": "label", - "name": "shareAlias", - "value": "links", - "isInheritable": false, - "position": 30 - } - ], - "format": "markdown", - "dataFileName": "Links.md", - "attachments": [] - }, - { - "isClone": false, - "noteId": "mT0HEkOsz6i1", - "notePath": [ - "pOsGYCXsbNQG", - "gh7bpGYxajRS", - "BFs8mudNFgCS", - "mT0HEkOsz6i1" - ], - "title": "Images", - "notePosition": 40, - "prefix": null, - "isExpanded": false, - "type": "text", - "mime": "text/html", - "attributes": [ - { - "type": "relation", - "name": "internalLink", - "value": "0vhv7lsOLy82", - "isInheritable": false, - "position": 10 - }, - { - "type": "relation", - "name": "internalLink", - "value": "kBrnXNG3Hplm", - "isInheritable": false, - "position": 20 - }, - { - "type": "label", - "name": "shareAlias", - "value": "images", - "isInheritable": false, - "position": 10 - } - ], - "format": "markdown", - "dataFileName": "Images.md", - "attachments": [ - { - "attachmentId": "MTsRB4C0yvKX", - "title": "image.png", - "role": "image", - "mime": "image/jpg", - "position": 10, - "dataFileName": "Images_image.png" - }, - { - "attachmentId": "PUjxzv10IJkx", - "title": "image.png", - "role": "image", - "mime": "image/jpg", - "position": 10, - "dataFileName": "1_Images_image.png" - } - ] - }, { "isClone": false, "noteId": "0vhv7lsOLy82", @@ -2620,82 +2458,6 @@ "dataFileName": "Sorting Notes.md", "attachments": [] }, - { - "isClone": false, - "noteId": "BMf2nEbYlcUt", - "notePath": [ - "pOsGYCXsbNQG", - "gh7bpGYxajRS", - "BFs8mudNFgCS", - "BMf2nEbYlcUt" - ], - "title": "Right-to-Left Support", - "notePosition": 110, - "prefix": null, - "isExpanded": false, - "type": "text", - "mime": "text/html", - "attributes": [ - { - "type": "relation", - "name": "internalLink", - "value": "iPIMuisry3hd", - "isInheritable": false, - "position": 10 - }, - { - "type": "label", - "name": "iconClass", - "value": "bx bx-align-right", - "isInheritable": false, - "position": 10 - } - ], - "format": "markdown", - "dataFileName": "Right-to-Left Support.md", - "attachments": [ - { - "attachmentId": "hLJbTJdMAAjW", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "Right-to-Left Support_imag.png" - }, - { - "attachmentId": "J25q0es2PQGJ", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "1_Right-to-Left Support_imag.png" - }, - { - "attachmentId": "oW5LpuCUuq1z", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "2_Right-to-Left Support_imag.png" - }, - { - "attachmentId": "ox7Zs0BvBGBD", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "3_Right-to-Left Support_imag.png" - }, - { - "attachmentId": "V7U0KMPHxH2I", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "4_Right-to-Left Support_imag.png" - } - ] - }, { "isClone": false, "noteId": "NRnIZmSMc5sj", @@ -3616,6 +3378,20 @@ "value": "", "isInheritable": false, "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-note", + "isInheritable": false, + "position": 30 + }, + { + "type": "label", + "name": "sorted", + "value": "", + "isInheritable": false, + "position": 40 } ], "format": "markdown", @@ -3730,20 +3506,13 @@ "iPIMuisry3hd", "veGu4faJErEM" ], - "title": "Content language", + "title": "Content language & Right-to-left support", "notePosition": 20, "prefix": null, "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ - { - "type": "relation", - "name": "internalLink", - "value": "BMf2nEbYlcUt", - "isInheritable": false, - "position": 10 - }, { "type": "label", "name": "iconClass", @@ -3753,7 +3522,7 @@ } ], "format": "markdown", - "dataFileName": "Content language.md", + "dataFileName": "Content language & Right-to-le.md", "attachments": [ { "attachmentId": "TlBagKsAj5ax", @@ -3761,7 +3530,15 @@ "role": "image", "mime": "image/png", "position": 10, - "dataFileName": "Content language_image.png" + "dataFileName": "Content language & Right-t.png" + }, + { + "attachmentId": "U9e8SLUEALiR", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Content language & Right-t.png" } ] }, @@ -3840,6 +3617,216 @@ } ] }, + { + "isClone": false, + "noteId": "mT0HEkOsz6i1", + "notePath": [ + "pOsGYCXsbNQG", + "KSZ04uQ2D1St", + "iPIMuisry3hd", + "mT0HEkOsz6i1" + ], + "title": "Images", + "notePosition": 40, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "relation", + "name": "internalLink", + "value": "0vhv7lsOLy82", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "kBrnXNG3Hplm", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "shareAlias", + "value": "images", + "isInheritable": false, + "position": 10 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-image-alt", + "isInheritable": false, + "position": 30 + } + ], + "format": "markdown", + "dataFileName": "Images.md", + "attachments": [ + { + "attachmentId": "40jG4olRNAlc", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "Images_image.png" + }, + { + "attachmentId": "9EQBwdObLpnJ", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Images_image.png" + }, + { + "attachmentId": "bDkYm34QEH5a", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "2_Images_image.png" + }, + { + "attachmentId": "Bi9LiB0eMbcH", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "3_Images_image.png" + }, + { + "attachmentId": "dRgFtpOcHwke", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "4_Images_image.png" + }, + { + "attachmentId": "g7xB3E2Dva2q", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "5_Images_image.png" + }, + { + "attachmentId": "HcyBaQS2SjkL", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "6_Images_image.png" + }, + { + "attachmentId": "Ilz9SuEj39RF", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "7_Images_image.png" + }, + { + "attachmentId": "MTsRB4C0yvKX", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "8_Images_image.png" + }, + { + "attachmentId": "NZJRGKS6yDeg", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "9_Images_image.png" + }, + { + "attachmentId": "PUjxzv10IJkx", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "10_Images_image.png" + }, + { + "attachmentId": "qJXx7vPPD4JW", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "11_Images_image.png" + }, + { + "attachmentId": "SoDKgOmDoyc1", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "12_Images_image.png" + } + ] + }, + { + "isClone": false, + "noteId": "QEAPj01N5f7w", + "notePath": [ + "pOsGYCXsbNQG", + "KSZ04uQ2D1St", + "iPIMuisry3hd", + "QEAPj01N5f7w" + ], + "title": "Links", + "notePosition": 50, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/markdown", + "attributes": [ + { + "type": "relation", + "name": "imageLink", + "value": "N6O1qfBGcbFH", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "imageLink", + "value": "dPcRcDZwyGAO", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "BCkXAVs63Ttv", + "isInheritable": false, + "position": 30 + }, + { + "type": "label", + "name": "shareAlias", + "value": "links", + "isInheritable": false, + "position": 30 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-link-alt", + "isInheritable": false, + "position": 40 + } + ], + "format": "markdown", + "dataFileName": "Links.md", + "attachments": [] + }, { "isClone": false, "noteId": "S6Xx8QIWTV66", @@ -3850,7 +3837,7 @@ "S6Xx8QIWTV66" ], "title": "Lists", - "notePosition": 40, + "notePosition": 60, "prefix": null, "isExpanded": false, "type": "text", diff --git a/docs/User Guide/User Guide/Basic Concepts/Keyboard Shortcuts.md b/docs/User Guide/User Guide/Basic Concepts/Keyboard Shortcuts.md index 254745853..991081c93 100644 --- a/docs/User Guide/User Guide/Basic Concepts/Keyboard Shortcuts.md +++ b/docs/User Guide/User Guide/Basic Concepts/Keyboard Shortcuts.md @@ -54,8 +54,8 @@ Trilium uses CKEditor 5 for the [text notes](../Note%20Types/Text.md) and CodeMi * `ALT-F10` - bring up inline formatting toolbar (arrow keys `<-`,`->` to navigate, `ENTER` to apply) * `ALT-F10` - again to bring up block formatting toolbar * `ENTER` in tree pane switches from tree pane into note title. Enter from note title switches focus to text editor. `CTRL+.` switches back from editor to tree pane. -* `CTRL+K` - create / edit [external link](Note/Links.md) -* `CTRL+L` - create [internal (note) link](Note/Links.md) +* `CTRL+K` - create / edit [external link](../Note%20Types/Text/Links.md) +* `CTRL+L` - create [internal (note) link](../Note%20Types/Text/Links.md) * `ALT+T` - inserts current date and time at caret position * `CTRL+.` - jump away from the editor to tree pane and scroll to current note diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/1_Right-to-Left Support_imag.png b/docs/User Guide/User Guide/Basic Concepts/Note/1_Right-to-Left Support_imag.png deleted file mode 100644 index 42b9b58e6..000000000 Binary files a/docs/User Guide/User Guide/Basic Concepts/Note/1_Right-to-Left Support_imag.png and /dev/null differ diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/2_Right-to-Left Support_imag.png b/docs/User Guide/User Guide/Basic Concepts/Note/2_Right-to-Left Support_imag.png deleted file mode 100644 index e949d074e..000000000 Binary files a/docs/User Guide/User Guide/Basic Concepts/Note/2_Right-to-Left Support_imag.png and /dev/null differ diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/3_Right-to-Left Support_imag.png b/docs/User Guide/User Guide/Basic Concepts/Note/3_Right-to-Left Support_imag.png deleted file mode 100644 index 7ac5d7bc4..000000000 Binary files a/docs/User Guide/User Guide/Basic Concepts/Note/3_Right-to-Left Support_imag.png and /dev/null differ diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/Images.md b/docs/User Guide/User Guide/Basic Concepts/Note/Images.md deleted file mode 100644 index 7c25e8f3a..000000000 --- a/docs/User Guide/User Guide/Basic Concepts/Note/Images.md +++ /dev/null @@ -1,22 +0,0 @@ -# Images -Trilium supports storing and displaying images. Supported formats are JPEG, PNG and GIF. - -An image can be uploaded in the form of note's [attachment](Attachments.md) or as a standalone [note](../Navigation/Tree%20Concepts.md) placed into the [note tree](../Navigation/Tree%20Concepts.md). Its reference can be copied into a text note, in order to display it in the text itself. - -## Uploading images - -To add an image to the note, simply drag it from file explorer onto the note editor inside Trilium and the image will be uploaded. - -![](1_Images_image.png) - -Alternatively you can click on block toolbar and then on "Insert image": - -![](Images_image.png) - -You can also copy and paste an image from web - the image will be (asynchronously) downloaded and embedded. - -## Compression - -Since Trilium isn't really meant to be primary storage for image data, it attempts to compress and resize (with pretty aggressive settings) uploaded images before storing them to the database. You may then notice some quality degradation. Basic quality settings is available in Options -> Other. - -If you want to save images in their original resolution, it is recommended to save them as attachment to note (top-right "Note actions -> Import files"). \ No newline at end of file diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support.md b/docs/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support.md deleted file mode 100644 index ef0649849..000000000 --- a/docs/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support.md +++ /dev/null @@ -1,18 +0,0 @@ -# Right-to-Left Support -Trilium now has basic support for right-to-left text, but only for  [Text](../../Note%20Types/Text.md) note types (both editable and read-only). - -| | | -| --- | --- | -| ![](2_Right-to-Left%20Support_imag.png) | ![](1_Right-to-Left%20Support_imag.png) | - -Note that only the Text note type supports this. - -The list of languages is configurable via the a new dedicated settings page: - -![](3_Right-to-Left%20Support_imag.png) - -To select the corresponding language of the text, go to “Basic Properties” and select your desired language. - -![](Right-to-Left%20Support_imag.png) - -Feel free to report any issues regarding right to left support. \ No newline at end of file diff --git a/docs/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.md b/docs/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.md index c218faec8..d01048a5e 100644 --- a/docs/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.md +++ b/docs/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.md @@ -30,6 +30,11 @@ Similarly, to remove it from the launch bar, simply look for it in _Visible Laun Drag-and-drop the items in the tree in order to change their order. See [Note Tree](Note%20Tree.md) for more interaction options, including using keyboard shortcuts. +## Customizing the launcher + +* The icon of a launcher can be changed just like a normal note. See [Note Icons](../Note/Note%20Icons.md) for more information. +* The title of the launcher can also be changed. + ### Resetting Resetting allows restoring the original configuration of Trilium for the launcher bar, or for a portion of it. Simply right click a launcher (or even the entire _Launch Bar_ section) and select _Reset_ to bring it back to the original state. diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/1_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/10_Images_image.png similarity index 100% rename from docs/User Guide/User Guide/Basic Concepts/Note/1_Images_image.png rename to docs/User Guide/User Guide/Note Types/Text/10_Images_image.png diff --git a/docs/User Guide/User Guide/Note Types/Text/11_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/11_Images_image.png new file mode 100644 index 000000000..b7bd3af59 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/11_Images_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/12_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/12_Images_image.png new file mode 100644 index 000000000..71537a769 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/12_Images_image.png differ diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support_imag.png b/docs/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png similarity index 100% rename from docs/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support_imag.png rename to docs/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png diff --git a/docs/User Guide/User Guide/Note Types/Text/1_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/1_Images_image.png new file mode 100644 index 000000000..b7bd3af59 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/1_Images_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/2_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/2_Images_image.png new file mode 100644 index 000000000..a4e23ef9a Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/2_Images_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/3_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/3_Images_image.png new file mode 100644 index 000000000..08a40b0d0 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/3_Images_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/4_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/4_Images_image.png new file mode 100644 index 000000000..297d49ee5 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/4_Images_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/5_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/5_Images_image.png new file mode 100644 index 000000000..11bb32b67 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/5_Images_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/6_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/6_Images_image.png new file mode 100644 index 000000000..a0b1f2579 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/6_Images_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/7_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/7_Images_image.png new file mode 100644 index 000000000..a0b1f2579 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/7_Images_image.png differ diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/Images_image.png b/docs/User Guide/User Guide/Note Types/Text/8_Images_image.png similarity index 100% rename from docs/User Guide/User Guide/Basic Concepts/Note/Images_image.png rename to docs/User Guide/User Guide/Note Types/Text/8_Images_image.png diff --git a/docs/User Guide/User Guide/Note Types/Text/9_Images_image.png b/docs/User Guide/User Guide/Note Types/Text/9_Images_image.png new file mode 100644 index 000000000..731df83bb Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/9_Images_image.png differ diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/4_Right-to-Left Support_imag.png b/docs/User Guide/User Guide/Note Types/Text/Content language & Right-t.png similarity index 100% rename from docs/User Guide/User Guide/Basic Concepts/Note/4_Right-to-Left Support_imag.png rename to docs/User Guide/User Guide/Note Types/Text/Content language & Right-t.png diff --git a/docs/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.md b/docs/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.md new file mode 100644 index 000000000..c2b917bdf --- /dev/null +++ b/docs/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.md @@ -0,0 +1,12 @@ +# Content language & Right-to-left support +![](1_Content%20language%20&%20Right-t.png) + +A language hint can be provided for text notes. This option informs the browser or the desktop application about the language the note is written in (for example this might help with spellchecking), and it also determines whether the text is displayed from right-to-left for languages such as Arabic, Hebrew, etc. + +## Setting the language + +To set the language of the content, go to “Basic Properties” and look for the “Language” field. + +## Adjusting the list of languages + +By default there will be no language configured, they can be configured by going to settings or by selecting the “Configure languages” item when setting the language. \ No newline at end of file diff --git a/docs/User Guide/User Guide/Note Types/Text/Content language.md b/docs/User Guide/User Guide/Note Types/Text/Content language.md deleted file mode 100644 index 4dfbc0296..000000000 --- a/docs/User Guide/User Guide/Note Types/Text/Content language.md +++ /dev/null @@ -1,8 +0,0 @@ -# Content language -A language hint can be provided for text notes. This option informs the browser or the desktop application about the language the note is written in (for example this might help with spellchecking), and it also determines whether the text is displayed from right-to-left for languages such as Arabic, Hebrew, etc. - -For more information about right-to-left support, see [Right-to-left text notes](../../Basic%20Concepts/Note/Right-to-Left%20Support.md). - -To set the language of the content, go to “Basic Properties” and look for the “Language” field. By default there will be no content languages set, they can be configured by going to settings or by selecting the “Configure languages” item in the list. - -![](Content%20language_image.png) \ No newline at end of file diff --git a/docs/User Guide/User Guide/Note Types/Text/Images.md b/docs/User Guide/User Guide/Note Types/Text/Images.md new file mode 100644 index 000000000..9d8ad6e10 --- /dev/null +++ b/docs/User Guide/User Guide/Note Types/Text/Images.md @@ -0,0 +1,38 @@ +# Images +Trilium supports storing and displaying images. Supported formats are JPEG, PNG and GIF. + +An image can be uploaded in the form of note's [attachment](../../Basic%20Concepts/Note/Attachments.md) or as a standalone [note](../../Basic%20Concepts/Navigation/Tree%20Concepts.md) placed into the [note tree](../../Basic%20Concepts/Navigation/Tree%20Concepts.md). Its reference can be copied into a text note, in order to display it in the text itself. + +## Uploading images + +To add an image to the note, simply drag it from file explorer onto the note editor inside Trilium and the image will be uploaded. + +![](10_Images_image.png) + +Alternatively you can click on block toolbar and then on "Insert image": + +![](8_Images_image.png) + +You can also copy and paste an image from web - the image will be (asynchronously) downloaded and embedded. + +## Configuring the images + +Clicking on an image will reveal a popup with multiple options: +![](11_Images_image.png) + +### Alignment + +The first set of options configure the alignment are, in order: + +| Icon | Option | Preview | Description | +| --- | --- | --- | --- | +| ![](7_Images_image.png) | Inline | ![](2_Images_image.png) | As the name suggests, the name can be put inside a paragraph and moved around similarly as if it was a block of text. Use drag & drop or cut-paste to move it around. | +| ![](12_Images_image.png) | Centered image | ![](3_Images_image.png) | The image will be displayed as a block and centered, not allowing text in either the left or right of it. | +| ![](5_Images_image.png) | Wrap text | ![](9_Images_image.png) | The image will be displayed to the left or the right of the text. | +| ![](Images_image.png) | Block align | ![](4_Images_image.png) | Similarly to _Centered image_, the image will be displayed as a block and aligned either to the left or to the right, but not allowing text to flow on either of its sides. | + +## Compression + +Since Trilium isn't really meant to be primary storage for image data, it attempts to compress and resize (with pretty aggressive settings) uploaded images before storing them to the database. You may then notice some quality degradation. Basic quality settings is available in Options -> Other. + +If you want to save images in their original resolution, it is recommended to save them as attachment to note (top-right "Note actions -> Import files"). \ No newline at end of file diff --git a/docs/User Guide/User Guide/Note Types/Text/Images_image.png b/docs/User Guide/User Guide/Note Types/Text/Images_image.png new file mode 100644 index 000000000..3183542b3 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/Images_image.png differ diff --git a/docs/User Guide/User Guide/Basic Concepts/Note/Links.md b/docs/User Guide/User Guide/Note Types/Text/Links.md similarity index 100% rename from docs/User Guide/User Guide/Basic Concepts/Note/Links.md rename to docs/User Guide/User Guide/Note Types/Text/Links.md diff --git a/docs/User Guide/User Guide/What's new.md b/docs/User Guide/User Guide/What's new.md deleted file mode 100644 index cf93a839d..000000000 --- a/docs/User Guide/User Guide/What's new.md +++ /dev/null @@ -1,6 +0,0 @@ -# What's new -1. [Geo map](Note%20Types/Geo%20map.md) -2. [Export as PDF](Basic%20Concepts/Note/Export%20as%20PDF.md) -3. [Zen mode](Basic%20Concepts/Zen%20mode.md) -4. [Calendar View](Note%20Types/Book/Calendar%20View.md) -5. [Right-to-Left Support](Basic%20Concepts/Note/Right-to-Left%20Support.md) \ No newline at end of file diff --git a/src/public/app/doc_notes/en/User Guide/!!!meta.json b/src/public/app/doc_notes/en/User Guide/!!!meta.json index 6598222f9..494c14914 100644 --- a/src/public/app/doc_notes/en/User Guide/!!!meta.json +++ b/src/public/app/doc_notes/en/User Guide/!!!meta.json @@ -1542,67 +1542,6 @@ "dataFileName": "Quick Start.html", "attachments": [] }, - { - "isClone": false, - "noteId": "FJ4qLB6X4fyS", - "notePath": [ - "pOsGYCXsbNQG", - "FJ4qLB6X4fyS" - ], - "title": "What's new", - "notePosition": 30, - "prefix": null, - "isExpanded": false, - "type": "text", - "mime": "text/html", - "attributes": [ - { - "type": "relation", - "name": "internalLink", - "value": "81SGnPGMk7Xc", - "isInheritable": false, - "position": 10 - }, - { - "type": "relation", - "name": "internalLink", - "value": "NRnIZmSMc5sj", - "isInheritable": false, - "position": 20 - }, - { - "type": "relation", - "name": "internalLink", - "value": "rC3pL2aptaRE", - "isInheritable": false, - "position": 30 - }, - { - "type": "relation", - "name": "internalLink", - "value": "xWbu3jpNWapp", - "isInheritable": false, - "position": 40 - }, - { - "type": "relation", - "name": "internalLink", - "value": "BMf2nEbYlcUt", - "isInheritable": false, - "position": 50 - }, - { - "type": "label", - "name": "iconClass", - "value": "bx bx-star", - "isInheritable": false, - "position": 60 - } - ], - "format": "html", - "dataFileName": "What's new.html", - "attachments": [] - }, { "isClone": false, "noteId": "gh7bpGYxajRS", @@ -2061,6 +2000,13 @@ "value": "OFXdgB2nNk1F", "isInheritable": false, "position": 100 + }, + { + "type": "relation", + "name": "internalLink", + "value": "p9kXRFAkwN4o", + "isInheritable": false, + "position": 110 } ], "format": "html", @@ -2239,114 +2185,6 @@ "dataFileName": "Note Icons.html", "attachments": [] }, - { - "isClone": false, - "noteId": "QEAPj01N5f7w", - "notePath": [ - "pOsGYCXsbNQG", - "gh7bpGYxajRS", - "BFs8mudNFgCS", - "QEAPj01N5f7w" - ], - "title": "Links", - "notePosition": 30, - "prefix": null, - "isExpanded": false, - "type": "text", - "mime": "text/markdown", - "attributes": [ - { - "type": "relation", - "name": "imageLink", - "value": "N6O1qfBGcbFH", - "isInheritable": false, - "position": 10 - }, - { - "type": "relation", - "name": "imageLink", - "value": "dPcRcDZwyGAO", - "isInheritable": false, - "position": 20 - }, - { - "type": "relation", - "name": "internalLink", - "value": "BCkXAVs63Ttv", - "isInheritable": false, - "position": 30 - }, - { - "type": "label", - "name": "shareAlias", - "value": "links", - "isInheritable": false, - "position": 30 - } - ], - "format": "html", - "dataFileName": "Links.html", - "attachments": [] - }, - { - "isClone": false, - "noteId": "mT0HEkOsz6i1", - "notePath": [ - "pOsGYCXsbNQG", - "gh7bpGYxajRS", - "BFs8mudNFgCS", - "mT0HEkOsz6i1" - ], - "title": "Images", - "notePosition": 40, - "prefix": null, - "isExpanded": false, - "type": "text", - "mime": "text/html", - "attributes": [ - { - "type": "relation", - "name": "internalLink", - "value": "0vhv7lsOLy82", - "isInheritable": false, - "position": 10 - }, - { - "type": "relation", - "name": "internalLink", - "value": "kBrnXNG3Hplm", - "isInheritable": false, - "position": 20 - }, - { - "type": "label", - "name": "shareAlias", - "value": "images", - "isInheritable": false, - "position": 10 - } - ], - "format": "html", - "dataFileName": "Images.html", - "attachments": [ - { - "attachmentId": "MTsRB4C0yvKX", - "title": "image.png", - "role": "image", - "mime": "image/jpg", - "position": 10, - "dataFileName": "Images_image.png" - }, - { - "attachmentId": "PUjxzv10IJkx", - "title": "image.png", - "role": "image", - "mime": "image/jpg", - "position": 10, - "dataFileName": "1_Images_image.png" - } - ] - }, { "isClone": false, "noteId": "0vhv7lsOLy82", @@ -2620,82 +2458,6 @@ "dataFileName": "Sorting Notes.html", "attachments": [] }, - { - "isClone": false, - "noteId": "BMf2nEbYlcUt", - "notePath": [ - "pOsGYCXsbNQG", - "gh7bpGYxajRS", - "BFs8mudNFgCS", - "BMf2nEbYlcUt" - ], - "title": "Right-to-Left Support", - "notePosition": 110, - "prefix": null, - "isExpanded": false, - "type": "text", - "mime": "text/html", - "attributes": [ - { - "type": "relation", - "name": "internalLink", - "value": "iPIMuisry3hd", - "isInheritable": false, - "position": 10 - }, - { - "type": "label", - "name": "iconClass", - "value": "bx bx-align-right", - "isInheritable": false, - "position": 10 - } - ], - "format": "html", - "dataFileName": "Right-to-Left Support.html", - "attachments": [ - { - "attachmentId": "hLJbTJdMAAjW", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "Right-to-Left Support_imag.png" - }, - { - "attachmentId": "J25q0es2PQGJ", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "1_Right-to-Left Support_imag.png" - }, - { - "attachmentId": "oW5LpuCUuq1z", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "2_Right-to-Left Support_imag.png" - }, - { - "attachmentId": "ox7Zs0BvBGBD", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "3_Right-to-Left Support_imag.png" - }, - { - "attachmentId": "V7U0KMPHxH2I", - "title": "image.png", - "role": "image", - "mime": "image/png", - "position": 10, - "dataFileName": "4_Right-to-Left Support_imag.png" - } - ] - }, { "isClone": false, "noteId": "NRnIZmSMc5sj", @@ -2810,7 +2572,7 @@ "title": "Navigation", "notePosition": 50, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [], @@ -3537,7 +3299,7 @@ "title": "Note Types", "notePosition": 70, "prefix": null, - "isExpanded": false, + "isExpanded": true, "type": "text", "mime": "text/html", "attributes": [ @@ -3564,7 +3326,7 @@ "title": "Text", "notePosition": 10, "prefix": null, - "isExpanded": false, + "isExpanded": true, "type": "text", "mime": "text/markdown", "attributes": [ @@ -3616,6 +3378,20 @@ "value": "", "isInheritable": false, "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-note", + "isInheritable": false, + "position": 30 + }, + { + "type": "label", + "name": "sorted", + "value": "", + "isInheritable": false, + "position": 40 } ], "format": "html", @@ -3730,20 +3506,13 @@ "iPIMuisry3hd", "veGu4faJErEM" ], - "title": "Content language", + "title": "Content language & Right-to-left support", "notePosition": 20, "prefix": null, "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ - { - "type": "relation", - "name": "internalLink", - "value": "BMf2nEbYlcUt", - "isInheritable": false, - "position": 10 - }, { "type": "label", "name": "iconClass", @@ -3753,7 +3522,7 @@ } ], "format": "html", - "dataFileName": "Content language.html", + "dataFileName": "Content language & Right-to-le.html", "attachments": [ { "attachmentId": "TlBagKsAj5ax", @@ -3761,7 +3530,15 @@ "role": "image", "mime": "image/png", "position": 10, - "dataFileName": "Content language_image.png" + "dataFileName": "Content language & Right-t.png" + }, + { + "attachmentId": "U9e8SLUEALiR", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Content language & Right-t.png" } ] }, @@ -3840,6 +3617,216 @@ } ] }, + { + "isClone": false, + "noteId": "mT0HEkOsz6i1", + "notePath": [ + "pOsGYCXsbNQG", + "KSZ04uQ2D1St", + "iPIMuisry3hd", + "mT0HEkOsz6i1" + ], + "title": "Images", + "notePosition": 40, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "relation", + "name": "internalLink", + "value": "0vhv7lsOLy82", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "internalLink", + "value": "kBrnXNG3Hplm", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "shareAlias", + "value": "images", + "isInheritable": false, + "position": 10 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-image-alt", + "isInheritable": false, + "position": 30 + } + ], + "format": "html", + "dataFileName": "Images.html", + "attachments": [ + { + "attachmentId": "40jG4olRNAlc", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "Images_image.png" + }, + { + "attachmentId": "9EQBwdObLpnJ", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "1_Images_image.png" + }, + { + "attachmentId": "bDkYm34QEH5a", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "2_Images_image.png" + }, + { + "attachmentId": "Bi9LiB0eMbcH", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "3_Images_image.png" + }, + { + "attachmentId": "dRgFtpOcHwke", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "4_Images_image.png" + }, + { + "attachmentId": "g7xB3E2Dva2q", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "5_Images_image.png" + }, + { + "attachmentId": "HcyBaQS2SjkL", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "6_Images_image.png" + }, + { + "attachmentId": "Ilz9SuEj39RF", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "7_Images_image.png" + }, + { + "attachmentId": "MTsRB4C0yvKX", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "8_Images_image.png" + }, + { + "attachmentId": "NZJRGKS6yDeg", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "9_Images_image.png" + }, + { + "attachmentId": "PUjxzv10IJkx", + "title": "image.png", + "role": "image", + "mime": "image/jpg", + "position": 10, + "dataFileName": "10_Images_image.png" + }, + { + "attachmentId": "qJXx7vPPD4JW", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "11_Images_image.png" + }, + { + "attachmentId": "SoDKgOmDoyc1", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "12_Images_image.png" + } + ] + }, + { + "isClone": false, + "noteId": "QEAPj01N5f7w", + "notePath": [ + "pOsGYCXsbNQG", + "KSZ04uQ2D1St", + "iPIMuisry3hd", + "QEAPj01N5f7w" + ], + "title": "Links", + "notePosition": 50, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/markdown", + "attributes": [ + { + "type": "relation", + "name": "imageLink", + "value": "N6O1qfBGcbFH", + "isInheritable": false, + "position": 10 + }, + { + "type": "relation", + "name": "imageLink", + "value": "dPcRcDZwyGAO", + "isInheritable": false, + "position": 20 + }, + { + "type": "relation", + "name": "internalLink", + "value": "BCkXAVs63Ttv", + "isInheritable": false, + "position": 30 + }, + { + "type": "label", + "name": "shareAlias", + "value": "links", + "isInheritable": false, + "position": 30 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-link-alt", + "isInheritable": false, + "position": 40 + } + ], + "format": "html", + "dataFileName": "Links.html", + "attachments": [] + }, { "isClone": false, "noteId": "S6Xx8QIWTV66", @@ -3850,7 +3837,7 @@ "S6Xx8QIWTV66" ], "title": "Lists", - "notePosition": 40, + "notePosition": 60, "prefix": null, "isExpanded": false, "type": "text", @@ -6513,7 +6500,7 @@ "title": "Troubleshooting", "notePosition": 180, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/markdown", "attributes": [ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Keyboard Shortcuts.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Keyboard Shortcuts.html index aa178c56b..2a7818d9b 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Keyboard Shortcuts.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Keyboard Shortcuts.html @@ -101,9 +101,9 @@
  • ENTER in tree pane switches from tree pane into note title. Enter from note title switches focus to text editor. CTRL+. switches back from editor to tree pane.
  • -
  • CTRL+K - create / edit external link +
  • CTRL+K - create / edit external link
  • -
  • CTRL+L - create internal (note) link +
  • CTRL+L - create internal (note) link
  • ALT+T - inserts current date and time at caret position
  • CTRL+. - jump away from the editor to tree pane and scroll diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/1_Right-to-Left Support_imag.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/1_Right-to-Left Support_imag.png deleted file mode 100644 index 42b9b58e6..000000000 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/1_Right-to-Left Support_imag.png and /dev/null differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/2_Right-to-Left Support_imag.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/2_Right-to-Left Support_imag.png deleted file mode 100644 index e949d074e..000000000 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/2_Right-to-Left Support_imag.png and /dev/null differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/3_Right-to-Left Support_imag.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/3_Right-to-Left Support_imag.png deleted file mode 100644 index 7ac5d7bc4..000000000 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/3_Right-to-Left Support_imag.png and /dev/null differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/4_Right-to-Left Support_imag.png b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/4_Right-to-Left Support_imag.png deleted file mode 100644 index 20864f8af..000000000 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/4_Right-to-Left Support_imag.png and /dev/null differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Images.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Images.html deleted file mode 100644 index 62862588d..000000000 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Images.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - Images - - - -
    -

    Images

    - -
    -

    Trilium supports storing and displaying images. Supported formats are - JPEG, PNG and GIF.

    -

    An image can be uploaded in the form of note's attachment or - as a standalone note placed - into the note tree. Its - reference can be copied into a text note, in order to display it in the - text itself.

    - -

    Uploading images

    - -

    To add an image to the note, simply drag it from file explorer onto the - note editor inside Trilium and the image will be uploaded.

    -

    - -

    -

    Alternatively you can click on block toolbar and then on "Insert image":

    -

    - -

    -

    You can also copy and paste an image from web - the image will be (asynchronously) - downloaded and embedded.

    - -

    Compression

    - -

    Since Trilium isn't really meant to be primary storage for image data, - it attempts to compress and resize (with pretty aggressive settings) uploaded - images before storing them to the database. You may then notice some quality - degradation. Basic quality settings is available in Options -> Other.

    -

    If you want to save images in their original resolution, it is recommended - to save them as attachment to note (top-right "Note actions -> Import - files").

    -
    -
    - - - \ No newline at end of file diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support.html deleted file mode 100644 index 617aa6152..000000000 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - Right-to-Left Support - - - -
    -

    Right-to-Left Support

    - -
    -

    Trilium now has basic support for right-to-left text, but only for  - Text note types (both editable and read-only).

    - - - - - - - - - - - - - -
    - - - -
    -

    Note that only the Text note type supports this.

    -

    The list of languages is configurable via the a new dedicated settings - page:

    -

    - -

    -

    To select the corresponding language of the text, go to “Basic Properties” - and select your desired language.

    -

    - -

    -

    Feel free to report any issues regarding right to left support.

    -
    -
    - - - \ No newline at end of file diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.html b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.html index df45531fa..95c072cb4 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/UI Elements/Launch Bar.html @@ -53,6 +53,13 @@

    Drag-and-drop the items in the tree in order to change their order. See Note Tree for more interaction options, including using keyboard shortcuts.

    +

    Customizing the launcher

    +

    Resetting

    Resetting allows restoring the original configuration of Trilium for the launcher bar, or for a portion of it. Simply right click a launcher (or diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/1_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/10_Images_image.png similarity index 100% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/1_Images_image.png rename to src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/10_Images_image.png diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/11_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/11_Images_image.png new file mode 100644 index 000000000..b7bd3af59 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/11_Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/12_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/12_Images_image.png new file mode 100644 index 000000000..71537a769 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/12_Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support_imag.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png similarity index 100% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Right-to-Left Support_imag.png rename to src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Content language & Right-t.png diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Images_image.png new file mode 100644 index 000000000..b7bd3af59 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Images_image.png new file mode 100644 index 000000000..a4e23ef9a Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/3_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/3_Images_image.png new file mode 100644 index 000000000..08a40b0d0 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/3_Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/4_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/4_Images_image.png new file mode 100644 index 000000000..297d49ee5 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/4_Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/5_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/5_Images_image.png new file mode 100644 index 000000000..11bb32b67 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/5_Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/6_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/6_Images_image.png new file mode 100644 index 000000000..a0b1f2579 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/6_Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/7_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/7_Images_image.png new file mode 100644 index 000000000..a0b1f2579 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/7_Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/8_Images_image.png similarity index 100% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Images_image.png rename to src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/8_Images_image.png diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/9_Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/9_Images_image.png new file mode 100644 index 000000000..731df83bb Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/9_Images_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/Content language_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-t.png similarity index 100% rename from docs/User Guide/User Guide/Note Types/Text/Content language_image.png rename to src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-t.png diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.html similarity index 52% rename from src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.html index d2e9a9009..dfbec8d21 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language & Right-to-le.html @@ -5,27 +5,30 @@ - Content language + Content language & Right-to-left support

    -

    Content language

    +

    Content language & Right-to-left support

    +
    + +

    A language hint can be provided for text notes. This option informs the browser or the desktop application about the language the note is written in (for example this might help with spellchecking), and it also determines whether the text is displayed from right-to-left for languages such as Arabic, Hebrew, etc.

    -

    For more information about right-to-left support, see Right-to-left text notes.

    +

    Setting the language

    To set the language of the content, go to “Basic Properties” and look - for the “Language” field. By default there will be no content languages - set, they can be configured by going to settings or by selecting the “Configure - languages” item in the list.

    -

    - -

    + for the “Language” field.

    +

    Adjusting the list of languages

    +

    By default there will be no language configured, they can be configured + by going to settings or by selecting the “Configure languages” item when + setting the language.

    diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language_image.png deleted file mode 100644 index 20864f8af..000000000 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Content language_image.png and /dev/null differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images.html new file mode 100644 index 000000000..4848b064d --- /dev/null +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images.html @@ -0,0 +1,133 @@ + + + + + + + + Images + + + +
    +

    Images

    + +
    +

    Trilium supports storing and displaying images. Supported formats are + JPEG, PNG and GIF.

    +

    An image can be uploaded in the form of note's attachment or + as a standalone note placed + into the note tree. + Its reference can be copied into a text note, in order to display it in + the text itself.

    +

    Uploading images

    +

    To add an image to the note, simply drag it from file explorer onto the + note editor inside Trilium and the image will be uploaded.

    +

    + +

    +

    Alternatively you can click on block toolbar and then on "Insert image":

    +

    + +

    +

    You can also copy and paste an image from web - the image will be (asynchronously) + downloaded and embedded.

    +

    Configuring the images

    +

    Clicking on an image will reveal a popup with multiple options: +
    + +

    +

    Alignment

    +

    The first set of options configure the alignment are, in order:

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    IconOptionPreviewDescription
    + + Inline +
    + +
    +
    As the name suggests, the name can be put inside a paragraph and moved + around similarly as if it was a block of text. Use drag & drop or cut-paste + to move it around.
    + + Centered image +
    + +
    +
    The image will be displayed as a block and centered, not allowing text + in either the left or right of it.
    + + Wrap text +
    + +
    +

     

    +
    The image will be displayed to the left or the right of the text.
    + + Block align +
    + +
    +
    Similarly to Centered image, the image will be displayed as a block + and aligned either to the left or to the right, but not allowing text to + flow on either of its sides.
    +
    +

    Compression

    +

    Since Trilium isn't really meant to be primary storage for image data, + it attempts to compress and resize (with pretty aggressive settings) uploaded + images before storing them to the database. You may then notice some quality + degradation. Basic quality settings is available in Options -> Other.

    +

    If you want to save images in their original resolution, it is recommended + to save them as attachment to note (top-right "Note actions -> Import + files").

    +
    +
    + + + \ No newline at end of file diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images_image.png new file mode 100644 index 000000000..3183542b3 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Images_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Links.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html similarity index 100% rename from src/public/app/doc_notes/en/User Guide/User Guide/Basic Concepts/Note/Links.html rename to src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/What's new.html b/src/public/app/doc_notes/en/User Guide/User Guide/What's new.html deleted file mode 100644 index 2820a3651..000000000 --- a/src/public/app/doc_notes/en/User Guide/User Guide/What's new.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - What's new - - - -
    -

    What's new

    - - -
    - - - \ No newline at end of file diff --git a/src/public/app/doc_notes/en/User Guide/navigation.html b/src/public/app/doc_notes/en/User Guide/navigation.html index 91d057181..dc34e2016 100644 --- a/src/public/app/doc_notes/en/User Guide/navigation.html +++ b/src/public/app/doc_notes/en/User Guide/navigation.html @@ -78,8 +78,6 @@
  • Quick Start
  • -
  • What's new -
  • Basic Concepts