diff --git a/docs/Release Notes/Release Notes/v0.92.8-beta.md b/docs/Release Notes/Release Notes/v0.92.8-beta.md index 5cf968d24..b3f3158fe 100644 --- a/docs/Release Notes/Release Notes/v0.92.8-beta.md +++ b/docs/Release Notes/Release Notes/v0.92.8-beta.md @@ -1,4 +1,4 @@ -# v0.92.8-beta +# v0.92.8-beta ## 💡 Key highlights * … @@ -8,7 +8,7 @@ * Calendar does not hide when clicking on a note by @JYC333 * Mobile improvements: * [Unable to add internal link on mobile version](https://github.com/TriliumNext/Notes/issues/1677) - * Note tree not closing when selecting some of the menu actions. + * Note tree not closing when selecting some of the menu actions. * [Most tree context menu on mobile are broken](https://github.com/TriliumNext/Notes/issues/671) * [Quick search launch bar item does nothing in vertical layout](https://github.com/TriliumNext/Notes/issues/1680) @@ -34,6 +34,7 @@ ## 📖 Documentation * Described almost all of the features of text notes, including a reference of keyboard shortcuts. +* Improve external links documentation. ## 🛠️ Technical updates diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json index 3629a85f9..e0ddcbf46 100644 --- a/docs/User Guide/!!!meta.json +++ b/docs/User Guide/!!!meta.json @@ -6093,11 +6093,26 @@ "value": "bx bx-link-alt", "isInheritable": false, "position": 40 + }, + { + "type": "relation", + "name": "internalLink", + "value": "nRhnJkTT8cPs", + "isInheritable": false, + "position": 50 } ], "format": "markdown", "dataFileName": "Links.md", "attachments": [ + { + "attachmentId": "4LuLbS0gxlkC", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "Links_image.png" + }, { "attachmentId": "74XnfiCk2y9N", "title": "create-link-to-note.gif", @@ -6107,12 +6122,20 @@ "dataFileName": "Links_create-link-to-note.gif" }, { - "attachmentId": "TGdayl3Caj0R", - "title": "create-external-link.gif", + "attachmentId": "GH0rUFn6UUDY", + "title": "image.png", "role": "image", - "mime": "image/gif", + "mime": "image/png", "position": 10, - "dataFileName": "Links_create-external-link.gif" + "dataFileName": "1_Links_image.png" + }, + { + "attachmentId": "w1jpXjdAuL2B", + "title": "image.png", + "role": "image", + "mime": "image/png", + "position": 10, + "dataFileName": "2_Links_image.png" } ] }, diff --git a/docs/User Guide/User Guide/Note Types/Text/1_Links_image.png b/docs/User Guide/User Guide/Note Types/Text/1_Links_image.png new file mode 100644 index 000000000..03fdc6792 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/1_Links_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/2_Links_image.png b/docs/User Guide/User Guide/Note Types/Text/2_Links_image.png new file mode 100644 index 000000000..72b2415d5 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/2_Links_image.png differ diff --git a/docs/User Guide/User Guide/Note Types/Text/Links.md b/docs/User Guide/User Guide/Note Types/Text/Links.md index 5035522ad..39649ff91 100644 --- a/docs/User Guide/User Guide/Note Types/Text/Links.md +++ b/docs/User Guide/User Guide/Note Types/Text/Links.md @@ -1,11 +1,27 @@ # Links ## External links -External link is general web link targeting some external web resource - e.g. [https://en.wikipedia.org/wiki/South\_China\_Sea](https://en.wikipedia.org/wiki/South_China_Sea) is an external link to one Wikipedia page. +An external link is a standard web link targeting for example a website. For example, [https://en.wikipedia.org/wiki/South\_China\_Sea](https://en.wikipedia.org/wiki/South_China_Sea) is an external link to a Wikipedia page. -External links are done through CKEditor native links. To create an external link, select text and press Ctrl + K or wait for the "balloon" to appear and click link icon there. +To create a link without a custom text: -![](Links_create-external-link.gif) +* Press in the Formatting toolbar: + * A popup will appear, type or paste the URL in the box. + * Press Enter or the check mark icon to confirm. +* Alternatively, press Ctrl+K to trigger the aforementioned popup. +* A simpler way is to paste the raw link and press space to turn it automatically into a link. + +To create a link with a custom text: + +* First, type and select the text which will be turned into a link. +* Follow the previous steps to open the link interface (via the formatting toolbar, or Ctrl+K). +* Alternatively, simply paste (Ctrl+V) over the selected text to turn it into a link. + +Once a link is inserted: + +* The text inside the link can be changed if needed but the link itself will remain. +* To modify the link, click on the link to display the popup and press the _Edit link_ button. +* To remove a link, click on it and press the _Unlink_ button. You can follow external link by either double clicking (will open new tab/window) it or right clicking on them and choosing "Open in new tab". diff --git a/docs/User Guide/User Guide/Note Types/Text/Links_create-external-link.gif b/docs/User Guide/User Guide/Note Types/Text/Links_create-external-link.gif deleted file mode 100644 index 2990fdf61..000000000 Binary files a/docs/User Guide/User Guide/Note Types/Text/Links_create-external-link.gif and /dev/null differ diff --git a/docs/User Guide/User Guide/Note Types/Text/Links_image.png b/docs/User Guide/User Guide/Note Types/Text/Links_image.png new file mode 100644 index 000000000..87c31b000 Binary files /dev/null and b/docs/User Guide/User Guide/Note Types/Text/Links_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Links_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Links_image.png new file mode 100644 index 000000000..03fdc6792 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/1_Links_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Links_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Links_image.png new file mode 100644 index 000000000..72b2415d5 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/2_Links_image.png differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html index 8f7bca47d..17e3b4c06 100644 --- a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html +++ b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links.html @@ -1,13 +1,40 @@

External links

-

External link is general web link targeting some external web resource - - e.g. https://en.wikipedia.org/wiki/South_China_Sea is - an external link to one Wikipedia page.

-

External links are done through CKEditor native links. To create an external - link, select text and press Ctrl + K or wait for the - "balloon" to appear and click link icon there.

-

- -

+

An external link is a standard web link targeting for example a website. + For example, https://en.wikipedia.org/wiki/South_China_Sea is + an external link to a Wikipedia page.

+

To create a link without a custom text:

+ +

To create a link with a custom text:

+ +

Once a link is inserted:

+

You can follow external link by either double clicking (will open new tab/window) it or right clicking on them and choosing "Open in new tab".

Internal links to notes

diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links_create-external-link.gif b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links_create-external-link.gif deleted file mode 100644 index 2990fdf61..000000000 Binary files a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links_create-external-link.gif and /dev/null differ diff --git a/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links_image.png b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links_image.png new file mode 100644 index 000000000..87c31b000 Binary files /dev/null and b/src/public/app/doc_notes/en/User Guide/User Guide/Note Types/Text/Links_image.png differ