Merge branch 'next-1.x' into '1.x'

fix: merged v2 fixes to v1

See merge request !23

bin/backend/Snippets.js

@@ -60,13 +60,18 @@ define('package/quiqqer/html-snippets/bin/backend/Snippets', [
 
         $onImport: function() {
             const Label = this.getElm().getParent('label');
+            const Parent = Label.parentNode;
             Label.getElements('.field-container-item').destroy();
 
             const Container = new Element('div', {
                 styles: {
                     width: '100%'
                 }
-            }).inject(Label);
+            });
+
+            Parent.appendChild(this.$Elm);
+            Parent.replaceChild(Container, Label);
+
 
             SnippetUtils.isGDPRInstalled().then((isInstalled) => {
 
@@ -99,20 +104,21 @@ define('package/quiqqer/html-snippets/bin/backend/Snippets', [
                 }
 
                 this.$Grid = new Grid(Container, {
-                    height: Label.getParent('.qui-panel-content').getSize().y - 100,
+                    height: Parent.getParent('.qui-panel-content').getSize().y - 100,
                     multipleSelection: true,
                     columnModel: columnModel,
                     buttons: [
                         {
-                            name: 'add',
-                            text: QUILocale.get('quiqqer/quiqqer', 'add'),
+                            name: 'addSnippet',
+                            text: QUILocale.get('quiqqer/core', 'add'),
+                            position: 'left',
                             events: {
                                 click: this.add
                             }
                         }, {
                             name: 'remove',
                             icon: 'fa fa-trash',
-                            title: QUILocale.get('quiqqer/quiqqer', 'remove'),
+                            title: QUILocale.get('quiqqer/core', 'remove'),
                             disabled: true,
                             styles: {
                                 'float': 'right'

src/QUI/HtmlSnippets/SnippetTemplateEvent.php

@@ -3,7 +3,7 @@
 namespace QUI\HtmlSnippets;
 
 use QUI;
-use Quiqqer\Engine\Collector;
+use QUI\Smarty\Collector;
 
 use function array_values;
 use function base64_encode;
@@ -68,13 +68,14 @@ class SnippetTemplateEvent
             }
 
             // consider gdpr status
-            $div = '<div ';
+            $div = '<script ';
             $div .= ' data-qui-html-snippet="gdpr"';
             $div .= ' data-qui-html-snippet-gdpr-category="' . $snippet['gdpr'] . '"';
             $div .= ' style="display: none"';
+            $div .= ' type="text/plain"';
             $div .= '>';
             $div .= base64_encode($snippet['snippet']);
-            $div .= '</div>';
+            $div .= '</script>';
 
             $Collector->append($div);
         }