From c5113eb292c9261d65d9dcdaad652a01a74ab46a Mon Sep 17 00:00:00 2001 From: azivner Date: Fri, 9 Nov 2018 12:13:51 +0100 Subject: [PATCH] fix options dialog which used jquery tabs --- src/public/javascripts/dialogs/options.js | 3 - src/views/dialogs/options.ejs | 312 ++++++++++++---------- 2 files changed, 170 insertions(+), 145 deletions(-) diff --git a/src/public/javascripts/dialogs/options.js b/src/public/javascripts/dialogs/options.js index 414e06447..90c76b6d2 100644 --- a/src/public/javascripts/dialogs/options.js +++ b/src/public/javascripts/dialogs/options.js @@ -7,7 +7,6 @@ import zoomService from "../services/zoom.js"; import utils from "../services/utils.js"; const $dialog = $("#options-dialog"); -const $tabs = $("#options-tabs"); const tabHandlers = []; @@ -22,8 +21,6 @@ async function showDialog() { $dialog.modal(); - $tabs.tabs(); - for (const handler of tabHandlers) { if (handler.optionsLoaded) { handler.optionsLoaded(options); diff --git a/src/views/dialogs/options.ejs b/src/views/dialogs/options.ejs index 65ebde7d9..47d0fe2a9 100644 --- a/src/views/dialogs/options.ejs +++ b/src/views/dialogs/options.ejs @@ -8,186 +8,214 @@
-
-
    -
  • Appearance
    • -
  • Change password
    • -
  • Protected session
    • -
  • Note revisions
    • -
  • Sync
    • -
  • Advanced
    • -
  • About Trilium
    • +
    + -
    -

    Settings on this options tab are saved automatically after each change.

    +
    +
    +
    +

    Settings on this options tab are saved automatically after each change.

    -
    -
    - - -
    + +
    + + +
    -
    - +
    + - -
    + +
    -

    Zooming can be controlled with CTRL-+ and CTRL-= shortcuts as well.

    +

    Zooming can be controlled with CTRL-+ and CTRL-= shortcuts as well.

    -

    Left pane sizing

    +

    Left pane sizing

    -
    - +
    + - -
    + +
    -
    - +
    + - -
    + +
    -

    Left pane width is calculated from the percent of window size, if this is smaller than minimum width, then minimum width is used. If you want to have fixed width left pane, set minimum width to the desired width and set percent to 0.

    +

    Left pane width is calculated from the percent of window size, if this is smaller than minimum width, then minimum width is used. If you want to have fixed width left pane, set minimum width to the desired width and set percent to 0.

    -
    -
    -
    -
    -
    - - -
    +
    +
    -
    - - -
    +
    +
    +
    + + +
    -
    - - -
    +
    + + +
    - -
    -
    -
    -

    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.

    +
    + + +
    -
    -
    - - -
    + +
    +
    -
    - +
    +

    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.

    - -
    - -
    -
    -

    Note revision snapshot time interval is time in seconds after which new note revision will be created for the note.

    +
    +
    + + +
    - -
    - - -
    +
    + -
    - + +
    + +
    - -
    - -
    -
    -

    Sync configuration

    +
    +

    Note revision snapshot time interval is time in seconds after which new note revision will be created for the note.

    -
    -
    - - -
    + +
    + + +
    -
    - - -
    +
    + -
    - - -
    + +
    +
    +
    -
    - +
    +

    Sync configuration

    - -
    - +
    +
    + + +
    -

    Sync test

    +
    + + +
    -

    This will test connection and handshake to the sync server. If sync server isn't initialized, this will set it up to sync with local document.

    +
    + + +
    - -
    -
    -

    Sync

    - +
    + -
    -
    + +
    + - +
    -

    Debugging

    +

    Sync test

    -

    +

    This will test connection and handshake to the sync server. If sync server isn't initialized, this will set it up to sync with local document.

    -

    This action will create a new copy of the database and anonymise it (remove all note content and leave only structure and metadata) - for sharing online for debugging purposes without fear of leaking your personal data.

    + +
    -

    Vacuum database

    +
    +

    Sync

    + -

    This will rebuild database which will typically result in smaller database file. No data will be actually changed.

    +
    +
    - -
    -
    - - - - - - - - - - - - - - - - - + - - - - -
    App version:
    DB version:
    Sync version:
    Build date:
    Build revision:
    +
    +
    + +

    Debugging

    + +

    + +

    This action will create a new copy of the database and anonymise it (remove all note content and leave only structure and metadata) + for sharing online for debugging purposes without fear of leaking your personal data.

    + +

    Vacuum database

    + +

    This will rebuild database which will typically result in smaller database file. No data will be actually changed.

    + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + +
    App version:
    DB version:
    Sync version:
    Build date:
    Build revision:
    +