diff --git a/db/migrations/0140__widget_config.sql b/db/migrations/0140__widget_config.sql
index 3aaf4cb90..c371443b8 100644
--- a/db/migrations/0140__widget_config.sql
+++ b/db/migrations/0140__widget_config.sql
@@ -1,14 +1,14 @@
INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
-VALUES ('noteInfoWidget', '{"enabled":true,"expanded":true,"position":10}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+VALUES ('noteInfoWidget', '{"enabled":true,"expanded":true,"position":100}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
-VALUES ('attributesWidget', '{"enabled":true,"expanded":true,"position":20}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+VALUES ('attributesWidget', '{"enabled":true,"expanded":true,"position":200}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
-VALUES ('linkMapWidget', '{"enabled":true,"expanded":true,"position":30}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+VALUES ('linkMapWidget', '{"enabled":true,"expanded":true,"position":300}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
-VALUES ('noteRevisionsWidget', '{"enabled":true,"expanded":true,"position":40}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+VALUES ('noteRevisionsWidget', '{"enabled":true,"expanded":true,"position":400}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
-VALUES ('whatLinksHereWidget', '{"enabled":false,"expanded":true,"position":50}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
\ No newline at end of file
+VALUES ('whatLinksHereWidget', '{"enabled":false,"expanded":true,"position":500}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
\ No newline at end of file
diff --git a/db/migrations/0142__similar_notes_widget.sql b/db/migrations/0142__similar_notes_widget.sql
index fed139c72..3467cb4c6 100644
--- a/db/migrations/0142__similar_notes_widget.sql
+++ b/db/migrations/0142__similar_notes_widget.sql
@@ -1,2 +1,2 @@
INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
-VALUES ('similarNotesWidget', '{"enabled":true,"expanded":true,"position":60}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
\ No newline at end of file
+VALUES ('similarNotesWidget', '{"enabled":true,"expanded":true,"position":600}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
\ No newline at end of file
diff --git a/db/migrations/0144__edited_notes_widget.sql b/db/migrations/0144__edited_notes_widget.sql
index b635c142f..00a38f75f 100644
--- a/db/migrations/0144__edited_notes_widget.sql
+++ b/db/migrations/0144__edited_notes_widget.sql
@@ -1,2 +1,2 @@
INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
-VALUES ('editedNotesWidget', '{"enabled":true,"expanded":true,"position":5}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
\ No newline at end of file
+VALUES ('editedNotesWidget', '{"enabled":true,"expanded":true,"position":50}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
\ No newline at end of file
diff --git a/db/migrations/0145__calendar_widget.sql b/db/migrations/0145__calendar_widget.sql
new file mode 100644
index 000000000..818929c2f
--- /dev/null
+++ b/db/migrations/0145__calendar_widget.sql
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('calendarWidget', '{"enabled":true,"expanded":true,"position":20}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
\ No newline at end of file
diff --git a/src/public/javascripts/dialogs/options/sidebar.js b/src/public/javascripts/dialogs/options/sidebar.js
index 43cc8a4c5..330e18126 100644
--- a/src/public/javascripts/dialogs/options/sidebar.js
+++ b/src/public/javascripts/dialogs/options/sidebar.js
@@ -53,7 +53,8 @@ export default class SidebarOptions {
{name: 'noteRevisions', title: 'Note revisions'},
{name: 'whatLinksHere', title: 'What links here'},
{name: 'similarNotes', title: 'Similar notes'},
- {name: 'editedNotes', title: 'Edited notes (only on day note)'}
+ {name: 'editedNotes', title: 'Edited notes (only on day note)'},
+ {name: 'calendar', title: 'Calendar (only on day note)'}
].map(widget => {
widget.option = this.parseJsonSafely(options[widget.name + 'Widget']) || {
enabled: true,
diff --git a/src/public/javascripts/widgets/calendar.js b/src/public/javascripts/widgets/calendar.js
new file mode 100644
index 000000000..8438a8817
--- /dev/null
+++ b/src/public/javascripts/widgets/calendar.js
@@ -0,0 +1,54 @@
+import StandardWidget from "./standard_widget.js";
+
+const TPL = `
+
+
+ | Note ID: |
+ |
+
+
+ | Created: |
+ |
+
+
+ | Modified: |
+ |
+
+
+ | Type: |
+ |
+
+ MIME: |
+ |
+
+
+`;
+
+class CalendarWidget extends StandardWidget {
+ getWidgetTitle() { return "Calendar"; }
+
+ async isEnabled() {
+ return await super.isEnabled()
+ && await this.ctx.note.hasLabel("dateNote");
+ }
+
+ async doRenderBody() {
+ this.$body.html(TPL);
+
+ const $noteId = this.$body.find(".note-info-note-id");
+ const $dateCreated = this.$body.find(".note-info-date-created");
+ const $dateModified = this.$body.find(".note-info-date-modified");
+ const $type = this.$body.find(".note-info-type");
+ const $mime = this.$body.find(".note-info-mime");
+
+ const note = this.ctx.note;
+
+ $noteId.text(note.noteId);
+ $dateCreated.text(note.dateCreated);
+ $dateModified.text(note.dateModified);
+ $type.text(note.type);
+ $mime.text(note.mime).attr("title", note.mime);
+ }
+}
+
+export default CalendarWidget;
\ No newline at end of file
diff --git a/src/public/javascripts/widgets/what_links_here.js b/src/public/javascripts/widgets/what_links_here.js
index 9cbd1d9ea..e396578ca 100644
--- a/src/public/javascripts/widgets/what_links_here.js
+++ b/src/public/javascripts/widgets/what_links_here.js
@@ -25,8 +25,11 @@ class WhatLinksHereWidget extends StandardWidget {
}
const $list = $("");
+ let i = 0;
+
+ for (; i < targetRelations.length && i < 50; i++) {
+ const rel = targetRelations[i];
- for (const rel of targetRelations) {
const $item = $("- ")
.append(await linkService.createNoteLink(rel.noteId))
.append($("").text(" (" + rel.name + ")"));
@@ -34,6 +37,10 @@ class WhatLinksHereWidget extends StandardWidget {
$list.append($item);
}
+ if (i < targetRelations.length) {
+ $list.append($("
- ").text(`${targetRelations.length - i} more links ...`))
+ }
+
this.$body.empty().append($list);
}
}
diff --git a/src/routes/api/options.js b/src/routes/api/options.js
index 80e70d8c6..5d956cd3e 100644
--- a/src/routes/api/options.js
+++ b/src/routes/api/options.js
@@ -31,6 +31,7 @@ const ALLOWED_OPTIONS = [
'whatLinksHereWidget',
'similarNotesWidget',
'editedNotesWidget',
+ 'calendarWidget',
'codeNotesMimeTypes'
];
diff --git a/src/services/app_info.js b/src/services/app_info.js
index 049ea324b..ee1db9289 100644
--- a/src/services/app_info.js
+++ b/src/services/app_info.js
@@ -4,7 +4,7 @@ const build = require('./build');
const packageJson = require('../../package');
const {TRILIUM_DATA_DIR} = require('./data_dir');
-const APP_DB_VERSION = 144;
+const APP_DB_VERSION = 145;
const SYNC_VERSION = 10;
const CLIPPER_PROTOCOL_VERSION = "1.0";
diff --git a/src/services/options_init.js b/src/services/options_init.js
index 47c1b5458..d1dcf3e78 100644
--- a/src/services/options_init.js
+++ b/src/services/options_init.js
@@ -69,12 +69,14 @@ async function initNotSyncedOptions(initialized, startNotePath = 'root', opts =
await optionService.createOption('showSidebarInNewTab', 'true', false);
- await optionService.createOption('noteInfoWidget', '{"enabled":true,"expanded":true,"position":10}', false);
- await optionService.createOption('attributesWidget', '{"enabled":true,"expanded":true,"position":20}', false);
- await optionService.createOption('linkMapWidget', '{"enabled":true,"expanded":true,"position":30}', false);
- await optionService.createOption('noteRevisionsWidget', '{"enabled":true,"expanded":true,"position":40}', false);
- await optionService.createOption('whatLinksHereWidget', '{"enabled":false,"expanded":true,"position":50}', false);
- await optionService.createOption('similarNotesWidget', '{"enabled":true,"expanded":true,"position":60}', false);
+ await optionService.createOption('calendarWidget', '{"enabled":true,"expanded":true,"position":20}', false);
+ await optionService.createOption('editedNotesWidget', '{"enabled":true,"expanded":true,"position":50}', false);
+ await optionService.createOption('noteInfoWidget', '{"enabled":true,"expanded":true,"position":100}', false);
+ await optionService.createOption('attributesWidget', '{"enabled":true,"expanded":true,"position":200}', false);
+ await optionService.createOption('linkMapWidget', '{"enabled":true,"expanded":true,"position":300}', false);
+ await optionService.createOption('noteRevisionsWidget', '{"enabled":true,"expanded":true,"position":400}', false);
+ await optionService.createOption('whatLinksHereWidget', '{"enabled":false,"expanded":true,"position":500}', false);
+ await optionService.createOption('similarNotesWidget', '{"enabled":true,"expanded":true,"position":600}', false);
await optionService.createOption('initialized', initialized ? 'true' : 'false', false);
}