mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
sorting widgets in options WIP
This commit is contained in:
parent
fab4c59f9b
commit
dddb02a286
3
libraries/sortable.min.js
vendored
Normal file
3
libraries/sortable.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -7,6 +7,7 @@ import zoomService from "../services/zoom.js";
|
|||||||
import utils from "../services/utils.js";
|
import utils from "../services/utils.js";
|
||||||
import cssLoader from "../services/css_loader.js";
|
import cssLoader from "../services/css_loader.js";
|
||||||
import optionsInit from "../services/options_init.js";
|
import optionsInit from "../services/options_init.js";
|
||||||
|
import libraryLoader from "../services/library_loader.js";
|
||||||
|
|
||||||
const $dialog = $("#options-dialog");
|
const $dialog = $("#options-dialog");
|
||||||
|
|
||||||
@ -346,10 +347,24 @@ addTabHandler((async function () {
|
|||||||
return {};
|
return {};
|
||||||
})());
|
})());
|
||||||
|
|
||||||
addTabHandler((function() {
|
addTabHandler((async function() {
|
||||||
const $sidebarMinWidth = $("#sidebar-min-width");
|
const $sidebarMinWidth = $("#sidebar-min-width");
|
||||||
const $sidebarWidthPercent = $("#sidebar-width-percent");
|
const $sidebarWidthPercent = $("#sidebar-width-percent");
|
||||||
const $showSidebarInNewTab = $("#show-sidebar-in-new-tab");
|
const $showSidebarInNewTab = $("#show-sidebar-in-new-tab");
|
||||||
|
const $widgetsActive = $("#widgets-active");
|
||||||
|
const $widgetsInactive = $("#widgets-inactive");
|
||||||
|
|
||||||
|
await libraryLoader.requireLibrary(libraryLoader.SORTABLE);
|
||||||
|
|
||||||
|
new Sortable($widgetsActive[0], {
|
||||||
|
group: 'shared',
|
||||||
|
animation: 150
|
||||||
|
});
|
||||||
|
|
||||||
|
new Sortable($widgetsInactive[0], {
|
||||||
|
group: 'shared',
|
||||||
|
animation: 150
|
||||||
|
});
|
||||||
|
|
||||||
async function optionsLoaded(options) {
|
async function optionsLoaded(options) {
|
||||||
$sidebarMinWidth.val(options.sidebarMinWidth);
|
$sidebarMinWidth.val(options.sidebarMinWidth);
|
||||||
|
@ -47,6 +47,8 @@ const LINK_MAP = {
|
|||||||
|
|
||||||
const PRINT_THIS = {js: ["libraries/printThis.js"]};
|
const PRINT_THIS = {js: ["libraries/printThis.js"]};
|
||||||
|
|
||||||
|
const SORTABLE = {js: ["libraries/sortable.min.js"]};
|
||||||
|
|
||||||
async function requireLibrary(library) {
|
async function requireLibrary(library) {
|
||||||
if (library.css) {
|
if (library.css) {
|
||||||
library.css.map(cssUrl => cssLoader.requireCss(cssUrl));
|
library.css.map(cssUrl => cssLoader.requireCss(cssUrl));
|
||||||
@ -82,5 +84,6 @@ export default {
|
|||||||
COMMONMARK,
|
COMMONMARK,
|
||||||
RELATION_MAP,
|
RELATION_MAP,
|
||||||
LINK_MAP,
|
LINK_MAP,
|
||||||
PRINT_THIS
|
PRINT_THIS,
|
||||||
|
SORTABLE
|
||||||
}
|
}
|
@ -343,4 +343,16 @@ body {
|
|||||||
.note-tab-row.note-tab-row-is-sorting .note-tab:not(.note-tab-is-dragging),
|
.note-tab-row.note-tab-row-is-sorting .note-tab:not(.note-tab-is-dragging),
|
||||||
.note-tab-row:not(.note-tab-row-is-sorting) .note-tab.note-tab-was-just-dragged {
|
.note-tab-row:not(.note-tab-row-is-sorting) .note-tab.note-tab-was-just-dragged {
|
||||||
transition: transform 120ms ease-in-out;
|
transition: transform 120ms ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
#widgets-configuration {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#widgets-configuration h5 {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
#widgets-configuration .list-group-item {
|
||||||
|
background: transparent;
|
||||||
}
|
}
|
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
<p>Zooming can be controlled with CTRL-+ and CTRL-= shortcuts as well.</p>
|
<p>Zooming can be controlled with CTRL-+ and CTRL-= shortcuts as well.</p>
|
||||||
|
|
||||||
<h3>Font sizes</h3>
|
<h4>Font sizes</h4>
|
||||||
|
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
@ -64,7 +64,7 @@
|
|||||||
|
|
||||||
<p>Note that tree and detail font sizing is relative to the main font size setting.</p>
|
<p>Note that tree and detail font sizing is relative to the main font size setting.</p>
|
||||||
|
|
||||||
<h3>Left pane sizing</h3>
|
<h4>Left pane sizing</h4>
|
||||||
|
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<div class="col-6">
|
<div class="col-6">
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<div id="options-note-revisions" class="tab-pane">
|
<div id="options-note-revisions" class="tab-pane">
|
||||||
<h3>Note revisions snapshot interval</h3>
|
<h4>Note revisions snapshot interval</h4>
|
||||||
|
|
||||||
<p>Note revision snapshot time interval is time in seconds after which new note revision will be created for the note.</p>
|
<p>Note revision snapshot time interval is time in seconds after which new note revision will be created for the note.</p>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<div id="options-protected-session" class="tab-pane">
|
<div id="options-protected-session" class="tab-pane">
|
||||||
<h3>Protected session timeout</h3>
|
<h4>Protected session timeout</h4>
|
||||||
|
|
||||||
<p>Protected session timeout is a time period after which the protected session is wiped out from
|
<p>Protected session timeout is a time period after which the protected session is wiped out from
|
||||||
browser's memory. This is measured from the last interaction with protected notes.</p>
|
browser's memory. This is measured from the last interaction with protected notes.</p>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<div id="options-sidebar" class="tab-pane">
|
<div id="options-sidebar" class="tab-pane">
|
||||||
<h3>Show sidebar in new tab</h3>
|
<h4>Show sidebar in new tab</h4>
|
||||||
|
|
||||||
<div class="form-check">
|
<div class="form-check">
|
||||||
<input type="checkbox" class="form-check-input" id="show-sidebar-in-new-tab">
|
<input type="checkbox" class="form-check-input" id="show-sidebar-in-new-tab">
|
||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<h3>Sidebar sizing</h3>
|
<h4>Sidebar sizing</h4>
|
||||||
|
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<div class="col-6">
|
<div class="col-6">
|
||||||
@ -37,4 +37,23 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p>Sidebar width is calculated from the percent of the detail pane, if this is smaller than minimum width, then minimum width is used. If you want to have fixed width sidebar, set minimum width to the desired width and set percent to 0.</p>
|
<p>Sidebar width is calculated from the percent of the detail pane, if this is smaller than minimum width, then minimum width is used. If you want to have fixed width sidebar, set minimum width to the desired width and set percent to 0.</p>
|
||||||
|
|
||||||
|
<h4>Widgets</h4>
|
||||||
|
|
||||||
|
<div id="widgets-configuration" class="row">
|
||||||
|
<h5 class="col-6">Active widgets</h5>
|
||||||
|
|
||||||
|
<h5 class="col-6">Inactive widgets</h5>
|
||||||
|
|
||||||
|
<div id="widgets-active" class="list-group col">
|
||||||
|
<div class="list-group-item">Item 1</div>
|
||||||
|
<div class="list-group-item">Item 2</div>
|
||||||
|
<div class="list-group-item">Item 3</div>
|
||||||
|
<div class="list-group-item">Item 4</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="widgets-inactive" class="list-group col">
|
||||||
|
<div class="list-group-item">Item 1</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
Loading…
x
Reference in New Issue
Block a user