From 609910498d2997b318323e887d41d5bf422c2846 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 17 Apr 2020 01:05:43 +0000 Subject: [PATCH] --- ayanova/src/components/wiki-control.vue | 38 +++++++++++++++---------- ayanova/src/views/widget.vue | 2 +- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue index 0e983c21..603c133c 100644 --- a/ayanova/src/components/wiki-control.vue +++ b/ayanova/src/components/wiki-control.vue @@ -3,12 +3,21 @@ -
- - {{ switchViewIcon() }}Wiki -
+ + + - + +
fa-bold fa-italic @@ -44,7 +50,7 @@ - +
@@ -67,14 +73,14 @@ export default { }, props: { value: String, - canEdit: Boolean + readOnly: Boolean }, methods: { switchViewIcon() { //return the icon that indicates what it will change to if you click it //mirror of switchview below - if (!this.canEdit) { + if (this.readOnly) { if (this.currentView == HIDDEN_VIEW) { return "fa-eye"; } else { @@ -102,7 +108,7 @@ export default { }, switchView() { //if user can't edit then cycle between hidden and wiki view - if (!this.canEdit) { + if (this.readOnly) { if (this.currentView == HIDDEN_VIEW) { this.currentView = WIKI_VIEW; } else { @@ -157,6 +163,8 @@ Standard view maybe top and bottom better? baseurl setting for local images: https://marked.js.org/#/USING_ADVANCED.md#options +todo: event log type just for edit wiki? + - this is because a wiki is not a discrete object in v8 so rights follow object itself and maybe it's necessary to know when wiki was edited? Clean up the example markdown, go through and use mine and sprinkle in the marked sample stuff where it differs diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue index 1506e6dc..905cbb0f 100644 --- a/ayanova/src/views/widget.vue +++ b/ayanova/src/views/widget.vue @@ -207,7 +207,7 @@