{treeEl}
;
}
diff --git a/apps/client/src/widgets/buttons/global_menu.tsx b/apps/client/src/widgets/buttons/global_menu.tsx
index 0986c8ad29..9db0393692 100644
--- a/apps/client/src/widgets/buttons/global_menu.tsx
+++ b/apps/client/src/widgets/buttons/global_menu.tsx
@@ -45,6 +45,10 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
noDropdownListStyle
mobileBackdrop
>
+ {isMobile() && <>
+
+
- {childNotes?.map(childNote =>
- )
+ -
{originalFileName &&
+ {note && {
+ server.put(`notes/${note.noteId}/type`, { type, mime });
+ setModalShown(false);
+ }}
+ />}
+
+
-
-
-
-
+ {actions.map(({ actionName, actionTitle }) => (
+ bulk_action.addAction(note.noteId, actionName)}>{actionTitle}
+ ))}
+
+
- 
-
Frequently used notes can be bookmarked, which will make them appear in + the Launch Bar for + easy access.
+Configuring the launch bar
+If bookmarks don't appear in the launch bar, then most likely the bookmark + section has been hidden. Go to the Launch Bar configuration + from the Global menu and + ensure Bookmarks is in the Visible Launchers section.
Bookmark folder
Space in the left panel is limited, and you might want to bookmark many items. One possible solution is to bookmark a folder, so it shows its children:
-
- 
-
To do this, you need to add a #bookmarkFolder label
- to the note.
To do this, bookmark a folder and assign it the #bookmarkFolder label.
Mobile
+On mobile, bookmarks are only displayed starting with v0.102.0. Because + of the more constrained screen size, the bookmarks are grouped under a + single icon instead of displaying them as separate icons.
+When pressed, a menu will appear listing all the bookmarks. Bookmark folders + are also supported and will appear as sub-menus.
\ 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/Bookmarks_bookmark-folder.png b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmark-folder.png deleted file mode 100644 index 48e9a4af59..0000000000 Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmark-folder.png and /dev/null differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmarks.gif b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmarks.gif deleted file mode 100644 index 20fca913f4..0000000000 Binary files a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmarks.gif and /dev/null differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar.html index 444d04b05e..94d5b166a5 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar.html @@ -1,8 +1,11 @@Position of the Launch bar
-Depending on the layout selected, the launcher bar will either be on the - left side of the screen with buttons displayed vertically or at the top - of the screen. See Vertical and horizontal layout for +
On desktop, depending on the layout selected, the launcher bar will either + be on the left side of the screen with buttons displayed vertically or + at the top of the screen. See Vertical and horizontal layout for more information.
+On mobile, the launch bar will always be at the bottom.
+If there are too many items in the launch bar to fit the screen, it will + become scrollable.
Terminology
- Launcher: a button that can be (or is) displayed on the @@ -12,16 +15,16 @@
- Visible Launcher: a launcher that is currently displayed on the launch bar.
Configuring the Launch bar
+Configuring the desktop Launch bar
There are two ways to configure the launch bar:
- Right click in the empty space between launchers on the launch bar and select Configure Launchbar. -
- Click on the Global menu and +
- Click on the Global menu and select Configure Launchbar.
This will open a new tab with the Note Tree listing +
This will open a new tab with the Note Tree listing the launchers.
@@ -29,6 +32,19 @@
Expanding Available Launchers section will show the list of launchers that are not displayed on the launch bar. The Visible Launchers will show the ones that are currently displayed.
+Configuring the mobile launch bar
+The launch bar on mobile uses a different configuration from the desktop + one. The reasoning is that not all desktop icons are available on mobile, + and fewer icons fit on a mobile screen.
+To configure the launch bar on mobile, go to Global menu and + select Configure Launchbar.
+The configure the mobile launch bar while on the desktop (especially useful + to configure more complicated launchers such as scripts or custom widgets), + go to Global menu → + Advanced → Show Hidden Subtree and look for the Mobile Launch Bar section. + While in the hidden subtree, it's also possible to drag launchers between + the Mobile Launch Bar and (Desktop) Launch Bar sections.
Adding/removing and reordering launchers
To display a new launcher in the launch bar, first look for it in the Available Launchers section. Then right click it and select Move to visible launchers. It is @@ -36,13 +52,13 @@
Similarly, to remove it from the launch bar, simply look for it in Visible Launchers then right click it and select Move to available launchers or use drag-and-drop.
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.
+ order. See Note Tree 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 for more information. + class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/BFs8mudNFgCS/_help_p9kXRFAkwN4o">Note Icons for more information.
- The title of the launcher can also be changed.
Resetting
@@ -54,42 +70,39 @@Right click either the Available launchers or Visible launchers sections and select one of the options:
-
-
-
-
Note Launcher -
+
A note launcher will simply navigate to a specified note. - Note Launcher
+
A note launcher will simply navigate to a specified note.- Set the
targetpromoted attribute to the note to navigate to. - Optionally, set
hoistedNoteto hoist a particular - note. See Note Hoisting for + note. See Note Hoisting for more information. - Optionally, set a
keyboardShortcutto trigger the launcher.
- - Set the
-
-
Script Launcher -
-
An advanced launcher which will run a script upon pressing. See - Scripts for more information.-
-
- Set
scriptto point to the desired script - to run.
- - Optionally, set a
keyboardShortcutto trigger - the launcher.
-
- Set
- Script Launcher
+
An advanced launcher which will run a script upon pressing. See + Scripting for more information. +-
+
- Set
scriptto point to the desired script + to run.
+ - Optionally, set a
keyboardShortcutto trigger + the launcher.
+
- - Set
- +
-
Custom Widget
Allows defining a custom widget to be rendered inside the launcher. See Widget Basics for more information.
-
- -
-
Spacers -
+ class="reference-link" href="#root/pOsGYCXsbNQG/CdNpE2pqjmI6/yIhgI5H7A2Sm/MgibgPcfeuGz/_help_SynTBQiBsdYJ">Widget Basics for more information.
Launchers that create some distance between other launchers for better - visual distinction.
+ - Spacers
+
Launchers that create some distance between other launchers for better + visual distinction.
Launchers are configured via predefined Promoted Attributes.
\ No newline at end of file +Launchers are configured via predefined Promoted Attributes.
\ 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/Split View.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.html index 6549132937..78897057fc 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View.html @@ -4,8 +4,7 @@ class="image image-style-align-center">
-
-Interactions
+Interactions
- Press the
button to the right of a note's title to open a new split to the right
@@ -51,11 +50,12 @@ class="image image-style-align-center">
- On smartphones, the split views are laid out vertically (one on the top and one on the bottom), instead of horizontally as on the desktop. -
- There can be only one split open per tab. -
- It's not possible to resize the two split panes. -
- When the keyboard is opened, the active note will be “maximized”, thus - allowing for more space even when a split is open. When the keyboard is - closed, the splits become equal in size again. +
- There can be only one split open per tab. +
- It's not possible to resize the two split panes. +
- When the keyboard is opened, the active note will be “maximized”, thus + allowing for more space even when a split is open. When the keyboard is + closed, the splits become equal in size again.
Interaction:
-
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.html
index 8d9b0ad58b..b3b425eb3e 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.html
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.html
@@ -8,7 +8,8 @@
- For the vertical layout, the tabs will be placed at the top but to the right of the Note Tree. -
- For the horizontal layout, the tabs will be placed at the top in full-width, +
- For the horizontal layout, the tabs will be placed at the top in full-width, above the note tree, allowing for more tabs to be comfortably displayed.
- 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 +
- 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.
Keyboard interaction
@@ -36,7 +38,29 @@Mobile
+
+Tabs are also supported on the Mobile Frontend.
+Since v0.102.0, the tabs are displayed by pressing the dedicated tab switcher + button in the Launch Bar. + In this view the tabs are laid out on a grid with a preview of the note + content.
+The context menu button at the top-right of the popup allows creating + a new tab, reopening the last closed tab and closing all the tabs.
+Split Views + are also indicated in the tab switcher, with two titles displayed in a + tab.
+ \ 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/Tabs_IMG_1767.PNG b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs_IMG_1767.PNG new file mode 100644 index 0000000000..dd5a7ab1e5 Binary files /dev/null and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs_IMG_1767.PNG differ diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend.html index 6ec57676f5..8fa57f89ba 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend.html @@ -1,35 +1,168 @@ -Trilium (server edition) has a mobile - web frontend which is optimized for touch based devices - smartphones and - tablets. It is activated automatically during login process based on browser - detection.
-Mobile frontend is limited in features compared to full desktop frontend.
+
+
Trilium has a mobile web frontend which is optimized for touch based devices + - smartphones and tablets. It is activated automatically during login process + based on browser detection.
+Mobile frontend is limited in features compared to the full desktop version. See below for more details on this.
-Note that this is not an Android/iOS app, this is just mobile friendly - web page served on the server edition.
+Layout basics
+Unlike the desktop version, the mobile version has a slightly different + UI meant to better fit the constrained screens of a mobile phone.
+Here is a non-exhaustive list of differences between the desktop version + and the mobile one:
+-
+
-
+
The Note Tree is + displayed as a sidebar. To display the sidebar, press the button in the + top-left of the screen.
+-
+
-
+
There is also a swipe gesture that can be done from the left of the screen, + but the browser's navigation gesture interferes with it most of the time + (depending on the platform).
+
+ -
+
Press and hold a note to display the Note tree contextual menu.
+
+
+ -
+
- The Quick search bar + is also displayed at the top of the note tree. +
- The full Search function + can be triggered either from either the Global menu or + from the Launch Bar, + if configured. +
-
+
The Launch Bar is + displayed at the bottom of the screen.
+-
+
-
+
The launch bar uses a different configuration for icons than the desktop + version. See the dedicated page for more information on how to configure + it.
+
+
+ -
+
-
+
Most of the note-related actions are grouped in the horizontal dots icon + on the top-right of the note.
+
+ -
+
The Tabs are + grouped under a tab switcher in the Launch Bar, + where the tabs are displayed in a full-screen grid with preview for easy + switching, as well as additional options such as reopening closed tabs.
+
+ -
+
Since v0.100.0, Split View can + also be used in mobile view, but with a maximum of two panes at once. The + splits are displayed vertically instead of horizontally.
+
+ -
+
Starting with v0.102.0, the New Layout is + enforced on mobile. This brings features such as the note badges, note + type switcher or collection properties which would otherwise not be available.
+
+
Installing as a PWA
+The mobile view can be set up as a PWA. While this does not offer any + offline capabilities, it will display the application in full-screen and + makes it easy to access via your mobile phone's home screen.
+On iOS with Safari
+-
+
- Open your default web browser and access your Trilium instance. +
- Login. +
-
+
Press the […] button in the bottom-right of the screen and select Share.
+
+ -
+
Scroll down to reveal the full list of items and choose “Add to Home Screen”.
+
+ -
+
Press “Add” and the web app will be available.
+
+
On Android with Google Chrome
+ +-
+
- Open your default web browser and access your Trilium instance. +
- Login. +
-
+
Press the three vertical dots icon in the top-right of the screen and + select Add to Home screen. +
+
+ -
+
Select the Install option.
+
+ -
+
Select an appropriate name.
+
+ -
+
The web app will appear as an application, not on the home screen.
+
+
On Android with Brave
+ +-
+
- Open your default web browser and access your Trilium instance. +
- Login. +
-
+
Press the three vertical dots icon in the bottom-right of the screen and + select Add to Home screen.
+
+ -
+
Press the Install option.
+
+ -
+
The web app will appear as an application, not on the home screen.
+
+
On Samsung Browser
+-
+
- Open your default web browser and access your Trilium instance. +
- Login. +
-
+
Press the hamburger menu in the bottom-right of the screen.
+
+ -
+
Select Add to, followed by Home screen.
+
+ -
+
Press Add and the web app will appear on the home page.
+
+
Testing via the desktop application
If you are running Trilium without a dedicated server installation,
you can still test the mobile application using the desktop application.
For more information, see Using the desktop application as a server.
To access it go to http://<ip>:37840/login?mobile .
Limitations
-Mobile frontend provides only some of the features of the full desktop - frontend:
--
-
- it is possible to browse the whole note tree, read and edit all types - of notes, but you can create only text notes -
- reading and editing protected notes is - possible, but creating them is not supported -
- editing options is not supported -
- cloning notes is not supported -
- uploading file attachments is not supported -
Forcing mobile/desktop frontend
-Trilium decides automatically whether to use mobile or desktop frontend. +
Trilium decides automatically whether to use mobile or desktop front-end.
If this is not appropriate, you can use ?mobile or
?desktopquery param on login page (Note: you might
need to log out).
Alternatively, simply select Switch to Mobile/Desktop Version in + the Global menu.
Scripting
-You can alter the behavior with scripts just
- like for normal frontend. For script notes to be executed, they need to
- have labeled #run=mobileStartup.
You can alter the behavior with Scripting,
+ just like for normal frontend. For script notes to be executed, they need
+ to have labeled #run=mobileStartup.
Custom Launch Bar widgets + are also supported.
\ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend_IMG_1765.PNG b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend_IMG_1765.PNG new file mode 100644 index 0000000000..5536b5ffbd Binary files /dev/null and b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Mobile Frontend_IMG_1765.PNG differ diff --git a/apps/server/src/services/hidden_subtree_launcherbar.ts b/apps/server/src/services/hidden_subtree_launcherbar.ts index 55a3b6f70f..3a56d433f7 100644 --- a/apps/server/src/services/hidden_subtree_launcherbar.ts +++ b/apps/server/src/services/hidden_subtree_launcherbar.ts @@ -40,18 +40,24 @@ export default function buildLaunchBarConfig() { type: "launcher", command: "showRecentChanges", icon: "bx bx-history" - } + }, + searchNotes: { + title: t("hidden-subtree.search-notes-title"), + type: "launcher", + command: "searchNotes", + icon: "bx bx-search", + }, + bookmarks: { + title: t("hidden-subtree.bookmarks-title"), + type: "launcher", + builtinWidget: "bookmarks", + icon: "bx bx-bookmark" + }, }; const desktopAvailableLaunchers: HiddenSubtreeItem[] = [ - { - id: "_lbBackInHistory", - ...sharedLaunchers.backInHistory - }, - { - id: "_lbForwardInHistory", - ...sharedLaunchers.forwardInHistory - }, + { id: "_lbBackInHistory", ...sharedLaunchers.backInHistory }, + { id: "_lbForwardInHistory", ...sharedLaunchers.forwardInHistory }, { id: "_commandPalette", title: t("hidden-subtree.command-palette"), @@ -82,11 +88,7 @@ export default function buildLaunchBarConfig() { }, { id: "_lbSearch", - title: t("hidden-subtree.search-notes-title"), - type: "launcher", - command: "searchNotes", - icon: "bx bx-search", - attributes: [{ type: "label", name: "desktopOnly" }] + ...sharedLaunchers.searchNotes }, { id: "_lbJumpTo", @@ -128,13 +130,7 @@ export default function buildLaunchBarConfig() { baseSize: "50", growthFactor: "0" }, - { - id: "_lbBookmarks", - title: t("hidden-subtree.bookmarks-title"), - type: "launcher", - builtinWidget: "bookmarks", - icon: "bx bx-bookmark" - }, + { id: "_lbBookmarks", ...sharedLaunchers.bookmarks }, { id: "_lbToday", ...sharedLaunchers.openToday @@ -179,22 +175,15 @@ export default function buildLaunchBarConfig() { const mobileAvailableLaunchers: HiddenSubtreeItem[] = [ { id: "_lbMobileNewNote", ...sharedLaunchers.newNote }, + { id: "_lbMobileSearchNotes", ...sharedLaunchers.searchNotes }, { id: "_lbMobileToday", ...sharedLaunchers.openToday }, - { - id: "_lbMobileRecentChanges", - ...sharedLaunchers.recentChanges - } + { id: "_lbMobileRecentChanges", ...sharedLaunchers.recentChanges }, + { id: "_lbMobileBookmarks", ...sharedLaunchers.bookmarks } ]; const mobileVisibleLaunchers: HiddenSubtreeItem[] = [ - { - id: "_lbMobileBackInHistory", - ...sharedLaunchers.backInHistory - }, - { - id: "_lbMobileForwardInHistory", - ...sharedLaunchers.forwardInHistory - }, + { id: "_lbMobileBackInHistory", ...sharedLaunchers.backInHistory }, + { id: "_lbMobileForwardInHistory", ...sharedLaunchers.forwardInHistory }, { id: "_lbMobileJumpTo", title: t("hidden-subtree.jump-to-note-title"), @@ -210,7 +199,8 @@ export default function buildLaunchBarConfig() { id: "_lbMobileTabSwitcher", title: t("hidden-subtree.tab-switcher-title"), type: "launcher", - builtinWidget: "mobileTabSwitcher" + builtinWidget: "mobileTabSwitcher", + icon: "bx bx-rectangle" } ]; diff --git a/docs/Developer Guide/Developer Guide/Documentation.md b/docs/Developer Guide/Developer Guide/Documentation.md index 16d1494028..ff5177af23 100644 --- a/docs/Developer Guide/Developer Guide/Documentation.md +++ b/docs/Developer Guide/Developer Guide/Documentation.md @@ -1,5 +1,5 @@ # Documentation -There are multiple types of documentation for Trilium:
+There are multiple types of documentation for Trilium:
* The _User Guide_ represents the user-facing documentation. This documentation can be browsed by users directly from within Trilium, by pressing F1.
* The _Developer's Guide_ represents a set of Markdown documents that present the internals of Trilium, for developers.
diff --git a/docs/User Guide/!!!meta.json b/docs/User Guide/!!!meta.json
index 55cfaa0fab..232a65b27f 100644
--- a/docs/User Guide/!!!meta.json
+++ b/docs/User Guide/!!!meta.json
@@ -1491,20 +1491,6 @@
"isInheritable": false,
"position": 20
},
- {
- "type": "relation",
- "name": "internalLink",
- "value": "bwg0e8ewQMak",
- "isInheritable": false,
- "position": 30
- },
- {
- "type": "relation",
- "name": "internalLink",
- "value": "CdNpE2pqjmI6",
- "isInheritable": false,
- "position": 40
- },
{
"type": "label",
"name": "shareAlias",
@@ -1518,11 +1504,90 @@
"value": "bx bx-mobile-alt",
"isInheritable": false,
"position": 60
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "x3i7MxGccDuM",
+ "isInheritable": false,
+ "position": 70
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "IjZS7iK5EXtb",
+ "isInheritable": false,
+ "position": 80
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "oPVyFC7WL2Lp",
+ "isInheritable": false,
+ "position": 90
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "YtSN43OrfzaA",
+ "isInheritable": false,
+ "position": 110
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "xYmIYSP6wE3F",
+ "isInheritable": false,
+ "position": 120
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "Ms1nauBra7gq",
+ "isInheritable": false,
+ "position": 130
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "eIg8jdvaoNNd",
+ "isInheritable": false,
+ "position": 140
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "3seOhtN8uLIY",
+ "isInheritable": false,
+ "position": 150
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "CdNpE2pqjmI6",
+ "isInheritable": false,
+ "position": 160
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "luNhaphA37EO",
+ "isInheritable": false,
+ "position": 170
}
],
"format": "markdown",
"dataFileName": "Mobile Frontend.md",
- "attachments": []
+ "attachments": [
+ {
+ "attachmentId": "JRliU5bOLszn",
+ "title": "IMG_1765.PNG",
+ "role": "image",
+ "mime": "image/png",
+ "position": 10,
+ "dataFileName": "Mobile Frontend_IMG_1765.PNG"
+ }
+ ]
},
{
"isClone": false,
@@ -2793,6 +2858,20 @@
"value": "tabs",
"isInheritable": false,
"position": 40
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "RDslemsQ6gCp",
+ "isInheritable": false,
+ "position": 50
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "xYmIYSP6wE3F",
+ "isInheritable": false,
+ "position": 60
}
],
"format": "markdown",
@@ -2821,6 +2900,14 @@
"mime": "image/png",
"position": 10,
"dataFileName": "2_Tabs_image.png"
+ },
+ {
+ "attachmentId": "rFdKVhoVtsLA",
+ "title": "IMG_1767.PNG",
+ "role": "image",
+ "mime": "image/png",
+ "position": 10,
+ "dataFileName": "Tabs_IMG_1767.PNG"
}
]
},
@@ -2840,20 +2927,6 @@
"type": "text",
"mime": "text/html",
"attributes": [
- {
- "type": "relation",
- "name": "internalLink",
- "value": "x0JgW8UqGXvq",
- "isInheritable": false,
- "position": 10
- },
- {
- "type": "relation",
- "name": "internalLink",
- "value": "x3i7MxGccDuM",
- "isInheritable": false,
- "position": 20
- },
{
"type": "relation",
"name": "internalLink",
@@ -2861,41 +2934,6 @@
"isInheritable": false,
"position": 30
},
- {
- "type": "relation",
- "name": "internalLink",
- "value": "p9kXRFAkwN4o",
- "isInheritable": false,
- "position": 40
- },
- {
- "type": "relation",
- "name": "internalLink",
- "value": "OR8WJ7Iz9K4U",
- "isInheritable": false,
- "position": 50
- },
- {
- "type": "relation",
- "name": "internalLink",
- "value": "CdNpE2pqjmI6",
- "isInheritable": false,
- "position": 60
- },
- {
- "type": "relation",
- "name": "internalLink",
- "value": "SynTBQiBsdYJ",
- "isInheritable": false,
- "position": 70
- },
- {
- "type": "relation",
- "name": "internalLink",
- "value": "OFXdgB2nNk1F",
- "isInheritable": false,
- "position": 80
- },
{
"type": "label",
"name": "iconClass",
@@ -2909,6 +2947,55 @@
"value": "launch-bar",
"isInheritable": false,
"position": 90
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "OFXdgB2nNk1F",
+ "isInheritable": false,
+ "position": 100
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "SynTBQiBsdYJ",
+ "isInheritable": false,
+ "position": 110
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "CdNpE2pqjmI6",
+ "isInheritable": false,
+ "position": 120
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "OR8WJ7Iz9K4U",
+ "isInheritable": false,
+ "position": 130
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "p9kXRFAkwN4o",
+ "isInheritable": false,
+ "position": 140
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "x3i7MxGccDuM",
+ "isInheritable": false,
+ "position": 150
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "x0JgW8UqGXvq",
+ "isInheritable": false,
+ "position": 160
}
],
"format": "markdown",
@@ -5256,28 +5343,25 @@
"value": "bx bx-bookmarks",
"isInheritable": false,
"position": 30
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "xYmIYSP6wE3F",
+ "isInheritable": false,
+ "position": 40
+ },
+ {
+ "type": "relation",
+ "name": "internalLink",
+ "value": "x3i7MxGccDuM",
+ "isInheritable": false,
+ "position": 50
}
],
"format": "markdown",
"dataFileName": "Bookmarks.md",
- "attachments": [
- {
- "attachmentId": "99dD0P74W8QJ",
- "title": "bookmark-folder.png",
- "role": "image",
- "mime": "image/png",
- "position": 10,
- "dataFileName": "Bookmarks_bookmark-folder.png"
- },
- {
- "attachmentId": "9dX71aLlSl9R",
- "title": "bookmarks.gif",
- "role": "image",
- "mime": "image/gif",
- "position": 10,
- "dataFileName": "Bookmarks_bookmarks.gif"
- }
- ]
+ "attachments": []
},
{
"isClone": false,
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks.md b/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks.md
index 79a61e4ad0..332ec24172 100644
--- a/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks.md
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks.md
@@ -1,12 +1,18 @@
# Bookmarks
-To easily access selected notes, you can bookmark them. See demo:
+Frequently used notes can be bookmarked, which will make them appear in the Launch Bar for easy access.
-
+## Configuring the launch bar
+
+If bookmarks don't appear in the launch bar, then most likely the bookmark section has been hidden. Go to the Launch Bar configuration from the Global menu and ensure _Bookmarks_ is in the _Visible Launchers_ section.
## Bookmark folder
Space in the left panel is limited, and you might want to bookmark many items. One possible solution is to bookmark a folder, so it shows its children:
-
+To do this, bookmark a folder and assign it the `#bookmarkFolder` label.
-To do this, you need to add a `#bookmarkFolder` label to the note.
\ No newline at end of file
+## Mobile
+
+On mobile, bookmarks are only displayed starting with v0.102.0. Because of the more constrained screen size, the bookmarks are grouped under a single icon instead of displaying them as separate icons.
+
+When pressed, a menu will appear listing all the bookmarks. Bookmark folders are also supported and will appear as sub-menus.
\ No newline at end of file
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmark-folder.png b/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmark-folder.png
deleted file mode 100644
index 48e9a4af59..0000000000
Binary files a/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmark-folder.png and /dev/null differ
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmarks.gif b/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmarks.gif
deleted file mode 100644
index 20fca913f4..0000000000
Binary files a/docs/User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks_bookmarks.gif and /dev/null differ
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar.md b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar.md
index d0ba7aecf4..e3376e0f36 100644
--- a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar.md
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar.md
@@ -1,7 +1,11 @@
# Launch Bar
## Position of the Launch bar
-Depending on the layout selected, the launcher bar will either be on the left side of the screen with buttons displayed vertically or at the top of the screen. See [Vertical and horizontal layout](Vertical%20and%20horizontal%20layout.md) for more information.
+On desktop, depending on the layout selected, the launcher bar will either be on the left side of the screen with buttons displayed vertically or at the top of the screen. See Vertical and horizontal layout for more information.
+
+On mobile, the launch bar will always be at the bottom.
+
+If there are too many items in the launch bar to fit the screen, it will become scrollable.
## Terminology
@@ -9,30 +13,38 @@ Depending on the layout selected, the launcher bar will either be on the left si
* **Available Launcher**: a launcher that is not displayed on the launch bar, but can be added.
* **Visible Launcher**: a launcher that is currently displayed on the launch bar.
-## Configuring the Launch bar
+## Configuring the desktop Launch bar
There are two ways to configure the launch bar:
* Right click in the empty space between launchers on the launch bar and select _Configure Launchbar._
-* Click on the [Global menu](Global%20menu.md) and select _Configure Launchbar_.
+* Click on the Global menu and select _Configure Launchbar_.
-This will open a new tab with the [Note Tree](Note%20Tree.md) listing the launchers.
+This will open a new tab with the Note Tree listing the launchers.
Expanding _Available Launchers_ section will show the list of launchers that are not displayed on the launch bar. The _Visible Launchers_ will show the ones that are currently displayed.
+## Configuring the mobile launch bar
+
+The launch bar on mobile uses a different configuration from the desktop one. The reasoning is that not all desktop icons are available on mobile, and fewer icons fit on a mobile screen.
+
+To configure the launch bar on mobile, go to Global menu and select _Configure Launchbar_.
+
+The configure the mobile launch bar while on the desktop (especially useful to configure more complicated launchers such as scripts or custom widgets), go to Global menu → Advanced → Show Hidden Subtree and look for the _Mobile Launch Bar_ section. While in the hidden subtree, it's also possible to drag launchers between the _Mobile Launch Bar_ and (Desktop) _Launch Bar_ sections.
+
### Adding/removing and reordering launchers
To display a new launcher in the launch bar, first look for it in the _Available Launchers_ section. Then right click it and select _Move to visible launchers_. It is also possible to drag and drop the item manually.
Similarly, to remove it from the launch bar, simply look for it in _Visible Launchers_ then right click it and select _Move to available launchers_ or use drag-and-drop.
-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.
+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
-* The icon of a launcher can be changed just like a normal note. See [Note Icons](../Notes/Note%20Icons.md) for more information.
+* The icon of a launcher can be changed just like a normal note. See Note Icons for more information.
* The title of the launcher can also be changed.
### Resetting
@@ -45,19 +57,17 @@ Right click either the _Available launchers_ or _Visible launchers_ sections and
1. **Note Launcher**
A note launcher will simply navigate to a specified note.
-
1. Set the `target` promoted attribute to the note to navigate to.
- 2. Optionally, set `hoistedNote` to hoist a particular note. See [Note Hoisting](../Navigation/Note%20Hoisting.md) for more information.
+ 2. Optionally, set `hoistedNote` to hoist a particular note. See Note Hoisting for more information.
3. Optionally, set a `keyboardShortcut` to trigger the launcher.
2. **Script Launcher**
- An advanced launcher which will run a script upon pressing. See [Scripts](../../Scripting.md) for more information.
-
+ An advanced launcher which will run a script upon pressing. See Scripting for more information.
1. Set `script` to point to the desired script to run.
2. Optionally, set a `keyboardShortcut` to trigger the launcher.
3. **Custom Widget**
- Allows defining a custom widget to be rendered inside the launcher. See [Widget Basics](../../Scripting/Frontend%20Basics/Custom%20Widgets/Widget%20Basics.md) for more information.
+ Allows defining a custom widget to be rendered inside the launcher. See Widget Basics for more information.
4. **Spacers**
Launchers that create some distance between other launchers for better visual distinction.
-Launchers are configured via predefined [Promoted Attributes](../../Advanced%20Usage/Attributes/Promoted%20Attributes.md).
\ No newline at end of file
+Launchers are configured via predefined Promoted Attributes.
\ No newline at end of file
diff --git a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.md b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.md
index 912070b6f6..13ed514cf3 100644
--- a/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.md
+++ b/docs/User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs.md
@@ -26,5 +26,20 @@ Since tabs are a commonly used feature, there are multiple keyboard shortcuts th
* Ctrl+W to close the current tab.
* Ctrl+Shift+T to reopen the last closed tab.
* Ctrl+Tab and Ctrl+Shift+Tab to go to the next or previous tab.
-* Ctrl+1, Ctrl+2, up to Ctrl+9 to activate the first, second and up til ninth tab.
-* There is also a shortcut to go to the last tab, but it is not assigned a key by default.
\ No newline at end of file
+* Ctrl+1, Ctrl+2, up to Ctrl+9 to activate the first, second and up to ninth tab.
+* There is also a shortcut to go to the last tab, but it is not assigned a key by default.
+
+## Mobile
+
+