diff --git a/bricks.xml b/bricks.xml
index 781cba770d8670a655bd9edd750a36593f32553b..bc874e710cba7de07667a4115cf3e0cf6f7fb694 100644
--- a/bricks.xml
+++ b/bricks.xml
@@ -1263,5 +1263,53 @@
</settings>
</brick>
+ <brick control="\QUI\Bricks\Controls\TextAndImage">
+ <title>
+ <locale group="quiqqer/bricks"
+ var="brick.textAndImage.title"/>
+ </title>
+ <description>
+ <locale group="quiqqer/bricks"
+ var="brick.textAndImage.description"/>
+ </description>
+
+ <settings>
+
+ <setting name="image" class="media-image">
+ <locale group="quiqqer/bricks"
+ var="brick.textAndImage.image"/>
+ </setting>
+
+ <setting name="imageOnLeft" type="checkbox">
+ <locale group="quiqqer/bricks"
+ var="brick.textAndImage.imageOnLeft"/>
+ </setting>
+
+ <setting name="maxImageWidth" type="number">
+ <locale group="quiqqer/bricks"
+ var="brick.textAndImage.maxImageWidth"/>
+ </setting>
+
+ <setting name="textPosition" type="select">
+ <locale group="quiqqer/bricks"
+ var="brick.textAndImage.textPosition"/>
+
+ <option value="top">
+ <locale group="quiqqer/bricks"
+ var="brick.textAndImage.textPosition.top"/>
+ </option>
+ <option value="center">
+ <locale group="quiqqer/bricks"
+ var="brick.textAndImage.textPosition.center"/>
+ </option>
+ <option value="bottom">
+ <locale group="quiqqer/bricks"
+ var="brick.textAndImage.textPosition.bottom"/>
+ </option>
+ </setting>
+
+ </settings>
+ </brick>
+
</bricks>
</quiqqer>
diff --git a/locale.xml b/locale.xml
index 8a8434594746dd64ca4347ff6398de1d9083634e..30a11b634e8e24030c889c01a3da5935e61fcb24 100644
--- a/locale.xml
+++ b/locale.xml
@@ -1450,7 +1450,7 @@ Möchten Sie die Bausteine aus der Bausteinzone entfernen?</p>]]></de>
<en><![CDATA[Standard]]></en>
</locale>
<locale name="bricks.BoxContentAdvanced.template.boxWithShadow">
- <de><![CDATA[Moderne Boxen mit Schatten)]]></de>
+ <de><![CDATA[Moderne Boxen mit Schatten]]></de>
<en><![CDATA[Modern boxes with shadow]]></en>
</locale>
<locale name="bricks.BoxContentAdvanced.centerText">
@@ -1648,5 +1648,44 @@ Möchten Sie die Bausteine aus der Bausteinzone entfernen?</p>]]></de>
<en><![CDATA[Bricks: Last News]]></en>
<pl><![CDATA[Bricks: Ostatnie newsy]]></pl>
</locale>
+
+
+ <!-- Text and image -->
+ <locale name="brick.textAndImage.title">
+ <de><![CDATA[Bausteine: Text neben dem Bild]]></de>
+ <en><![CDATA[Bricks: Text next to the image]]></en>
+ </locale>
+ <locale name="brick.textAndImage.description">
+ <de><![CDATA[Der Text wird neben dem Bild angezeigt wahlweise rechts oder links.]]></de>
+ <en><![CDATA[The text is displayed next to the image, either on the right or left.]]></en>
+ </locale>
+ <locale name="brick.textAndImage.image">
+ <de><![CDATA[Bild]]></de>
+ <en><![CDATA[Image]]></en>
+ </locale>
+ <locale name="brick.textAndImage.imageOnLeft">
+ <de><![CDATA[Bild auf der linken Seite]]></de>
+ <en><![CDATA[Image on the left side]]></en>
+ </locale>
+ <locale name="brick.textAndImage.maxImageWidth">
+ <de><![CDATA[Maximale Briete des Bildes]]></de>
+ <en><![CDATA[Maximum image width]]></en>
+ </locale>
+ <locale name="brick.textAndImage.textPosition">
+ <de><![CDATA[Text Position]]></de>
+ <en><![CDATA[Text position]]></en>
+ </locale>
+ <locale name="brick.textAndImage.textPosition.top">
+ <de><![CDATA[Oben]]></de>
+ <en><![CDATA[Top]]></en>
+ </locale>
+ <locale name="brick.textAndImage.textPosition.center">
+ <de><![CDATA[Zentriert]]></de>
+ <en><![CDATA[Center]]></en>
+ </locale>
+ <locale name="brick.textAndImage.textPosition.bottom">
+ <de><![CDATA[Unten]]></de>
+ <en><![CDATA[Bottom]]></en>
+ </locale>
</groups>
</locales>
diff --git a/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html b/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
index 592c045c1013072ed44e7e80cdf3893c8262a72f..91e247817ada29b8cb07fe22ec41100681478bf8 100644
--- a/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
+++ b/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
@@ -26,7 +26,9 @@
{/if}
{/if}
+ {if $entry.entryTitle || $entry.entrySubTitle}
<header>
+ {if $entry.entryTitle}
<h4 class="quiqqer-boxContentAdvanced-entry-title" title="{$entry.entryTitle|escape:'html'}">
{if $entry.entryUrl}
<a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
@@ -38,6 +40,7 @@
</a>
{/if}
</h4>
+ {/if}
{if $entry.entrySubTitle}
<span class="quiqqer-boxContentAdvanced-entry-subTitle">
@@ -45,6 +48,7 @@
</span>
{/if}
</header>
+ {/if}
{if $entry.entryContent}
<div class="quiqqer-boxContentAdvanced-entry-content">
diff --git a/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html b/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
index c62ecc29501c5deb4169dc81881d97f6a066568b..a0ad68361ae6205d936bd21a7eeb935785c2ebd6 100644
--- a/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
+++ b/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
@@ -26,7 +26,9 @@
{/if}
{/if}
+ {if $entry.entryTitle || $entry.entrySubTitle}
<header>
+ {if $entry.entryTitle}
<h4 class="quiqqer-boxContentAdvanced-entry-title" title="{$entry.entryTitle|escape:'html'}">
{if $entry.entryUrl}
<a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
@@ -38,6 +40,7 @@
</a>
{/if}
</h4>
+ {/if}
{if $entry.entrySubTitle}
<span class="quiqqer-boxContentAdvanced-entry-subTitle">
@@ -45,6 +48,7 @@
</span>
{/if}
</header>
+ {/if}
{if $entry.entryContent}
<div class="quiqqer-boxContentAdvanced-entry-content">
diff --git a/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.css b/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.css
index ee81bc16f38563eac98be934179a230deed51c05..015232f907b4986cf1011a680848d470042b9dd0 100644
--- a/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.css
+++ b/src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.css
@@ -171,9 +171,7 @@
.quiqqer-bricks-promoslider-wallpaper-text {
float: left;
- font-size: 16px;
left: 0;
- line-height: 32px;
margin-top: 20px;
padding: 20px 10px;
position: absolute;
diff --git a/src/QUI/Bricks/Controls/TextAndImage.css b/src/QUI/Bricks/Controls/TextAndImage.css
new file mode 100644
index 0000000000000000000000000000000000000000..4611f3faf423e8b10eac081b5d0b1337d212f84e
--- /dev/null
+++ b/src/QUI/Bricks/Controls/TextAndImage.css
@@ -0,0 +1,45 @@
+.quiqqer-textImage {
+ display: flex;
+}
+
+.quiqqer-textImage-box:first-child {
+ padding-left: 0;
+}
+
+.quiqqer-textImage-box:last-child {
+ padding-right: 0;
+}
+
+.quiqqer-textImage-image {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.quiqqer-textImage-image img {
+ display: block;
+}
+
+.quiqqer-textImage-content {
+ display: flex;
+}
+
+@media screen and (max-width: 767px) {
+ .quiqqer-textImage {
+ flex-direction: column;
+ }
+
+ .quiqqer-textImage-box {
+ padding-left: 0;
+ padding-right: 0;
+ }
+
+ .quiqqer-textImage-image {
+ order: 1;
+ margin-bottom: 1rem;
+ }
+
+ .quiqqer-textImage-content {
+ order: 2;
+ }
+}
\ No newline at end of file
diff --git a/src/QUI/Bricks/Controls/TextAndImage.html b/src/QUI/Bricks/Controls/TextAndImage.html
new file mode 100644
index 0000000000000000000000000000000000000000..e4e9e3abd385d1bd8e2e7b3c68cd7b214c2d158f
--- /dev/null
+++ b/src/QUI/Bricks/Controls/TextAndImage.html
@@ -0,0 +1,44 @@
+{assign var=imageOnLeftClass value='quiqqer-textImage__imageOnRight'}
+{if $imageOnLeft}
+{assign var=imageOnLeftClass value='quiqqer-textImage__imageOnLeft'}
+{/if}
+
+<div class="quiqqer-textImage {$imageOnLeftClass}">
+ {if $imageOnLeft}
+ <div class="quiqqer-textImage-box quiqqer-textImage-image grid-50 mobile-grid-100">
+ {if $img}
+ {image src=$img width=$maxImageWidth}
+ {/if}
+ </div>
+ <div class="quiqqer-textImage-box quiqqer-textImage-content grid-50 mobile-grid-100"
+ style="align-items: {$textPosition};">
+ <div class="quiqqer-textImage-content-inner">
+ {if $this->getAttribute('showTitle') && $this->getAttribute('frontendTitle')}
+ <header>
+ <h1>{$this->getAttribute('frontendTitle')}</h1>
+ </header>
+ {/if}
+
+ {$this->getAttribute('content')}
+ </div>
+ </div>
+ {else}
+ <div class="quiqqer-textImage-box quiqqer-textImage-content grid-50 mobile-grid-100"
+ style="align-items: {$textPosition};">
+ <div class="quiqqer-textImage-content-inner">
+ {if $this->getAttribute('showTitle') && $this->getAttribute('frontendTitle')}
+ <header>
+ <h1>{$this->getAttribute('frontendTitle')}</h1>
+ </header>
+ {/if}
+
+ {$this->getAttribute('content')}
+ </div>
+ </div>
+ <div class="quiqqer-textImage-box quiqqer-textImage-image grid-50 mobile-grid-100">
+ {if $img}
+ {image src=$img width=$maxImageWidth}
+ {/if}
+ </div>
+ {/if}
+</div>
\ No newline at end of file
diff --git a/src/QUI/Bricks/Controls/TextAndImage.php b/src/QUI/Bricks/Controls/TextAndImage.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a79e7f078a7a0d5015ff53443c279e34b4d8c58
--- /dev/null
+++ b/src/QUI/Bricks/Controls/TextAndImage.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This file contains \QUI\Bricks\Controls\TextAndImage
+ */
+
+namespace QUI\Bricks\Controls;
+
+use QUI;
+
+/**
+ * Class TextAndImage
+ *
+ * @package quiqqer/bricks
+ */
+class TextAndImage extends QUI\Control
+{
+ /**
+ * constructor
+ *
+ * @param array $attributes
+ */
+ public function __construct($attributes = [])
+ {
+ // default options
+ $this->setAttributes([
+ 'image' => false,
+ 'maxImageWidth' => false,
+ 'imageRight' => false,
+ 'textPosition' => 'top' // top, center, bottom
+ ]);
+
+ parent::__construct($attributes);
+
+ $this->addCSSFile(
+ dirname(__FILE__) . '/TextAndImage.css'
+ );
+ }
+
+ /**
+ * (non-PHPdoc)
+ *
+ * @see \QUI\Control::create()
+ */
+ public function getBody()
+ {
+ $Engine = QUI::getTemplateManager()->getEngine();
+
+ // text position
+ switch ($this->getAttribute('textPosition')) {
+ case 'center':
+ $textPosition = 'center';
+ break;
+
+ case 'bottom':
+ $textPosition = 'bottom';
+ break;
+
+ case 'top':
+ default:
+ $textPosition = 'flex-start';
+ }
+
+ $Engine->assign([
+ 'this' => $this,
+ 'img' => $this->getAttribute('image'),
+ 'maxImageWidth' => intval($this->getAttribute('maxImageWidth')),
+ 'imageOnLeft' => $this->getAttribute('imageOnLeft'),
+ 'imageAsBackground' => $this->getAttribute('imageAsBackground'),
+ 'textPosition' => $textPosition
+ ]);
+
+ return $Engine->fetch(dirname(__FILE__) . '/TextAndImage.html');
+ }
+}