gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 13:39:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

converted password not set dialog to new pattern

Browse Source
This commit is contained in:
zadam 2022-06-14 23:32:16 +02:00
parent ca44edd48c
commit 73574ac890
6 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/public/app/dialogs/password_not_set.js
View File

@ -1,13 +0,0 @@
import utils from "../services/utils.js";
import appContext from "../services/app_context.js";
export function show() {
const $dialog = $("#password-not-set-dialog");
const $openPasswordOptionsButton = $("#open-password-options-button");
utils.openDialog($dialog);
$openPasswordOptionsButton.on("click", () => {
appContext.triggerCommand("showOptions", { openTab: 'password' });
});
}

4
src/public/app/layouts/desktop_layout.js
View File

@ -58,6 +58,7 @@ import RecentChangesDialog from "../widgets/dialogs/recent_changes.js";
import BackendLogDialog from "../widgets/dialogs/backend_log.js";
import BranchPrefixDialog from "../widgets/dialogs/branch_prefix.js";
import SortChildNotesDialog from "../widgets/dialogs/sort_child_notes.js";
import PasswordNoteSetDialog from "../widgets/dialogs/password_not_set.js";
export default class DesktopLayout {
constructor(customWidgets) {
@ -190,6 +191,7 @@ export default class DesktopLayout {
.child(new RecentChangesDialog())
.child(new BackendLogDialog())
.child(new BranchPrefixDialog())
.child(new SortChildNotesDialog());
.child(new SortChildNotesDialog())
.child(new PasswordNoteSetDialog());
}
}

2
src/public/app/services/protected_session.js
View File

@ -20,7 +20,7 @@ function enterProtectedSession() {
const dfd = $.Deferred();
if (!options.is("isPasswordSet")) {
import("../dialogs/password_not_set.js").then(dialog => dialog.show());
appContext.triggerCommand("showPasswordNotSet");
return dfd;
}

38
src/public/app/widgets/dialogs/password_not_set.js Normal file
View File

@ -0,0 +1,38 @@
import utils from "../../services/utils.js";
import BasicWidget from "../basic_widget.js";
const TPL = `
<div class="password-not-set-dialog modal fade mx-auto" tabindex="-1" role="dialog">
<div class="modal-dialog modal-md" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title mr-auto">Password is not set</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
Protected notes are encrypted using a user password, but password has not been set yet.
To be able to protect notes, <a class="open-password-options-button" href="javascript:">
click here to open the Options dialog</a> and set your password.
</div>
</div>
</div>
</div>
`;
export default class PasswordNoteSetDialog extends BasicWidget {
doRender() {
this.$widget = $(TPL);
this.$openPasswordOptionsButton = this.$widget.find(".open-password-options-button");
this.$openPasswordOptionsButton.on("click", () => {
this.triggerCommand("showOptions", { openTab: 'password' });
});
}
showPasswordNotSetEvent() {
utils.openDialog(this.$widget);
}
}

1
src/views/desktop.ejs
View File

@ -32,7 +32,6 @@
<%- include('dialogs/move_to.ejs') %>
<%- include('dialogs/include_note.ejs') %>
<%- include('dialogs/delete_notes.ejs') %>
<%- include('dialogs/password_not_set.ejs') %>
<%- include('dialogs/note_type_chooser.ejs') %>
<script type="text/javascript">

19
src/views/dialogs/password_not_set.ejs
View File

@ -1,19 +0,0 @@
<div id="password-not-set-dialog" class="modal fade mx-auto" tabindex="-1" role="dialog">
<div class="modal-dialog modal-md" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title mr-auto">Password is not set</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
Protected notes are encrypted using a user password, but password has not been set yet.
To be able to protect notes, <a id="open-password-options-button" href="javascript:">
click here to open the Options dialog</a> and set your password.
</div>
</div>
</div>
</div>