mirror of
https://github.com/zadam/trilium.git
synced 2025-06-06 18:08:33 +02:00
changed ejs indentation to 2 spaces instead of 4 (or mix)
This commit is contained in:
parent
69d2bd8b58
commit
6fb99ae89e
10
.idea/codeStyles/Project.xml
generated
Normal file
10
.idea/codeStyles/Project.xml
generated
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<code_scheme name="Project" version="173">
|
||||||
|
<option name="OTHER_INDENT_OPTIONS">
|
||||||
|
<value>
|
||||||
|
<option name="INDENT_SIZE" value="2" />
|
||||||
|
<option name="TAB_SIZE" value="2" />
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
|
</code_scheme>
|
||||||
|
</component>
|
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<component name="ProjectCodeStyleConfiguration">
|
||||||
|
<state>
|
||||||
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||||
|
</state>
|
||||||
|
</component>
|
@ -227,11 +227,7 @@ async function showDialog() {
|
|||||||
|
|
||||||
await attributesModel.loadAttributes();
|
await attributesModel.loadAttributes();
|
||||||
|
|
||||||
$dialog.dialog({
|
$dialog.modal();
|
||||||
modal: true,
|
|
||||||
width: 950,
|
|
||||||
height: 700
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ko.applyBindings(attributesModel, $dialog[0]);
|
ko.applyBindings(attributesModel, $dialog[0]);
|
||||||
|
@ -1,47 +1,47 @@
|
|||||||
<div id="add-link-dialog" class="tdialog" title="Add note link">
|
<div id="add-link-dialog" class="tdialog" title="Add note link">
|
||||||
<form id="add-link-form">
|
<form id="add-link-form">
|
||||||
<div id="add-link-type-div" class="radio">
|
<div id="add-link-type-div" class="radio">
|
||||||
<label title="Add HTML link to the selected note at cursor in current note">
|
<label title="Add HTML link to the selected note at cursor in current note">
|
||||||
<input type="radio" name="add-link-type" value="html"/>
|
<input type="radio" name="add-link-type" value="html"/>
|
||||||
add normal HTML link</label>
|
add normal HTML link</label>
|
||||||
|
|
||||||
<label title="Add selected note as a child of current note">
|
<label title="Add selected note as a child of current note">
|
||||||
<input type="radio" name="add-link-type" value="selected-to-current"/>
|
<input type="radio" name="add-link-type" value="selected-to-current"/>
|
||||||
add selected note to current note</label>
|
add selected note to current note</label>
|
||||||
|
|
||||||
<label title="Add current note as a child of the selected note">
|
<label title="Add current note as a child of the selected note">
|
||||||
<input type="radio" name="add-link-type" value="current-to-selected"/>
|
<input type="radio" name="add-link-type" value="current-to-selected"/>
|
||||||
add current note to selected note</label>
|
add current note to selected note</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="note-autocomplete">Note</label>
|
<label for="note-autocomplete">Note</label>
|
||||||
|
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input id="note-autocomplete" class="form-control" placeholder="search for note by its name">
|
<input id="note-autocomplete" class="form-control" placeholder="search for note by its name">
|
||||||
|
|
||||||
<div class="input-group-append">
|
<div class="input-group-append">
|
||||||
<span class="input-group-text show-recent-notes-button" title="Show recent notes"></span>
|
<span class="input-group-text show-recent-notes-button" title="Show recent notes"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group" id="add-link-title-form-group">
|
<div class="form-group" id="add-link-title-form-group">
|
||||||
<label for="link-title">Link title</label>
|
<label for="link-title">Link title</label>
|
||||||
<input id="link-title" class="form-control" style="width: 100%;">
|
<input id="link-title" class="form-control" style="width: 100%;">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group" id="add-link-prefix-form-group" title="Cloned note will be shown in note tree with given prefix">
|
<div class="form-group" id="add-link-prefix-form-group" title="Cloned note will be shown in note tree with given prefix">
|
||||||
<label for="clone-prefix">Prefix (optional)</label>
|
<label for="clone-prefix">Prefix (optional)</label>
|
||||||
<input id="clone-prefix" class="form-control" style="width: 100%;">
|
<input id="clone-prefix" class="form-control" style="width: 100%;">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="display: flex; justify-content: space-between">
|
<div style="display: flex; justify-content: space-between">
|
||||||
<button class="btn btn-primary">Add note link <kbd>enter</kbd></button>
|
<button class="btn btn-primary">Add note link <kbd>enter</kbd></button>
|
||||||
|
|
||||||
<button class="btn btn-sm" type="button" data-help-page="Links">
|
<button class="btn btn-sm" type="button" data-help-page="Links">
|
||||||
<i class="glyphicon glyphicon-info-sign"></i> Help
|
<i class="glyphicon glyphicon-info-sign"></i> Help
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
@ -1,114 +1,138 @@
|
|||||||
<div id="attributes-dialog" class="tdialog" title="Note attributes">
|
<div id="jump-to-note-dialog" class="modal mx-auto" tabindex="-1" role="dialog">
|
||||||
<form data-bind="submit: save">
|
<div class="modal-dialog modal-lg" role="document">
|
||||||
<div style="display: flex; justify-content: space-between;">
|
<div class="modal-content">
|
||||||
<button class="btn btn-large" style="width: 200px;" id="save-attributes-button" type="submit">Save changes <kbd>enter</kbd></button>
|
<div class="modal-header">
|
||||||
|
<h5 class="modal-title">Note attributes</h5>
|
||||||
|
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||||
|
<span aria-hidden="true">×</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<form data-bind="submit: save">
|
||||||
|
<div style="display: flex; justify-content: space-between;">
|
||||||
|
<button class="btn btn-large" style="width: 200px;" id="save-attributes-button" type="submit">
|
||||||
|
Save changes <kbd>enter</kbd></button>
|
||||||
|
|
||||||
<button class="btn btn-sm" type="button" data-help-page="Attributes">
|
<button class="btn btn-sm" type="button" data-help-page="Attributes">
|
||||||
<i class="glyphicon glyphicon-info-sign"></i> Help
|
<i class="glyphicon glyphicon-info-sign"></i> Help
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="height: 97%; overflow: auto">
|
<div style="height: 97%; overflow: auto">
|
||||||
<table id="owned-attributes-table" class="table">
|
<table id="owned-attributes-table" class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th></th>
|
<th></th>
|
||||||
<th>Type</th>
|
<th>Type</th>
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>Value</th>
|
<th>Value</th>
|
||||||
<th>Inheritable</th>
|
<th>Inheritable</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody data-bind="foreach: ownedAttributes">
|
<tbody data-bind="foreach: ownedAttributes">
|
||||||
<tr data-bind="if: !isDeleted">
|
<tr data-bind="if: !isDeleted">
|
||||||
<td class="handle">
|
<td class="handle">
|
||||||
<span class="glyphicon glyphicon-resize-vertical"></span>
|
<span class="glyphicon glyphicon-resize-vertical"></span>
|
||||||
<input type="hidden" name="position" data-bind="value: position"/>
|
<input type="hidden" name="position" data-bind="value: position"/>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<select class="form-control attribute-type-select" style="width: auto;" data-bind="options: $parent.availableTypes, optionsText: 'text', optionsValue: 'value', value: type, event: { change: $parent.typeChanged }"></select>
|
<select class="form-control attribute-type-select" style="width: auto;"
|
||||||
</td>
|
data-bind="options: $parent.availableTypes, optionsText: 'text', optionsValue: 'value', value: type, event: { change: $parent.typeChanged }"></select>
|
||||||
<td>
|
</td>
|
||||||
<!-- Change to valueUpdate: blur is necessary because jQuery UI autocomplete hijacks change event -->
|
<td>
|
||||||
<input type="text" class="attribute-name form-control" data-bind="value: name, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }"/>
|
<!-- Change to valueUpdate: blur is necessary because jQuery UI autocomplete hijacks change event -->
|
||||||
<div style="color: red" data-bind="if: $parent.isEmptyName($index())">Attribute name can't be empty.</div>
|
<input type="text" class="attribute-name form-control"
|
||||||
</td>
|
data-bind="value: name, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }"/>
|
||||||
<td>
|
<div style="color: red" data-bind="if: $parent.isEmptyName($index())">Attribute name
|
||||||
<input type="text" class="label-value form-control" data-bind="visible: type == 'label', value: labelValue, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }" style="width: 300px"/>
|
can't be empty.
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="text" class="label-value form-control"
|
||||||
|
data-bind="visible: type == 'label', value: labelValue, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }"
|
||||||
|
style="width: 300px"/>
|
||||||
|
|
||||||
<div class="relation-value input-group" data-bind="visible: type == 'relation'" style="width: 300px;">
|
<div class="relation-value input-group" data-bind="visible: type == 'relation'"
|
||||||
<input class="form-control relation-target-note-id"
|
style="width: 300px;">
|
||||||
placeholder="search for note by its name"
|
<input class="form-control relation-target-note-id"
|
||||||
data-bind="noteAutocomplete, value: relationValue, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }">
|
placeholder="search for note by its name"
|
||||||
</div>
|
data-bind="noteAutocomplete, value: relationValue, valueUpdate: 'blur', event: { blur: $parent.attributeChanged }">
|
||||||
|
</div>
|
||||||
|
|
||||||
<div data-bind="visible: type == 'label-definition'">
|
<div data-bind="visible: type == 'label-definition'">
|
||||||
<select data-bind="options: $parent.availableLabelTypes, optionsText: 'text', optionsValue: 'value', value: labelDefinition.labelType"></select>
|
<select data-bind="options: $parent.availableLabelTypes, optionsText: 'text', optionsValue: 'value', value: labelDefinition.labelType"></select>
|
||||||
|
|
||||||
<select data-bind="options: $parent.multiplicityTypes, optionsText: 'text', optionsValue: 'value', value: labelDefinition.multiplicityType"></select>
|
<select data-bind="options: $parent.multiplicityTypes, optionsText: 'text', optionsValue: 'value', value: labelDefinition.multiplicityType"></select>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<input type="checkbox" value="true" data-bind="checked: labelDefinition.isPromoted" />
|
<input type="checkbox" value="true"
|
||||||
Promoted
|
data-bind="checked: labelDefinition.isPromoted"/>
|
||||||
</label>
|
Promoted
|
||||||
</div>
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div data-bind="visible: type == 'relation-definition'">
|
<div data-bind="visible: type == 'relation-definition'">
|
||||||
<select data-bind="options: $parent.multiplicityTypes, optionsText: 'text', optionsValue: 'value', value: relationDefinition.multiplicityType"></select>
|
<select data-bind="options: $parent.multiplicityTypes, optionsText: 'text', optionsValue: 'value', value: relationDefinition.multiplicityType"></select>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<input type="checkbox" value="true" data-bind="checked: relationDefinition.isPromoted" />
|
<input type="checkbox" value="true"
|
||||||
Promoted
|
data-bind="checked: relationDefinition.isPromoted"/>
|
||||||
</label>
|
Promoted
|
||||||
</div>
|
</label>
|
||||||
</td>
|
</div>
|
||||||
<td title="Inheritable relations are automatically inherited to the child notes">
|
</td>
|
||||||
<input type="checkbox" value="1" data-bind="checked: isInheritable" />
|
<td title="Inheritable relations are automatically inherited to the child notes">
|
||||||
|
<input type="checkbox" value="1" data-bind="checked: isInheritable"/>
|
||||||
|
|
||||||
<span title="Delete" style="padding: 13px; cursor: pointer;" class="glyphicon glyphicon-trash" data-bind="click: $parent.deleteAttribute"></span>
|
<span title="Delete" style="padding: 13px; cursor: pointer;"
|
||||||
</td>
|
class="glyphicon glyphicon-trash"
|
||||||
</tr>
|
data-bind="click: $parent.deleteAttribute"></span>
|
||||||
</tbody>
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<div data-bind="if: inheritedAttributes().length > 0">
|
<div data-bind="if: inheritedAttributes().length > 0">
|
||||||
<h4>Inherited attributes</h4>
|
<h4>Inherited attributes</h4>
|
||||||
|
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Type</th>
|
<th>Type</th>
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>Value</th>
|
<th>Value</th>
|
||||||
<th>Owning note</th>
|
<th>Owning note</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody data-bind="foreach: inheritedAttributes">
|
<tbody data-bind="foreach: inheritedAttributes">
|
||||||
<tr>
|
<tr>
|
||||||
<td data-bind="text: type"></td>
|
<td data-bind="text: type"></td>
|
||||||
<td data-bind="text: name"></td>
|
<td data-bind="text: name"></td>
|
||||||
<td>
|
<td>
|
||||||
<span data-bind="if: type == 'label'">
|
<span data-bind="if: type == 'label'">
|
||||||
<span data-bind="text: value"></span>
|
<span data-bind="text: value"></span>
|
||||||
</span>
|
</span>
|
||||||
<span data-bind="if: type == 'relation'">
|
<span data-bind="if: type == 'relation'">
|
||||||
<span data-bind="noteLink: value"></span>
|
<span data-bind="noteLink: value"></span>
|
||||||
</span>
|
</span>
|
||||||
<span data-bind="if: type == 'label-definition'">
|
<span data-bind="if: type == 'label-definition'">
|
||||||
<span data-bind="text: value.labelType"></span>
|
<span data-bind="text: value.labelType"></span>
|
||||||
<span data-bind="text: value.multiplicityType"></span>
|
<span data-bind="text: value.multiplicityType"></span>
|
||||||
promoted: <span data-bind="text: value.isPromoted"></span>
|
promoted: <span data-bind="text: value.isPromoted"></span>
|
||||||
</span>
|
</span>
|
||||||
<span data-bind="if: type == 'relation-definition'">
|
<span data-bind="if: type == 'relation-definition'">
|
||||||
<span data-bind="text: value.multiplicityType"></span>
|
<span data-bind="text: value.multiplicityType"></span>
|
||||||
promoted: <span data-bind="text: value.isPromoted"></span>
|
promoted: <span data-bind="text: value.isPromoted"></span>
|
||||||
</span>
|
</span>
|
||||||
<td data-bind="noteLink: noteId"></td>
|
</td>
|
||||||
</tr>
|
<td data-bind="noteLink: noteId"></td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
<div id="edit-tree-prefix-dialog" class="tdialog" title="Edit tree prefix">
|
<div id="edit-tree-prefix-dialog" class="tdialog" title="Edit tree prefix">
|
||||||
<form id="edit-tree-prefix-form">
|
<form id="edit-tree-prefix-form">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="tree-prefix-input">Prefix: </label>
|
<label for="tree-prefix-input">Prefix: </label>
|
||||||
<input id="tree-prefix-input" style="width: 20em;"> - <span id="tree-prefix-note-title"></span>
|
<input id="tree-prefix-input" style="width: 20em;"> - <span id="tree-prefix-note-title"></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="display: flex; justify-content: space-between;">
|
<div style="display: flex; justify-content: space-between;">
|
||||||
<button class="btn btn-sm">Save</button>
|
<button class="btn btn-sm">Save</button>
|
||||||
|
|
||||||
<button class="btn btn-sm" type="button" data-help-page="Tree-concepts#prefix">
|
<button class="btn btn-sm" type="button" data-help-page="Tree-concepts#prefix">
|
||||||
<i class="glyphicon glyphicon-info-sign"></i> Help
|
<i class="glyphicon glyphicon-info-sign"></i> Help
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
@ -1,3 +1,3 @@
|
|||||||
<div id="event-log-dialog" class="tdialog" title="Event log">
|
<div id="event-log-dialog" class="tdialog" title="Event log">
|
||||||
<ul id="event-log-list"></ul>
|
<ul id="event-log-list"></ul>
|
||||||
</div>
|
</div>
|
@ -1,27 +1,27 @@
|
|||||||
<div id="jump-to-note-dialog" class="modal mx-auto" tabindex="-1" role="dialog">
|
<div id="jump-to-note-dialog" class="modal mx-auto" tabindex="-1" role="dialog">
|
||||||
<div class="modal-dialog modal-lg" role="document">
|
<div class="modal-dialog modal-lg" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h5 class="modal-title">Jump to note</h5>
|
<h5 class="modal-title">Jump to note</h5>
|
||||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||||
<span aria-hidden="true">×</span>
|
<span aria-hidden="true">×</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="jump-to-note-autocomplete">Note</label>
|
<label for="jump-to-note-autocomplete">Note</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input id="jump-to-note-autocomplete" class="form-control" placeholder="search for note by its name">
|
<input id="jump-to-note-autocomplete" class="form-control" placeholder="search for note by its name">
|
||||||
|
|
||||||
<div class="input-group-append">
|
<div class="input-group-append">
|
||||||
<span class="input-group-text show-recent-notes-button" title="Show recent notes"></span>
|
<span class="input-group-text show-recent-notes-button" title="Show recent notes"></span>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button id="show-in-full-text-button" class="btn btn-sm">Search in full text <kbd>ctrl+enter</kbd></button>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button id="show-in-full-text-button" class="btn btn-sm">Search in full text <kbd>ctrl+enter</kbd></button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
@ -1,7 +1,7 @@
|
|||||||
<div id="markdown-import-dialog" class="tdialog" title="Markdown import" style="padding: 20px;">
|
<div id="markdown-import-dialog" class="tdialog" title="Markdown import" style="padding: 20px;">
|
||||||
<p>Because of browser sandbox it's not possible to directly read clipboard from JavaScript. Please paste the Markdown to import to textarea below and click on Import button</p>
|
<p>Because of browser sandbox it's not possible to directly read clipboard from JavaScript. Please paste the Markdown to import to textarea below and click on Import button</p>
|
||||||
|
|
||||||
<textarea id="markdown-import-textarea" style="height: 340px; width: 100%"></textarea>
|
<textarea id="markdown-import-textarea" style="height: 340px; width: 100%"></textarea>
|
||||||
|
|
||||||
<button id="markdown-import-button" class="btn btn-primary">Import <kbd>CTRL+Enter</kbd></button>
|
<button id="markdown-import-button" class="btn btn-primary">Import <kbd>CTRL+Enter</kbd></button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,20 +1,20 @@
|
|||||||
<div id="note-revisions-dialog" class="tdialog" title="Note revisions">
|
<div id="note-revisions-dialog" class="tdialog" title="Note revisions">
|
||||||
<div style="display: flex;">
|
<div style="display: flex;">
|
||||||
<select id="note-revision-list" size="25" style="width: 150px; height: 630px;">
|
<select id="note-revision-list" size="25" style="width: 150px; height: 630px;">
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<div id="note-revision-content-wrapper" style="flex-grow: 1; margin-left: 20px;">
|
<div id="note-revision-content-wrapper" style="flex-grow: 1; margin-left: 20px;">
|
||||||
<div style="display: flex">
|
<div style="display: flex">
|
||||||
<h3 id="note-revision-title" style="margin: 3px; flex-grow: 100;"></h3>
|
<h3 id="note-revision-title" style="margin: 3px; flex-grow: 100;"></h3>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<button class="btn btn-sm" type="button" data-help-page="Note-revisions">
|
<button class="btn btn-sm" type="button" data-help-page="Note-revisions">
|
||||||
<i class="glyphicon glyphicon-info-sign"></i> Help
|
<i class="glyphicon glyphicon-info-sign"></i> Help
|
||||||
</button>
|
</button>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="note-revision-content" style="height: 600px; width: 600px; overflow: auto;"></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="note-revision-content" style="height: 600px; width: 600px; overflow: auto;"></div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
@ -1,3 +1,3 @@
|
|||||||
<div id="note-source-dialog" class="tdialog" title="Note source">
|
<div id="note-source-dialog" class="tdialog" title="Note source">
|
||||||
<textarea id="note-source" readonly="readonly"></textarea>
|
<textarea id="note-source" readonly="readonly"></textarea>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,198 +1,198 @@
|
|||||||
<div id="options-dialog" class="tdialog" title="Options">
|
<div id="options-dialog" class="tdialog" title="Options">
|
||||||
<div id="options-tabs">
|
<div id="options-tabs">
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="#appearance">Appearance</a></li>
|
<li><a href="#appearance">Appearance</a></li>
|
||||||
<li><a href="#change-password">Change password</a></li>
|
<li><a href="#change-password">Change password</a></li>
|
||||||
<li><a href="#protected-session-timeout">Protected session</a></li>
|
<li><a href="#protected-session-timeout">Protected session</a></li>
|
||||||
<li><a href="#note-revision-snapshot-time-interval">Note revisions</a></li>
|
<li><a href="#note-revision-snapshot-time-interval">Note revisions</a></li>
|
||||||
<li><a href="#sync-setup">Sync</a></li>
|
<li><a href="#sync-setup">Sync</a></li>
|
||||||
<li><a href="#advanced">Advanced</a></li>
|
<li><a href="#advanced">Advanced</a></li>
|
||||||
<li><a href="#about">About Trilium</a></li>
|
<li><a href="#about">About Trilium</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div id="appearance">
|
<div id="appearance">
|
||||||
<p>Settings on this options tab are saved automatically after each change.</p>
|
<p>Settings on this options tab are saved automatically after each change.</p>
|
||||||
|
|
||||||
<form>
|
<form>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="theme-select">Theme</label>
|
<label for="theme-select">Theme</label>
|
||||||
<select class="form-control" id="theme-select">
|
<select class="form-control" id="theme-select">
|
||||||
<option value="white">White</option>
|
<option value="white">White</option>
|
||||||
<option value="dark">Dark</option>
|
<option value="dark">Dark</option>
|
||||||
<option value="black">Black</option>
|
<option value="black">Black</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="zoom-factor-select">Zoom factor (desktop build only)</label>
|
|
||||||
|
|
||||||
<input type="number" class="form-control" id="zoom-factor-select" min="0.3" max="2.0" step="0.1"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p>Zooming can be controlled with CTRL-+ and CTRL-= shortcuts as well.</p>
|
|
||||||
|
|
||||||
<h3>Left pane sizing</h3>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="left-pane-min-width">Left pane minimum width (in pixels)</label>
|
|
||||||
|
|
||||||
<input type="number" class="form-control" id="left-pane-min-width" min="100" max="2000" step="1"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="left-pane-min-width">Left pane width percent of window size</label>
|
|
||||||
|
|
||||||
<input type="number" class="form-control" id="left-pane-width-percent" min="0" max="99" step="1"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p>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.</p>
|
|
||||||
|
|
||||||
</form>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="change-password">
|
|
||||||
<form id="change-password-form">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="old-password">Old password</label>
|
|
||||||
<input class="form-control" id="old-password" type="password">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="new-password1">New password</label>
|
<label for="zoom-factor-select">Zoom factor (desktop build only)</label>
|
||||||
<input class="form-control" id="new-password1" type="password">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
<input type="number" class="form-control" id="zoom-factor-select" min="0.3" max="2.0" step="0.1"/>
|
||||||
<label for="new-password2">New password once more</label>
|
|
||||||
<input class="form-control" id="new-password2" type="password">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button class="btn btn-sm">Change password</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="protected-session-timeout">
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<form id="protected-session-timeout-form">
|
<p>Zooming can be controlled with CTRL-+ and CTRL-= shortcuts as well.</p>
|
||||||
<div class="form-group">
|
|
||||||
<label for="protected-session-timeout-in-seconds">Protected session timeout (in seconds)</label>
|
|
||||||
<input class="form-control" id="protected-session-timeout-in-seconds" type="number">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="display: flex; justify-content: space-between;">
|
<h3>Left pane sizing</h3>
|
||||||
<button class="btn btn-sm">Save</button>
|
|
||||||
|
|
||||||
<button class="btn btn-sm" type="button" data-help-page="Protected-notes">
|
<div class="form-group">
|
||||||
<i class="glyphicon glyphicon-info-sign"></i> Help
|
<label for="left-pane-min-width">Left pane minimum width (in pixels)</label>
|
||||||
</button>
|
|
||||||
</div>
|
<input type="number" class="form-control" id="left-pane-min-width" min="100" max="2000" step="1"/>
|
||||||
</form>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="note-revision-snapshot-time-interval">
|
|
||||||
<p>Note revision snapshot time interval is time in seconds after which new note revision will be created for the note.</p>
|
|
||||||
|
|
||||||
<form id="note-revision-snapshot-time-interval-form">
|
<div class="form-group">
|
||||||
<div class="form-group">
|
<label for="left-pane-min-width">Left pane width percent of window size</label>
|
||||||
<label for="note-revision-snapshot-time-interval-in-seconds">Note revision snapshot time interval (in seconds)</label>
|
|
||||||
<input class="form-control" id="note-revision-snapshot-time-interval-in-seconds" type="number">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="display: flex; justify-content: space-between;">
|
<input type="number" class="form-control" id="left-pane-width-percent" min="0" max="99" step="1"/>
|
||||||
<button class="btn btn-sm">Save</button>
|
|
||||||
|
|
||||||
<button class="btn btn-sm" type="button" data-help-page="Note-revisions">
|
|
||||||
<i class="glyphicon glyphicon-info-sign"></i> Help
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="sync-setup">
|
|
||||||
<h4 style="margin-top: 0px;">Sync configuration</h4>
|
|
||||||
|
|
||||||
<form id="sync-setup-form">
|
<p>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.</p>
|
||||||
<div class="form-group">
|
|
||||||
<label for="sync-server-host">Server instance address</label>
|
|
||||||
<input class="form-control" id="sync-server-host" placeholder="https://<host>:<port>">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
</form>
|
||||||
<label for="sync-server-timeout">Sync timeout (milliseconds)</label>
|
|
||||||
<input class="form-control" id="sync-server-timeout" min="1" max="10000000" type="number">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="sync-proxy">Sync proxy server (optional)</label>
|
|
||||||
<input class="form-control" id="sync-proxy" placeholder="https://<host>:<port>">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style="display: flex; justify-content: space-between;">
|
|
||||||
<button class="btn btn-sm">Save</button>
|
|
||||||
|
|
||||||
<button class="btn btn-sm" type="button" data-help-page="Synchronization">
|
|
||||||
<i class="glyphicon glyphicon-info-sign"></i> Help
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<h4>Sync test</h4>
|
|
||||||
|
|
||||||
<p>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.</p>
|
|
||||||
|
|
||||||
<button id="test-sync-button" class="btn btn-sm">Test sync</button>
|
|
||||||
</div>
|
|
||||||
<div id="advanced">
|
|
||||||
<h4 style="margin-top: 0px;">Sync</h4>
|
|
||||||
<button id="force-full-sync-button" class="btn btn-sm">Force full sync</button>
|
|
||||||
|
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
|
|
||||||
<button id="fill-sync-rows-button" class="btn btn-sm">Fill sync rows</button>
|
|
||||||
|
|
||||||
<h4>Debugging</h4>
|
|
||||||
|
|
||||||
<button id="anonymize-button" class="btn btn-sm">Save anonymized database</button><br/><br/>
|
|
||||||
|
|
||||||
<p>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.</p>
|
|
||||||
|
|
||||||
<h4>Image cleanup</h4>
|
|
||||||
|
|
||||||
<p>This will remove all image data of images not used in any current version of note from the database (metadata will remain).
|
|
||||||
|
|
||||||
This means that some images can disappear from note revisions.</p>
|
|
||||||
|
|
||||||
<button id="cleanup-unused-images-button" class="btn btn-sm">Permanently cleanup unused images</button>
|
|
||||||
|
|
||||||
<h4>Vacuum database</h4>
|
|
||||||
|
|
||||||
<p>This will rebuild database which will typically result in smaller database file. No data will be actually changed.</p>
|
|
||||||
|
|
||||||
<button id="vacuum-database-button" class="btn btn-sm">Vacuum database</button>
|
|
||||||
</div>
|
|
||||||
<div id="about">
|
|
||||||
<table class="table">
|
|
||||||
<tr>
|
|
||||||
<th>App version:</th>
|
|
||||||
<td id="app-version"></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th>DB version:</th>
|
|
||||||
<td id="db-version"></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th>Sync version:</th>
|
|
||||||
<td id="sync-version"></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th>Build date:</th>
|
|
||||||
<td id="build-date"></td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
<tr>
|
|
||||||
<th>Build revision:</th>
|
|
||||||
<td><a href="" target="_blank" id="build-revision"></a></td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div id="change-password">
|
||||||
|
<form id="change-password-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="old-password">Old password</label>
|
||||||
|
<input class="form-control" id="old-password" type="password">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="new-password1">New password</label>
|
||||||
|
<input class="form-control" id="new-password1" type="password">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="new-password2">New password once more</label>
|
||||||
|
<input class="form-control" id="new-password2" type="password">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button class="btn btn-sm">Change password</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div id="protected-session-timeout">
|
||||||
|
<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>
|
||||||
|
|
||||||
|
<form id="protected-session-timeout-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="protected-session-timeout-in-seconds">Protected session timeout (in seconds)</label>
|
||||||
|
<input class="form-control" id="protected-session-timeout-in-seconds" type="number">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style="display: flex; justify-content: space-between;">
|
||||||
|
<button class="btn btn-sm">Save</button>
|
||||||
|
|
||||||
|
<button class="btn btn-sm" type="button" data-help-page="Protected-notes">
|
||||||
|
<i class="glyphicon glyphicon-info-sign"></i> Help
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div id="note-revision-snapshot-time-interval">
|
||||||
|
<p>Note revision snapshot time interval is time in seconds after which new note revision will be created for the note.</p>
|
||||||
|
|
||||||
|
<form id="note-revision-snapshot-time-interval-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="note-revision-snapshot-time-interval-in-seconds">Note revision snapshot time interval (in seconds)</label>
|
||||||
|
<input class="form-control" id="note-revision-snapshot-time-interval-in-seconds" type="number">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style="display: flex; justify-content: space-between;">
|
||||||
|
<button class="btn btn-sm">Save</button>
|
||||||
|
|
||||||
|
<button class="btn btn-sm" type="button" data-help-page="Note-revisions">
|
||||||
|
<i class="glyphicon glyphicon-info-sign"></i> Help
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div id="sync-setup">
|
||||||
|
<h4 style="margin-top: 0px;">Sync configuration</h4>
|
||||||
|
|
||||||
|
<form id="sync-setup-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="sync-server-host">Server instance address</label>
|
||||||
|
<input class="form-control" id="sync-server-host" placeholder="https://<host>:<port>">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="sync-server-timeout">Sync timeout (milliseconds)</label>
|
||||||
|
<input class="form-control" id="sync-server-timeout" min="1" max="10000000" type="number">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="sync-proxy">Sync proxy server (optional)</label>
|
||||||
|
<input class="form-control" id="sync-proxy" placeholder="https://<host>:<port>">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style="display: flex; justify-content: space-between;">
|
||||||
|
<button class="btn btn-sm">Save</button>
|
||||||
|
|
||||||
|
<button class="btn btn-sm" type="button" data-help-page="Synchronization">
|
||||||
|
<i class="glyphicon glyphicon-info-sign"></i> Help
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<h4>Sync test</h4>
|
||||||
|
|
||||||
|
<p>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.</p>
|
||||||
|
|
||||||
|
<button id="test-sync-button" class="btn btn-sm">Test sync</button>
|
||||||
|
</div>
|
||||||
|
<div id="advanced">
|
||||||
|
<h4 style="margin-top: 0px;">Sync</h4>
|
||||||
|
<button id="force-full-sync-button" class="btn btn-sm">Force full sync</button>
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
<br/>
|
||||||
|
|
||||||
|
<button id="fill-sync-rows-button" class="btn btn-sm">Fill sync rows</button>
|
||||||
|
|
||||||
|
<h4>Debugging</h4>
|
||||||
|
|
||||||
|
<button id="anonymize-button" class="btn btn-sm">Save anonymized database</button><br/><br/>
|
||||||
|
|
||||||
|
<p>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.</p>
|
||||||
|
|
||||||
|
<h4>Image cleanup</h4>
|
||||||
|
|
||||||
|
<p>This will remove all image data of images not used in any current version of note from the database (metadata will remain).
|
||||||
|
|
||||||
|
This means that some images can disappear from note revisions.</p>
|
||||||
|
|
||||||
|
<button id="cleanup-unused-images-button" class="btn btn-sm">Permanently cleanup unused images</button>
|
||||||
|
|
||||||
|
<h4>Vacuum database</h4>
|
||||||
|
|
||||||
|
<p>This will rebuild database which will typically result in smaller database file. No data will be actually changed.</p>
|
||||||
|
|
||||||
|
<button id="vacuum-database-button" class="btn btn-sm">Vacuum database</button>
|
||||||
|
</div>
|
||||||
|
<div id="about">
|
||||||
|
<table class="table">
|
||||||
|
<tr>
|
||||||
|
<th>App version:</th>
|
||||||
|
<td id="app-version"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>DB version:</th>
|
||||||
|
<td id="db-version"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Sync version:</th>
|
||||||
|
<td id="sync-version"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>Build date:</th>
|
||||||
|
<td id="build-date"></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th>Build revision:</th>
|
||||||
|
<td><a href="" target="_blank" id="build-revision"></a></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
@ -1,16 +1,16 @@
|
|||||||
<div id="protected-session-password-dialog" class="tdialog" title="Protected session">
|
<div id="protected-session-password-dialog" class="tdialog" title="Protected session">
|
||||||
<form id="protected-session-password-form">
|
<form id="protected-session-password-form">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="protected-session-password">To proceed with requested action you need to start protected session by entering password:</label>
|
<label for="protected-session-password">To proceed with requested action you need to start protected session by entering password:</label>
|
||||||
<input id="protected-session-password" class="form-control" type="password">
|
<input id="protected-session-password" class="form-control" type="password">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="display: flex; justify-content: space-between;">
|
<div style="display: flex; justify-content: space-between;">
|
||||||
<button class="btn btn-sm">Start protected session <kbd>enter</kbd></button>
|
<button class="btn btn-sm">Start protected session <kbd>enter</kbd></button>
|
||||||
|
|
||||||
<button class="btn btn-sm" type="button" data-help-page="Protected-notes">
|
<button class="btn btn-sm" type="button" data-help-page="Protected-notes">
|
||||||
<i class="glyphicon glyphicon-info-sign"></i> Help
|
<i class="glyphicon glyphicon-info-sign"></i> Help
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
@ -1,12 +1,12 @@
|
|||||||
<div id="sql-console-dialog" class="tdialog" title="SQL console">
|
<div id="sql-console-dialog" class="tdialog" title="SQL console">
|
||||||
<div id="sql-console-query"></div>
|
<div id="sql-console-query"></div>
|
||||||
|
|
||||||
<div style="text-align: center">
|
<div style="text-align: center">
|
||||||
<button class="btn btn-danger" id="sql-console-execute">Execute <kbd>CTRL+ENTER</kbd></button>
|
<button class="btn btn-danger" id="sql-console-execute">Execute <kbd>CTRL+ENTER</kbd></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<table id="sql-console-results" class="table table-striped" style="overflow: scroll; width: 100%;">
|
<table id="sql-console-results" class="table table-striped" style="overflow: scroll; width: 100%;">
|
||||||
<thead></thead>
|
<thead></thead>
|
||||||
<tbody></tbody>
|
<tbody></tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
@ -1,43 +1,43 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<title>Login</title>
|
<title>Login</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div style="width: 400px; margin: auto; padding-top: 30px;">
|
<div style="width: 400px; margin: auto; padding-top: 30px;">
|
||||||
<h1>Trilium login</h1>
|
<h1>Trilium login</h1>
|
||||||
|
|
||||||
<% if (failedAuth) { %>
|
<% if (failedAuth) { %>
|
||||||
<div class="alert alert-warning">
|
<div class="alert alert-warning">
|
||||||
Username and / or password are incorrect. Please try again.
|
Username and / or password are incorrect. Please try again.
|
||||||
|
</div>
|
||||||
|
<% } %>
|
||||||
|
|
||||||
|
<form action="login" method="POST">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="username">Username</label>
|
||||||
|
<div class="controls">
|
||||||
|
<input id="username" name="username" placeholder="" class="form-control" type="text">
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<% } %>
|
<div class="form-group">
|
||||||
|
<label for="password">Password</label>
|
||||||
<form action="login" method="POST">
|
<div class="controls">
|
||||||
<div class="form-group">
|
<input id="password" name="password" placeholder="" class="form-control" type="password">
|
||||||
<label for="username">Username</label>
|
</div>
|
||||||
<div class="controls">
|
</div>
|
||||||
<input id="username" name="username" placeholder="" class="form-control" type="text">
|
<div class="form-group">
|
||||||
</div>
|
<div class="checkbox">
|
||||||
</div>
|
<label>
|
||||||
<div class="form-group">
|
<input id="remember-me" name="remember_me" value="1" type="checkbox"> Remember me
|
||||||
<label for="password">Password</label>
|
</label>
|
||||||
<div class="controls">
|
</div>
|
||||||
<input id="password" name="password" placeholder="" class="form-control" type="password">
|
</div>
|
||||||
</div>
|
<div class="form-group">
|
||||||
</div>
|
<button class="btn btn-success">Login</button>
|
||||||
<div class="form-group">
|
</div>
|
||||||
<div class="checkbox">
|
</form>
|
||||||
<label>
|
|
||||||
<input id="remember-me" name="remember_me" value="1" type="checkbox"> Remember me
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<button class="btn btn-success">Login</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Required for correct loading of scripts in Electron -->
|
<!-- Required for correct loading of scripts in Electron -->
|
||||||
|
@ -1,122 +1,122 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<title>Setup</title>
|
<title>Setup</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="setup-dialog" style="width: 600px; margin: auto; display:none; font-size: larger;">
|
<div id="setup-dialog" style="width: 600px; margin: auto; display:none; font-size: larger;">
|
||||||
<h1>Trilium Notes setup</h1>
|
<h1>Trilium Notes setup</h1>
|
||||||
|
|
||||||
<div class="alert alert-warning" id="alert" style="display: none;">
|
<div class="alert alert-warning" id="alert" style="display: none;">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="setup-type" data-bind="visible: step() == 'setup-type'" style="margin-top: 20px;">
|
||||||
|
<div class="radio" style="margin-bottom: 15px;">
|
||||||
|
<label><input type="radio" name="setup-type" value="new-document" data-bind="checked: setupNewDocument">
|
||||||
|
I'm a new user and I want to create new Trilium document for my notes</label>
|
||||||
|
</div>
|
||||||
|
<div class="radio" data-bind="if: instanceType == 'server'" style="margin-bottom: 15px;">
|
||||||
|
<label><input type="radio" name="setup-type" value="sync-from-desktop" data-bind="checked: setupSyncFromDesktop">
|
||||||
|
I have desktop instance already and I want to setup sync with it</label>
|
||||||
|
</div>
|
||||||
|
<div class="radio" data-bind="if: instanceType == 'desktop'" style="margin-bottom: 15px;">
|
||||||
|
<label><input type="radio" name="setup-type" value="sync-from-server" data-bind="checked: setupSyncFromServer">
|
||||||
|
I have server instance up and I want to setup sync with it</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="setup-type" data-bind="visible: step() == 'setup-type'" style="margin-top: 20px;">
|
<button type="button" data-bind="disable: !setupTypeSelected(), click: selectSetupType" class="btn btn-primary">Next</button>
|
||||||
<div class="radio" style="margin-bottom: 15px;">
|
</div>
|
||||||
<label><input type="radio" name="setup-type" value="new-document" data-bind="checked: setupNewDocument">
|
|
||||||
I'm a new user and I want to create new Trilium document for my notes</label>
|
|
||||||
</div>
|
|
||||||
<div class="radio" data-bind="if: instanceType == 'server'" style="margin-bottom: 15px;">
|
|
||||||
<label><input type="radio" name="setup-type" value="sync-from-desktop" data-bind="checked: setupSyncFromDesktop">
|
|
||||||
I have desktop instance already and I want to setup sync with it</label>
|
|
||||||
</div>
|
|
||||||
<div class="radio" data-bind="if: instanceType == 'desktop'" style="margin-bottom: 15px;">
|
|
||||||
<label><input type="radio" name="setup-type" value="sync-from-server" data-bind="checked: setupSyncFromServer">
|
|
||||||
I have server instance up and I want to setup sync with it</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button type="button" data-bind="disable: !setupTypeSelected(), click: selectSetupType" class="btn btn-primary">Next</button>
|
<div data-bind="visible: step() == 'new-document'">
|
||||||
|
<h2>New document</h2>
|
||||||
|
|
||||||
|
<p>You're almost done with the setup. The last thing is to choose username and password using which you'll login to the application.
|
||||||
|
This password is also used for generating encryption key which encrypts protected notes.</p>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="username">Username</label>
|
||||||
|
<input type="text" class="form-control" data-bind="value: username" placeholder="Choose alphanumeric username">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="password1">Password</label>
|
||||||
|
<input type="password" class="form-control" data-bind="value: password1" placeholder="Password">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="password2">Repeat password</label>
|
||||||
|
<input type="password" class="form-control" data-bind="value: password2" placeholder="Password">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-bind="visible: step() == 'new-document'">
|
<button type="button" data-bind="click: back" class="btn btn-default">Back</button>
|
||||||
<h2>New document</h2>
|
|
||||||
|
|
||||||
<p>You're almost done with the setup. The last thing is to choose username and password using which you'll login to the application.
|
|
||||||
This password is also used for generating encryption key which encrypts protected notes.</p>
|
|
||||||
|
|
||||||
<div class="form-group">
|
<button type="button" data-bind="click: finish" class="btn btn-primary">Finish setup</button>
|
||||||
<label for="username">Username</label>
|
</div>
|
||||||
<input type="text" class="form-control" data-bind="value: username" placeholder="Choose alphanumeric username">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password1">Password</label>
|
|
||||||
<input type="password" class="form-control" data-bind="value: password1" placeholder="Password">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password2">Repeat password</label>
|
|
||||||
<input type="password" class="form-control" data-bind="value: password2" placeholder="Password">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button type="button" data-bind="click: back" class="btn btn-default">Back</button>
|
<div data-bind="visible: step() == 'sync-from-desktop'">
|
||||||
|
<h2>Sync from Desktop</h2>
|
||||||
|
|
||||||
|
<p>This setup needs to be initiated from the desktop instance:</p>
|
||||||
|
|
||||||
<button type="button" data-bind="click: finish" class="btn btn-primary">Finish setup</button>
|
<ol>
|
||||||
|
<li>please open your desktop instance of Trilium Notes</li>
|
||||||
|
<li>click on Options button in the top right</li>
|
||||||
|
<li>click on Sync tab</li>
|
||||||
|
<li>configure server instance address to the: <span id="current-host"></span> and click save.</li>
|
||||||
|
<li>click on "Sync document to the server instance" button</li>
|
||||||
|
<li>once you've done all this, click <a href="/">here</a></li>
|
||||||
|
</ol>
|
||||||
|
|
||||||
|
<button type="button" data-bind="click: back" class="btn btn-default">Back</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div data-bind="visible: step() == 'sync-from-server'">
|
||||||
|
<h2>Sync from Server</h2>
|
||||||
|
|
||||||
|
<p>Please enter Trilium server address and credentials below. This will download the whole Trilium document from server and setup sync to it. Depending on the document size and your connection speed, this may take a while.</p>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="sync-server-host">Trilium server address</label>
|
||||||
|
<input type="text" id="syncServerHost" class="form-control" data-bind="value: syncServerHost" placeholder="https://<hostname>:<port>">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="sync-proxy">Proxy server (optional)</label>
|
||||||
|
<input type="text" id="sync-proxy" class="form-control" data-bind="value: syncProxy" placeholder="https://<hostname>:<port>">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="username">Username</label>
|
||||||
|
<input type="text" id="username" class="form-control" data-bind="value: username" placeholder="Username">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="password1">Password</label>
|
||||||
|
<input type="password" id="password1" class="form-control" data-bind="value: password1" placeholder="Password">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-bind="visible: step() == 'sync-from-desktop'">
|
<button type="button" data-bind="click: back" class="btn btn-default">Back</button>
|
||||||
<h2>Sync from Desktop</h2>
|
|
||||||
|
|
||||||
<p>This setup needs to be initiated from the desktop instance:</p>
|
|
||||||
|
|
||||||
<ol>
|
<button type="button" data-bind="click: finish" class="btn btn-primary">Finish setup</button>
|
||||||
<li>please open your desktop instance of Trilium Notes</li>
|
</div>
|
||||||
<li>click on Options button in the top right</li>
|
|
||||||
<li>click on Sync tab</li>
|
|
||||||
<li>configure server instance address to the: <span id="current-host"></span> and click save.</li>
|
|
||||||
<li>click on "Sync document to the server instance" button</li>
|
|
||||||
<li>once you've done all this, click <a href="/">here</a></li>
|
|
||||||
</ol>
|
|
||||||
|
|
||||||
<button type="button" data-bind="click: back" class="btn btn-default">Back</button>
|
<div data-bind="visible: step() == 'sync-in-progress'">
|
||||||
</div>
|
<h2>Sync in progress</h2>
|
||||||
|
|
||||||
<div data-bind="visible: step() == 'sync-from-server'">
|
<div class="alert alert-success">Sync has been correctly set up. It will take some time for the initial sync to finish. Once it's done, you'll be redirected to the login page.</div>
|
||||||
<h2>Sync from Server</h2>
|
|
||||||
|
<div data-bind="if: instanceType == 'desktop'">
|
||||||
<p>Please enter Trilium server address and credentials below. This will download the whole Trilium document from server and setup sync to it. Depending on the document size and your connection speed, this may take a while.</p>
|
Outstanding sync items: <strong id="outstanding-syncs">N/A</strong>
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="sync-server-host">Trilium server address</label>
|
|
||||||
<input type="text" id="syncServerHost" class="form-control" data-bind="value: syncServerHost" placeholder="https://<hostname>:<port>">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="sync-proxy">Proxy server (optional)</label>
|
|
||||||
<input type="text" id="sync-proxy" class="form-control" data-bind="value: syncProxy" placeholder="https://<hostname>:<port>">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="username">Username</label>
|
|
||||||
<input type="text" id="username" class="form-control" data-bind="value: username" placeholder="Username">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password1">Password</label>
|
|
||||||
<input type="password" id="password1" class="form-control" data-bind="value: password1" placeholder="Password">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button type="button" data-bind="click: back" class="btn btn-default">Back</button>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<button type="button" data-bind="click: finish" class="btn btn-primary">Finish setup</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div data-bind="visible: step() == 'sync-in-progress'">
|
|
||||||
<h2>Sync in progress</h2>
|
|
||||||
|
|
||||||
<div class="alert alert-success">Sync has been correctly set up. It will take some time for the initial sync to finish. Once it's done, you'll be redirected to the login page.</div>
|
|
||||||
|
|
||||||
<div data-bind="if: instanceType == 'desktop'">
|
|
||||||
Outstanding sync items: <strong id="outstanding-syncs">N/A</strong>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
const baseApiUrl = 'api/';
|
const baseApiUrl = 'api/';
|
||||||
const glob = {
|
const glob = {
|
||||||
sourceId: ''
|
sourceId: ''
|
||||||
};
|
};
|
||||||
const syncInProgress = <%= syncInProgress ? 'true' : 'false' %>;
|
const syncInProgress = <%= syncInProgress ? 'true' : 'false' %>;
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- Required for correct loading of scripts in Electron -->
|
<!-- Required for correct loading of scripts in Electron -->
|
||||||
|
Loading…
x
Reference in New Issue
Block a user