Merge branch 'dev'

bin/Controls/ContentSwitcher.css

@@ -47,3 +47,13 @@
     max-width: 100%;
     width: 100%;
 }
+
+.quiqqer-bricks-ContentSwitcher-entry .field-container-field {
+    border: none;
+    padding: 0;
+}
+
+.quiqqer-bricks-ContentSwitcher-entry .control-editor-preview {
+    height: 120px !important;
+    background: #fff;
+}

bin/Controls/ContentSwitcher.js

@@ -51,6 +51,7 @@ define('package/quiqqer/bricks/bin/Controls/ContentSwitcher', [
                                   QUILocale.get(lg, 'contentSwitcher.entries.entry.content') +
                                '</span>' +
                                '<textarea name="content" rows="10"></textarea>' +
+//                               '<input name="content" data-qui="controls/editors/Input" />' +
                            '</label>' +
                        '</div>'
             });

src/QUI/Bricks/Controls/ContentSwitcher.html

-
 {if $this->getAttribute('showTitle') && $this->getAttribute('frontendTitle')}
 <header class="control-header">
     <h1>{$this->getAttribute('frontendTitle')}</h1>
@@ -20,16 +19,22 @@
     {if !$this->getAttribute( 'startImgOnLeft' )}
     <div class="content-switcher-image {if $modKey && $modKey % 2 !== 0 }push-50 mobile-pull-100
                 push-custom push-custom-mobile{/if}"
-                style="background-image: url('{$img}');"
+         style="background-image: url('{$img}');"
     >
         {if $img != ""}
-            {image src=$entry.img class="content-switcher-image-img"}
+        {image src=$entry.img class="content-switcher-image-img"}
         {/if}
     </div>
     <div class="content-switcher-content {if $modKey && $modKey % 2 !== 0 }pull-50 mobile-pull-100
                 pull-custom pull-custom-mobile{/if}">
-        <h2>{$entry.title}</h2>
-        <p>{$entry.content}</p>
+        {if $entry.title}
+        <h2 class="content-switcher-content-title">{$entry.title}</h2>
+        {/if}
+        {if $entry.content}
+        <div class="content-switcher-content-text">
+            {$entry.content}
+        </div>
+        {/if}
     </div>
 
     {else}
@@ -39,14 +44,20 @@
          style="background-image: url('{$img}');"
     >
         {if $img != ""}
-            {image src=$entry.img class="content-switcher-image-img"}
+        {image src=$entry.img class="content-switcher-image-img"}
         {/if}
     </div>
 
     <div class="content-switcher-content {if $modKey && $modKey % 2 == 0 }pull-50 mobile-pull-100
                 pull-custom{/if}">
-        <h2>{$entry.title}</h2>
-        <p>{$entry.content}</p>
+        {if $entry.title}
+        <h2 class="content-switcher-content-title">{$entry.title}</h2>
+        {/if}
+        {if $entry.content}
+        <div class="content-switcher-content-text">
+            {$entry.content}
+        </div>
+        {/if}
     </div>
 
     {/if}

src/QUI/Bricks/Controls/ContentSwitcher.php

@@ -46,16 +46,10 @@ public function getBody()
         $Engine  = QUI::getTemplateManager()->getEngine();
         $entries = $this->getAttribute('entries');
 
-        echo "<pre>";
-        var_dump($entries);
-        echo "</pre>";
-
         if (is_string($entries)) {
             $entries = json_decode($entries, true);
         }
 
-
-
         $Engine->assign(array(
             'this'    => $this,
             'entries' => $entries