From 464d8417f5a1ab3cf5a4b3f7490d88b812e59fd9 Mon Sep 17 00:00:00 2001 From: Jin <22962980+JYC333@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:08:07 +0200 Subject: [PATCH] fix all dropdowns and tooltips, fix some translations --- src/public/app/services/note_autocomplete.js | 27 +++++-------- .../widgets/bulk_actions/execute_script.js | 2 +- .../widgets/bulk_actions/label/add_label.js | 4 +- .../bulk_actions/label/update_label_value.js | 4 +- .../widgets/bulk_actions/note/delete_note.js | 4 +- .../bulk_actions/note/delete_revisions.js | 2 +- .../widgets/bulk_actions/note/move_note.js | 4 +- .../widgets/bulk_actions/note/rename_note.js | 2 +- .../bulk_actions/relation/add_relation.js | 4 +- .../relation/update_relation_target.js | 4 +- .../widgets/buttons/attachments_actions.js | 13 +++--- src/public/app/widgets/dialogs/add_link.js | 8 ++-- .../app/widgets/dialogs/bulk_actions.js | 11 ++--- src/public/app/widgets/dialogs/import.js | 20 +++++----- .../app/widgets/dialogs/note_type_chooser.js | 29 +++++++------- .../dialogs/protected_session_password.js | 16 +++----- .../app/widgets/dialogs/upload_attachments.js | 14 +++---- src/public/app/widgets/editability_select.js | 8 ++-- src/public/app/widgets/note_icon.js | 3 +- src/public/app/widgets/note_type.js | 13 +++--- src/public/app/widgets/quick_search.js | 38 +++++++++--------- .../ribbon_widgets/search_definition.js | 4 +- .../app/widgets/search_options/debug.js | 4 +- .../app/widgets/search_options/fast_search.js | 2 +- .../app/widgets/search_options/limit.js | 2 +- .../widgets/search_options/search_script.js | 4 +- .../widgets/search_options/search_string.js | 19 +++++---- src/public/app/widgets/sync_status.js | 40 +++++++++---------- src/public/stylesheets/style.css | 2 +- src/public/translations/cn/translation.json | 17 ++++++-- src/public/translations/en/translation.json | 11 +++++ 31 files changed, 173 insertions(+), 162 deletions(-) diff --git a/src/public/app/services/note_autocomplete.js b/src/public/app/services/note_autocomplete.js index 09548284b..dbee214b7 100644 --- a/src/public/app/services/note_autocomplete.js +++ b/src/public/app/services/note_autocomplete.js @@ -105,28 +105,23 @@ function initNoteAutocomplete($el, options) { $el.addClass("note-autocomplete-input"); - const $clearTextButton = $("") - .addClass("input-group-text input-clearer-button bx bxs-tag-x") - .prop("title", "Clear text field"); + const $clearTextButton = $(" @@ -61,7 +61,8 @@ export default class AttachmentActionsWidget extends BasicWidget { doRender() { this.$widget = $(TPL); - this.$widget.on('click', '.dropdown-item', () => this.$widget.find("[data-toggle='dropdown']").dropdown('toggle')); + this.dropdown = bootstrap.Dropdown.getOrCreateInstance(this.$widget.find("[data-bs-toggle='dropdown']")); + this.$widget.on('click', '.dropdown-item', () => this.dropdown.toggle()); this.$uploadNewRevisionInput = this.$widget.find(".attachment-upload-new-revision-input"); this.$uploadNewRevisionInput.on('change', async () => { @@ -84,7 +85,7 @@ export default class AttachmentActionsWidget extends BasicWidget { .addClass("disabled") .append($(' (?)') .attr("title", t('attachments_actions.open_externally_detail_page')) - ); + ); if (isElectron) { const $openAttachmentCustomButton = this.$widget.find("[data-trigger-command='openAttachmentCustom']"); $openAttachmentCustomButton @@ -94,7 +95,7 @@ export default class AttachmentActionsWidget extends BasicWidget { ); } } - if (!isElectron){ + if (!isElectron) { const $openAttachmentCustomButton = this.$widget.find("[data-trigger-command='openAttachmentCustom']"); $openAttachmentCustomButton .addClass("disabled") @@ -138,7 +139,7 @@ export default class AttachmentActionsWidget extends BasicWidget { return; } - const {note: newNote} = await server.post(`attachments/${this.attachmentId}/convert-to-note`) + const { note: newNote } = await server.post(`attachments/${this.attachmentId}/convert-to-note`) toastService.showMessage(t('attachments_actions.convert_success', { title: this.attachment.title })); await ws.waitForMaxKnownEntityChangeId(); await appContext.tabManager.getActiveContext().setNote(newNote.noteId); @@ -155,6 +156,6 @@ export default class AttachmentActionsWidget extends BasicWidget { return; } - await server.put(`attachments/${this.attachmentId}/rename`, {title: attachmentTitle}); + await server.put(`attachments/${this.attachmentId}/rename`, { title: attachmentTitle }); } } diff --git a/src/public/app/widgets/dialogs/add_link.js b/src/public/app/widgets/dialogs/add_link.js index 6bc768a01..e449cd4b4 100644 --- a/src/public/app/widgets/dialogs/add_link.js +++ b/src/public/app/widgets/dialogs/add_link.js @@ -9,13 +9,11 @@ const TPL = `
-
${t('add_link.add_link')}
+
${t('add_link.add_link')}
- +
@@ -62,6 +60,8 @@ const TPL = ` export default class AddLinkDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + bootstrap.Modal.getOrCreateInstance(this.$widget); + this.$form = this.$widget.find(".add-link-form"); this.$autoComplete = this.$widget.find(".add-link-note-autocomplete"); this.$linkTitle = this.$widget.find(".link-title"); diff --git a/src/public/app/widgets/dialogs/bulk_actions.js b/src/public/app/widgets/dialogs/bulk_actions.js index eb3ca94dc..0b99d3e82 100644 --- a/src/public/app/widgets/dialogs/bulk_actions.js +++ b/src/public/app/widgets/dialogs/bulk_actions.js @@ -40,18 +40,14 @@ const TPL = `
${t('bulk_actions.bulk_actions')}
- +

${t('bulk_actions.affected_notes')}: 0

- + +

${t('bulk_actions.available_actions')}

@@ -72,6 +68,7 @@ const TPL = ` export default class BulkActionsDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + bootstrap.Modal.getOrCreateInstance(this.$widget); this.$includeDescendants = this.$widget.find(".include-descendants"); this.$includeDescendants.on("change", () => this.refresh()); diff --git a/src/public/app/widgets/dialogs/import.js b/src/public/app/widgets/dialogs/import.js index b50bbf291..c2059eb98 100644 --- a/src/public/app/widgets/dialogs/import.js +++ b/src/public/app/widgets/dialogs/import.js @@ -11,9 +11,7 @@ const TPL = `
${t('import.importIntoNote')}
- +
@@ -29,21 +27,21 @@ const TPL = ` ${t('import.options')}:
-
-
-
@@ -86,6 +84,8 @@ export default class ImportDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + bootstrap.Modal.getOrCreateInstance(this.$widget); + this.$form = this.$widget.find(".import-form"); this.$noteTitle = this.$widget.find(".import-note-title"); this.$fileUploadInput = this.$widget.find(".import-file-upload-input"); @@ -115,12 +115,14 @@ export default class ImportDialog extends BasicWidget { } }); - this.$widget.find('[data-toggle="tooltip"]').tooltip({ - html: true + let _ = [...this.$widget.find('[data-bs-toggle="tooltip"]')].forEach(element => { + bootstrap.Tooltip.getOrCreateInstance(element, { + html: true + }); }); } - async showImportDialogEvent({noteId}) { + async showImportDialogEvent({ noteId }) { this.parentNoteId = noteId; this.$fileUploadInput.val('').trigger('change'); // to trigger Import button disabling listener below diff --git a/src/public/app/widgets/dialogs/note_type_chooser.js b/src/public/app/widgets/dialogs/note_type_chooser.js index 8901ab8ef..5f26e77fc 100644 --- a/src/public/app/widgets/dialogs/note_type_chooser.js +++ b/src/public/app/widgets/dialogs/note_type_chooser.js @@ -23,17 +23,17 @@ const TPL = `
-
${t("note_type_chooser.modal_title")}
+
${t("note_type_chooser.modal_title")}
- +
${t("note_type_chooser.modal_body")} -
- +
+
@@ -53,13 +53,14 @@ export default class NoteTypeChooserDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget); + this.$noteTypeDropdown = this.$widget.find(".note-type-dropdown"); - this.$noteTypeDropdownTrigger = this.$widget.find(".note-type-dropdown-trigger"); - this.$noteTypeDropdownTrigger.dropdown(); + this.dropdown = bootstrap.Dropdown.getOrCreateInstance(this.$widget.find(".note-type-dropdown-trigger")); this.$widget.on("hidden.bs.modal", () => { if (this.resolve) { - this.resolve({success: false}); + this.resolve({ success: false }); } if (this.$originalFocused) { @@ -94,7 +95,7 @@ export default class NoteTypeChooserDialog extends BasicWidget { }); } - async chooseNoteTypeEvent({callback}) { + async chooseNoteTypeEvent({ callback }) { this.$originalFocused = $(':focus'); const noteTypes = await noteTypesService.getNoteTypeItems(); @@ -116,11 +117,11 @@ export default class NoteTypeChooserDialog extends BasicWidget { } } - this.$noteTypeDropdownTrigger.dropdown('show'); + this.dropdown.show(); this.$originalDialog = glob.activeDialog; - glob.activeDialog = this.$widget; - this.$widget.modal(); + glob.activeDialog = this.modal; + this.modal.show(); this.$noteTypeDropdown.find(".dropdown-item:first").focus(); @@ -139,6 +140,6 @@ export default class NoteTypeChooserDialog extends BasicWidget { }); this.resolve = null; - this.$widget.modal("hide"); + this.modal.hide(); } } diff --git a/src/public/app/widgets/dialogs/protected_session_password.js b/src/public/app/widgets/dialogs/protected_session_password.js index b0980e2af..c08bc78db 100644 --- a/src/public/app/widgets/dialogs/protected_session_password.js +++ b/src/public/app/widgets/dialogs/protected_session_password.js @@ -8,22 +8,16 @@ const TPL = `
-
${t("protected_session_password.modal_title")}
+
${t("protected_session_password.modal_title")}
- +
-
- -
+ +
@@ -36,6 +30,8 @@ const TPL = ` export default class ProtectedSessionPasswordDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + bootstrap.Modal.getOrCreateInstance(this.$widget); + this.$passwordForm = this.$widget.find(".protected-session-password-form"); this.$passwordInput = this.$widget.find(".protected-session-password"); this.$passwordForm.on('submit', () => { diff --git a/src/public/app/widgets/dialogs/upload_attachments.js b/src/public/app/widgets/dialogs/upload_attachments.js index 4dd7ded97..cde341513 100644 --- a/src/public/app/widgets/dialogs/upload_attachments.js +++ b/src/public/app/widgets/dialogs/upload_attachments.js @@ -11,9 +11,7 @@ const TPL = `
${t("upload_attachments.upload_attachments_to_note")}
- +
@@ -26,8 +24,8 @@ const TPL = `
${t("upload_attachments.options")}:
-
@@ -49,6 +47,8 @@ export default class UploadAttachmentsDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + bootstrap.Modal.getOrCreateInstance(this.$widget); + this.$form = this.$widget.find(".upload-attachment-form"); this.$noteTitle = this.$widget.find(".upload-attachment-note-title"); this.$fileUploadInput = this.$widget.find(".upload-attachment-file-upload-input"); @@ -71,12 +71,12 @@ export default class UploadAttachmentsDialog extends BasicWidget { } }); - this.$widget.find('[data-toggle="tooltip"]').tooltip({ + bootstrap.Tooltip.getOrCreateInstance(this.$widget.find('[data-bs-toggle="tooltip"]'), { html: true }); } - async showUploadAttachmentsDialogEvent({noteId}) { + async showUploadAttachmentsDialogEvent({ noteId }) { this.parentNoteId = noteId; this.$fileUploadInput.val('').trigger('change'); // to trigger upload button disabling listener below diff --git a/src/public/app/widgets/editability_select.js b/src/public/app/widgets/editability_select.js index 00460be18..3d17a83bf 100644 --- a/src/public/app/widgets/editability_select.js +++ b/src/public/app/widgets/editability_select.js @@ -15,7 +15,7 @@ const TPL = ` white-space: normal; } - @@ -43,11 +43,13 @@ export default class EditabilitySelectWidget extends NoteContextAwareWidget { doRender() { this.$widget = $(TPL); + this.dropdown = bootstrap.Dropdown.getOrCreateInstance(this.$widget.find("[data-bs-toggle='dropdown']")); + this.$editabilityActiveDesc = this.$widget.find(".editability-active-desc"); this.$widget.on('click', '.dropdown-item', async e => { - this.$widget.find('.dropdown-toggle').dropdown('toggle'); + this.dropdown.toggle(); const editability = $(e.target).closest("[data-editability]").attr("data-editability"); @@ -85,7 +87,7 @@ export default class EditabilitySelectWidget extends NoteContextAwareWidget { this.$editabilityActiveDesc.text(labels[editability]); } - entitiesReloadedEvent({loadResults}) { + entitiesReloadedEvent({ loadResults }) { if (loadResults.getAttributeRows().find(attr => attr.noteId === this.noteId)) { this.refresh(); } diff --git a/src/public/app/widgets/note_icon.js b/src/public/app/widgets/note_icon.js index 14a5b80a5..771897444 100644 --- a/src/public/app/widgets/note_icon.js +++ b/src/public/app/widgets/note_icon.js @@ -1,3 +1,4 @@ +import { t } from "../services/i18n.js"; import NoteContextAwareWidget from "./note_context_aware_widget.js"; import attributeService from "../services/attributes.js"; import server from "../services/server.js"; @@ -66,7 +67,7 @@ const TPL = ` } - +
Category: diff --git a/src/public/app/widgets/note_type.js b/src/public/app/widgets/note_type.js index 1bf121888..7e15c4f08 100644 --- a/src/public/app/widgets/note_type.js +++ b/src/public/app/widgets/note_type.js @@ -35,7 +35,7 @@ const TPL = ` overflow-x: hidden; } - @@ -47,14 +47,15 @@ export default class NoteTypeWidget extends NoteContextAwareWidget { doRender() { this.$widget = $(TPL); + this.dropdown = bootstrap.Dropdown.getOrCreateInstance(this.$widget.find("[data-bs-toggle='dropdown']")); + this.$widget.on('show.bs.dropdown', () => this.renderDropdown()); this.$noteTypeDropdown = this.$widget.find(".note-type-dropdown"); this.$noteTypeButton = this.$widget.find(".note-type-button"); this.$noteTypeDesc = this.$widget.find(".note-type-desc"); - this.$widget.on('click', '.dropdown-item', - () => this.$widget.find('.dropdown-toggle').dropdown('toggle')); + this.$widget.on('click', '.dropdown-item', () => this.dropdown.toggle()); } async refreshWithNote(note) { @@ -63,7 +64,7 @@ export default class NoteTypeWidget extends NoteContextAwareWidget { this.$noteTypeDesc.text(await this.findTypeTitle(note.type, note.mime)); - this.$noteTypeButton.dropdown('hide'); + this.dropdown.hide(); } /** the actual body is rendered lazily on note-type button click */ @@ -92,7 +93,7 @@ export default class NoteTypeWidget extends NoteContextAwareWidget { .append('✓ ') .append($('').text(noteType.title)); } - + if (this.note.type === noteType.type) { $typeLink.addClass("selected"); } @@ -161,7 +162,7 @@ export default class NoteTypeWidget extends NoteContextAwareWidget { return await dialogService.confirm("It is not recommended to change note type when note content is not empty. Do you want to continue anyway?"); } - async entitiesReloadedEvent({loadResults}) { + async entitiesReloadedEvent({ loadResults }) { if (loadResults.isNoteReloaded(this.noteId)) { this.refresh(); } diff --git a/src/public/app/widgets/quick_search.js b/src/public/app/widgets/quick_search.js index fcf42375c..5e0177ad1 100644 --- a/src/public/app/widgets/quick_search.js +++ b/src/public/app/widgets/quick_search.js @@ -30,13 +30,12 @@ const TPL = `
-
-
`; const MAX_DISPLAYED_NOTES = 15; @@ -44,21 +43,20 @@ const MAX_DISPLAYED_NOTES = 15; export default class QuickSearchWidget extends BasicWidget { doRender() { this.$widget = $(TPL); + this.dropdown = bootstrap.Dropdown.getOrCreateInstance(this.$widget.find("[data-bs-toggle='dropdown']")); this.$searchString = this.$widget.find('.search-string'); this.$dropdownMenu = this.$widget.find('.dropdown-menu'); - this.$dropdownToggle = this.$widget.find('.search-button'); - this.$dropdownToggle.dropdown(); this.$widget.find('.input-group-prepend').on('shown.bs.dropdown', () => this.search()); - if(utils.isMobile()) { - this.$searchString.keydown(e =>{ - if(e.which === 13) { + if (utils.isMobile()) { + this.$searchString.keydown(e => { + if (e.which === 13) { if (this.$dropdownMenu.is(":visible")) { this.search(); // just update already visible dropdown } else { - this.$dropdownToggle.dropdown('show'); + this.dropdown.show(); } e.preventDefault(); e.stopPropagation(); @@ -70,7 +68,7 @@ export default class QuickSearchWidget extends BasicWidget { if (this.$dropdownMenu.is(":visible")) { this.search(); // just update already visible dropdown } else { - this.$dropdownToggle.dropdown('show'); + this.dropdown.show(); } this.$searchString.focus(); @@ -81,7 +79,7 @@ export default class QuickSearchWidget extends BasicWidget { }); shortcutService.bindElShortcut(this.$searchString, 'esc', () => { - this.$dropdownToggle.dropdown('hide'); + this.dropdown.hide(); }); return this.$widget; @@ -91,25 +89,25 @@ export default class QuickSearchWidget extends BasicWidget { const searchString = this.$searchString.val().trim(); if (!searchString) { - this.$dropdownToggle.dropdown("hide"); + this.dropdown.hide(); return; } this.$dropdownMenu.empty(); this.$dropdownMenu.append(' Searching ...'); - const {searchResultNoteIds, error} = await server.get(`quick-search/${encodeURIComponent(searchString)}`); + const { searchResultNoteIds, error } = await server.get(`quick-search/${encodeURIComponent(searchString)}`); if (error) { - this.$searchString.tooltip({ + let tooltip = new bootstrap.Tooltip(this.$searchString, { trigger: 'manual', title: `Search error: ${error}`, placement: 'right' }); - this.$searchString.tooltip("show"); + tooltip.show(); - setTimeout(() => this.$searchString.tooltip("dispose"), 4000); + setTimeout(() => tooltip.dispose(), 4000); } const displayedNoteIds = searchResultNoteIds.slice(0, Math.min(MAX_DISPLAYED_NOTES, searchResultNoteIds.length)); @@ -121,11 +119,11 @@ export default class QuickSearchWidget extends BasicWidget { } for (const note of await froca.getNotes(displayedNoteIds)) { - const $link = await linkService.createLink(note.noteId, {showNotePath: true}); + const $link = await linkService.createLink(note.noteId, { showNotePath: true }); $link.addClass('dropdown-item'); $link.attr("tabIndex", "0"); $link.on('click', e => { - this.$dropdownToggle.dropdown("hide"); + this.dropdown.hide(); if (!e.target || e.target.nodeName !== 'A') { // click on the link is handled by link handling, but we want the whole item clickable @@ -133,7 +131,7 @@ export default class QuickSearchWidget extends BasicWidget { } }); shortcutService.bindElShortcut($link, 'return', () => { - this.$dropdownToggle.dropdown("hide"); + this.dropdown.hide(); appContext.tabManager.getActiveContext().setNote(note.noteId); }); @@ -156,11 +154,11 @@ export default class QuickSearchWidget extends BasicWidget { shortcutService.bindElShortcut(this.$dropdownMenu.find('.dropdown-item:first'), 'up', () => this.$searchString.focus()); - this.$dropdownToggle.dropdown('update'); + this.dropdown.update(); } async showInFullSearch() { - this.$dropdownToggle.dropdown("hide"); + this.dropdown.hide(); await appContext.triggerCommand('searchNotes', { searchString: this.$searchString.val() diff --git a/src/public/app/widgets/ribbon_widgets/search_definition.js b/src/public/app/widgets/ribbon_widgets/search_definition.js index af51833f3..3b24d6988 100644 --- a/src/public/app/widgets/ribbon_widgets/search_definition.js +++ b/src/public/app/widgets/ribbon_widgets/search_definition.js @@ -119,7 +119,7 @@ const TPL = `
- @@ -219,7 +219,7 @@ export default class SearchDefinitionWidget extends NoteContextAwareWidget { }); this.$widget.on('click', '[data-action-add]', async event => { - this.$widget.find('.action-add-toggle').dropdown('toggle'); + bootstrap.Dropdown.getOrCreateInstance(this.$widget.find('.action-add-toggle')); const actionName = $(event.target).attr('data-action-add'); diff --git a/src/public/app/widgets/search_options/debug.js b/src/public/app/widgets/search_options/debug.js index 60aae8730..906c6590d 100644 --- a/src/public/app/widgets/search_options/debug.js +++ b/src/public/app/widgets/search_options/debug.js @@ -9,10 +9,10 @@ const TPL = `
- +

${t("debug.debug_info")}

-

${t("debug.access_info")}

+ ${t("debug.access_info")}
diff --git a/src/public/app/widgets/search_options/fast_search.js b/src/public/app/widgets/search_options/fast_search.js index ad36955cc..dc4e828a0 100644 --- a/src/public/app/widgets/search_options/fast_search.js +++ b/src/public/app/widgets/search_options/fast_search.js @@ -9,7 +9,7 @@ const TPL = `
- +
${t('fast_search.description')}
diff --git a/src/public/app/widgets/search_options/limit.js b/src/public/app/widgets/search_options/limit.js index 6044bea55..48beaede0 100644 --- a/src/public/app/widgets/search_options/limit.js +++ b/src/public/app/widgets/search_options/limit.js @@ -12,7 +12,7 @@ const TPL = `
- +
${t('limit.take_first_x_results')}
diff --git a/src/public/app/widgets/search_options/search_script.js b/src/public/app/widgets/search_options/search_script.js index 3779148e7..8c59f4947 100644 --- a/src/public/app/widgets/search_options/search_script.js +++ b/src/public/app/widgets/search_options/search_script.js @@ -14,7 +14,7 @@ const TPL = `
- +

${t('search_script.description1')}

@@ -24,7 +24,7 @@ const TPL = ` 
${t('search_script.example_code')}
-

${t('search_script.note')}

+ ${t('search_script.note')}
diff --git a/src/public/app/widgets/search_options/search_string.js b/src/public/app/widgets/search_options/search_string.js index 9f85d8014..b430b691f 100644 --- a/src/public/app/widgets/search_options/search_string.js +++ b/src/public/app/widgets/search_options/search_string.js @@ -13,11 +13,11 @@ const TPL = `
- +
- ${t('search_string.search_syntax')} - ${t('search_string.also_see')} -

-

    + ${t('search_string.search_syntax')} - ${t('search_string.also_see')} ${t('search_string.complete_help')} + +
    • ${t('search_string.full_text_search')}
    • #abc - ${t('search_string.label_abc')}
    • #year = 2019 - ${t('search_string.label_year')}
      • @@ -26,7 +26,6 @@ const TPL = `
    • #year <= 2000 - ${t('search_string.label_year_comparison')}
    • note.dateCreated >= MONTH-1 - ${t('search_string.label_date_created')}
    -

@@ -74,16 +73,16 @@ export default class SearchString extends AbstractSearchOption { return $option; } - showSearchErrorEvent({error}) { - this.$searchString.tooltip({ + showSearchErrorEvent({ error }) { + let tooltip = new bootstrap.Tooltip(this.$searchString, { trigger: 'manual', - title: `${t('search_string.error', {error})}`, + title: `${t('search_string.error', { error })}`, placement: 'bottom' }); - this.$searchString.tooltip("show"); + tooltip.show(); - setTimeout(() => this.$searchString.tooltip("dispose"), 4000); + setTimeout(() => tooltip.dispose(), 4000); } focusOnSearchDefinitionEvent() { diff --git a/src/public/app/widgets/sync_status.js b/src/public/app/widgets/sync_status.js index cc716b953..44098648e 100644 --- a/src/public/app/widgets/sync_status.js +++ b/src/public/app/widgets/sync_status.js @@ -1,3 +1,4 @@ +import { t } from "../services/i18n.js"; import BasicWidget from "./basic_widget.js"; import ws from "../services/ws.js"; import options from "../services/options.js"; @@ -39,36 +40,30 @@ const TPL = `
+ data-bs-toggle="tooltip" + title="${t("sync_status.unknown")}"> + data-bs-toggle="tooltip" + title="${t("sync_status.connected_with_changes")}"> + data-bs-toggle="tooltip" + title="${t("sync_status.connected_no_changes")}"> + data-bs-toggle="tooltip" + title="${t("sync_status.disconnected_with_changes")}"> + data-bs-toggle="tooltip" + title="${t("sync_status.disconnected_no_changes")}"> + data-bs-toggle="tooltip" + title="${t("sync_status.in_progress")}">
@@ -86,10 +81,6 @@ export default class SyncStatusWidget extends BasicWidget { this.$widget = $(TPL); this.$widget.hide(); - this.$widget.find('[data-toggle="tooltip"]').tooltip({ - html: true - }); - this.$widget.find('.sync-status-icon:not(.sync-status-in-progress)') .on('click', () => syncService.syncNow()); @@ -102,6 +93,11 @@ export default class SyncStatusWidget extends BasicWidget { return; } + bootstrap.Tooltip.getOrCreateInstance(this.$widget.find(`.sync-status-${className}`), { + html: true, + placement: 'right', + }); + this.$widget.show(); this.$widget.find('.sync-status-icon').hide(); this.$widget.find(`.sync-status-${className}`).show(); diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index c953ea04f..955b65608 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -881,7 +881,7 @@ li.dropdown-submenu:hover > ul.dropdown-menu { background-color: inherit; } -[data-toggle="tooltip"]:not(.button-widget) span { +[data-bs-toggle="tooltip"]:not(.button-widget) span { padding-bottom: 0; border-bottom: 1px dotted; } diff --git a/src/public/translations/cn/translation.json b/src/public/translations/cn/translation.json index 8cdf4e411..6c95e2625 100644 --- a/src/public/translations/cn/translation.json +++ b/src/public/translations/cn/translation.json @@ -468,8 +468,8 @@ "to": "到", "target_parent_note": "目标父笔记", "on_all_matched_notes": "对于所有匹配的笔记", - "move_note_new_parent": "", - "clone_note_new_parent": "", + "move_note_new_parent": "如果笔记只有一个父级（即旧分支被移除并创建新分支到新父级），则将笔记移动到新父级", + "clone_note_new_parent": "如果笔记有多个克隆/分支（不清楚应该移除哪个分支），则将笔记克隆到新父级", "nothing_will_happen": "如果笔记无法移动到目标笔记（即这会创建一个树循环），则不会发生任何事情" }, "rename_note": { @@ -477,7 +477,7 @@ "rename_note_title_to": "重命名笔记标题为", "new_note_title": "新笔记标题", "click_help_icon": "点击右侧的帮助图标查看所有选项", - "evaluated_as_js_string": "给定的值被评估为JavaScript字符串，因此可以通过注入的note变量（正在重命名的笔记）丰富动态内容。 例如：", + "evaluated_as_js_string": "给定的值被评估为 JavaScript 字符串，因此可以通过注入的 note 变量（正在重命名的笔记）丰富动态内容。 例如：", "example_note": "Note - 所有匹配的笔记都被重命名为“Note”", "example_new_title": "NEW: ${note.title} - 匹配的笔记标题以“NEW: ”为前缀", "example_date_prefix": "${note.dateCreatedObj.format('MM-DD:')}: ${note.title} - 匹配的笔记以笔记的创建月份-日期为前缀", @@ -593,6 +593,14 @@ "about": "关于 TriliumNext 笔记", "logout": "登出" }, + "sync_status": { + "unknown": "

同步状态将在下一次同步尝试开始后显示。

点击以立即触发同步。

", + "connected_with_changes": "

已连接到同步服务器。
有一些未同步的变更。

点击以触发同步。

", + "connected_no_changes": "

已连接到同步服务器。
所有变更均已同步。

点击以触发同步。

", + "disconnected_with_changes": "

连接同步服务器失败。
有一些未同步的变更。

点击以触发同步。

", + "disconnected_no_changes": "

连接同步服务器失败。
所有已知变更均已同步。

点击以触发同步。

", + "in_progress": "正在与服务器进行同步。" + }, "left_pane_toggle": { "hide_panel": "隐藏面板", "show_panel": "显示面板" @@ -662,6 +670,9 @@ "error_cannot_get_branch_id": "无法获取 notePath '{{notePath}}' 的 branchId", "error_unrecognized_command": "无法识别的命令 {{command}}" }, + "note_icon": { + "change_note_icon": "更改笔记图标" + }, "basic_properties": { "note_type": "笔记类型", "editable": "可编辑", diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json index d2579f789..1f29a5f2e 100644 --- a/src/public/translations/en/translation.json +++ b/src/public/translations/en/translation.json @@ -593,6 +593,14 @@ "about": "About TriliumNext Notes", "logout": "Logout" }, + "sync_status": { + "unknown": "

Sync status will be known once the next sync attempt starts.

Click to trigger sync now.

", + "connected_with_changes": "

Connected to the sync server.
There are some outstanding changes yet to be synced.

Click to trigger sync.

", + "connected_no_changes":"

Connected to the sync server.
All changes have been already synced.

Click to trigger sync.

", + "disconnected_with_changes":"

Establishing the connection to the sync server was unsuccessful.
There are some outstanding changes yet to be synced.

Click to trigger sync.

", + "disconnected_no_changes":"

Establishing the connection to the sync server was unsuccessful.
All known changes have been synced.

Click to trigger sync.

", + "in_progress":"Sync with the server is in progress." + }, "left_pane_toggle": { "show_panel": "Show panel", "hide_panel": "Hide panel" @@ -665,6 +673,9 @@ "error_cannot_get_branch_id": "Cannot get branchId for notePath '{{notePath}}'", "error_unrecognized_command": "Unrecognized command {{command}}" }, + "note_icon": { + "change_note_icon": "Change note icon" + }, "basic_properties": { "note_type": "Note type", "editable": "Editable",