diff --git a/src/public/javascripts/dialogs/about.js b/src/public/javascripts/dialogs/about.js new file mode 100644 index 000000000..cac22397d --- /dev/null +++ b/src/public/javascripts/dialogs/about.js @@ -0,0 +1,29 @@ +import server from "../services/server.js"; + +const $dialog = $("#about-dialog"); +const $appVersion = $("#app-version"); +const $dbVersion = $("#db-version"); +const $syncVersion = $("#sync-version"); +const $buildDate = $("#build-date"); +const $buildRevision = $("#build-revision"); +const $dataDirectory = $("#data-directory"); + +async function showDialog() { + const appInfo = await server.get('app-info'); + + $appVersion.text(appInfo.appVersion); + $dbVersion.text(appInfo.dbVersion); + $syncVersion.text(appInfo.syncVersion); + $buildDate.text(appInfo.buildDate); + $buildRevision.text(appInfo.buildRevision); + $buildRevision.attr('href', 'https://github.com/zadam/trilium/commit/' + appInfo.buildRevision); + $dataDirectory.text(appInfo.dataDirectory); + + glob.activeDialog = $dialog; + + $dialog.modal(); +} + +export default { + showDialog +} \ No newline at end of file diff --git a/src/public/javascripts/dialogs/options.js b/src/public/javascripts/dialogs/options.js index 3a1b82e98..c2b721388 100644 --- a/src/public/javascripts/dialogs/options.js +++ b/src/public/javascripts/dialogs/options.js @@ -247,27 +247,6 @@ addTabHandler((function () { }; })()); -addTabHandler((async function () { - const $appVersion = $("#app-version"); - const $dbVersion = $("#db-version"); - const $syncVersion = $("#sync-version"); - const $buildDate = $("#build-date"); - const $buildRevision = $("#build-revision"); - const $dataDirectory = $("#data-directory"); - - const appInfo = await server.get('app-info'); - - $appVersion.text(appInfo.appVersion); - $dbVersion.text(appInfo.dbVersion); - $syncVersion.text(appInfo.syncVersion); - $buildDate.text(appInfo.buildDate); - $buildRevision.text(appInfo.buildRevision); - $buildRevision.attr('href', 'https://github.com/zadam/trilium/commit/' + appInfo.buildRevision); - $dataDirectory.text(appInfo.dataDirectory); - - return {}; -})()); - addTabHandler((function() { const $form = $("#sync-setup-form"); const $syncServerHost = $("#sync-server-host"); diff --git a/src/public/javascripts/services/entrypoints.js b/src/public/javascripts/services/entrypoints.js index ad116f55a..f22b03efe 100644 --- a/src/public/javascripts/services/entrypoints.js +++ b/src/public/javascripts/services/entrypoints.js @@ -13,6 +13,7 @@ import searchNotesService from "./search_notes.js"; import attributesDialog from "../dialogs/attributes.js"; import helpDialog from "../dialogs/help.js"; import noteInfoDialog from "../dialogs/note_info.js"; +import aboutDialog from "../dialogs/about.js"; import protectedSessionService from "./protected_session.js"; function registerEntrypoints() { @@ -63,6 +64,8 @@ function registerEntrypoints() { $("#show-note-info-button").click(noteInfoDialog.showDialog); + $("#show-about-dialog-button").click(aboutDialog.showDialog); + if (utils.isElectron()) { $("#history-navigation").show(); $("#history-back-button").click(window.history.back); diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs index 3937fcef0..a9544f023 100644 --- a/src/views/desktop.ejs +++ b/src/views/desktop.ejs @@ -79,6 +79,11 @@ ALT+O + + + About Trilium Notes + + Logout @@ -207,6 +212,7 @@ <% include details/detail.ejs %> + <% include dialogs/about.ejs %> <% include dialogs/add_link.ejs %> <% include dialogs/attributes.ejs %> <% include dialogs/branch_prefix.ejs %> diff --git a/src/views/dialogs/about.ejs b/src/views/dialogs/about.ejs new file mode 100644 index 000000000..aabb27221 --- /dev/null +++ b/src/views/dialogs/about.ejs @@ -0,0 +1,47 @@ + diff --git a/src/views/dialogs/options.ejs b/src/views/dialogs/options.ejs index d8ef6ee4c..4fb8c3e14 100644 --- a/src/views/dialogs/options.ejs +++ b/src/views/dialogs/options.ejs @@ -28,9 +28,6 @@
  • Advanced
    • -
  • - About Trilium -

    • @@ -228,37 +225,6 @@
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    App version:
    DB version:
    Sync version:
    Build date:
    Build revision:
    Data directory:
    -