Editor, menu item, missing argument, formalize, upload text

pckg · Jan 10, 2020 · 064aaa9 · 064aaa9
1 parent 7ea999f
commit 064aaa9
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 6 deletions.
diff --git a/src/Pckg/Dynamic/public/js/editor.js b/src/Pckg/Dynamic/public/js/editor.js
@@ -82,14 +82,16 @@ let tinyMceConfig = {
     link_class_list: [
         {title: 'Link', value: ''},
         {title: 'Button', value: 'button'},
-        {title: 'Bordered button', value: 'button button-bordered'},
+        {title: 'Bordered button', value: 'button btn-bordered'},
         {title: 'No shadow button', value: 'button no-shadow'},
         {title: 'Shadow button', value: 'button shadow'},
         {title: 'Primary color', value: 'button color-primary'},
         {title: 'Secondary color', value: 'button color-secondary'},
         {title: 'Dark button', value: 'button color-dark'},
-        {title: 'Light button', value: 'button color-light'}
+        {title: 'Light button', value: 'button color-light'},
+        {title: 'Small button', value: 'button size-xs'}
     ],
+    link_context_toolbar: true,
     style_formats: [
         {
             title: 'Headings',
@@ -172,9 +174,28 @@ let tinyMceConfig = {
                     title: 'Secondary (system)', format: 'font-family-secondary-system',
                 }
             ]
-        }
+        },
+        {
+            title: 'Buttons',
+            items: [
+                {title: 'Button', format: 'buttonelement'},
+                {title: 'Bordered', format: 'buttonborderedelement'},
+            ]
+        },
     ],
     formats: {
+        buttonelement: {
+            selector: 'a', classes: 'button',
+        },
+        buttonborderedelement: {
+            selector: 'a', classes: 'button',
+        },
+        /*buttonsizexs: {
+            selector: 'a', classes: 'button size-xs',
+        },
+        buttonsizesm: {
+            selector: 'a', classes: 'button size-m',
+        },*/
         font_size_xxs: {
             selector: 'a,p,h1,h2,h3,h4,h5,h6,span,td,th,div,ul,ol,li,table', classes: 'font-size-xxs'
         },

diff --git a/src/Pckg/Generic/Record/MenuItem.php b/src/Pckg/Generic/Record/MenuItem.php
@@ -9,6 +9,15 @@ class MenuItem extends Record
 
     protected $entity = MenuItems::class;
 
+    public function getAdditionalClass()
+    {
+        if (strpos($this->url, '#') !== 0) {
+            return;
+        }
+
+        return 'clicknscroll';
+    }
+
     public function getRealUrl()
     {
         if (strpos($this->url, '://')) {

diff --git a/src/Pckg/Generic/public/vue/pckg-generic-app-top.js b/src/Pckg/Generic/public/vue/pckg-generic-app-top.js
@@ -142,7 +142,7 @@ export const pckgFormValidator = {
 
 export const pckgSync = {
     methods: {
-        single: function (name, request) {
+        single: function (name, request, object) {
             if (typeof object == 'undefined') {
                 object = this;
             }

diff --git a/src/Pckg/Maestro/Service/Formalize.php b/src/Pckg/Maestro/Service/Formalize.php
@@ -63,6 +63,8 @@ public function __toString()
     {
         vueManager()->addView('Pckg/Maestro:_formalize', ['formalize' => $this, 'form' => $this->form]);
 
+        return '<pckg-maestro-formalize ref="formalize"></pckg-maestro-formalize>';
+
         return (string)view(
             'Pckg/Maestro:formalize',
             [

diff --git a/src/Pckg/Maestro/View/_table_actions.vue b/src/Pckg/Maestro/View/_table_actions.vue
@@ -96,7 +96,7 @@
 
                     <div class="form-group">
                         <label>Row delimiter</label>
-                        <div v-html="meta.newline"></div>
+                        <div v-text="meta.newline"></div>
                         <div class="help">Automatically detected newline delimiter.</div>
                     </div>
 

diff --git a/src/Pckg/Maestro/public/vue/pckg-htmlbuilder-dropzone.vue b/src/Pckg/Maestro/public/vue/pckg-htmlbuilder-dropzone.vue
@@ -171,7 +171,7 @@
                     return file;
                 }
 
-                return 'Drop a file to upload';
+                return 'Select a file or drop it here to upload';
             }
         },
         methods: {