diff --git a/system/author/editor/editor-blox.twig b/system/author/editor/editor-blox.twig index 00702f6..a7c14f6 100644 --- a/system/author/editor/editor-blox.twig +++ b/system/author/editor/editor-blox.twig @@ -31,7 +31,7 @@ {% endif %} -
+
diff --git a/system/author/editor/editor-raw.twig b/system/author/editor/editor-raw.twig index c21a2ca..16a630c 100644 --- a/system/author/editor/editor-raw.twig +++ b/system/author/editor/editor-raw.twig @@ -23,6 +23,7 @@ :errors="formErrors[currentTab]" :schema="formDefinitions[currentTab]" :formdata="formData[currentTab]" + :item="item" v-on:saveform="saveForm"> @@ -30,7 +31,8 @@ {% endif %} -
+
+
@@ -54,6 +56,24 @@
+ {% if item.elementType == "folder" %} + +
+
+ + +
+
+ +
+
+ + {% endif %} + {% include 'editor/publish-controller.twig' %} {{ csrf_field() | raw }} diff --git a/system/author/js/vue-blox.js b/system/author/js/vue-blox.js index 9c7d4f6..2b5aad5 100644 --- a/system/author/js/vue-blox.js +++ b/system/author/js/vue-blox.js @@ -1853,7 +1853,7 @@ let editor = new Vue({ draftDisabled: true, bloxOverlay: false, sortdisabled: false, - showBlox: 'show', + showEditor: 'show', formats: activeFormats }, mounted: function(){ diff --git a/system/author/js/vue-editor.js b/system/author/js/vue-editor.js index 861236e..d09c259 100644 --- a/system/author/js/vue-editor.js +++ b/system/author/js/vue-editor.js @@ -9,7 +9,8 @@ let editor = new Vue({ form: { title: document.getElementById("title").value, content: document.getElementById("content").value, - } + }, + showEditor: 'show', }, mounted: function(){ autosize(document.querySelector('textarea')); diff --git a/system/author/js/vue-meta.js b/system/author/js/vue-meta.js index 4acdb63..1b929aa 100644 --- a/system/author/js/vue-meta.js +++ b/system/author/js/vue-meta.js @@ -11,7 +11,6 @@ Vue.filter('translate', function (value) { } }) - Vue.component('tab-meta', { props: ['saved', 'errors', 'formdata', 'schema', 'userroles'], template: '
' + @@ -61,12 +60,12 @@ let meta = new Vue({ currentTabComponent: function () { if(this.currentTab == 'Content') { - editor.showBlox = 'show'; + editor.showEditor = 'show'; posts.showPosts = 'show'; } else { - editor.showBlox = 'hidden'; + editor.showEditor = 'hidden'; posts.showPosts = 'hidden'; } return 'tab-' + this.currentTab.toLowerCase() diff --git a/system/author/layouts/layoutEditor.twig b/system/author/layouts/layoutEditor.twig index 09f2a81..0f26e12 100644 --- a/system/author/layouts/layoutEditor.twig +++ b/system/author/layouts/layoutEditor.twig @@ -16,6 +16,7 @@ + {{ assets.renderCSS() }} @@ -47,10 +48,8 @@ - - - + - + + + {{ assets.renderJS() }}