Skip to content
Code-Schnipsel Gruppen Projekte
Commit 56019da6 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'dev' of https://dev.quiqqer.com/quiqqer/package-bricks into dev

Übergeordnete c5019721 931f51fd
No related branches found
No related tags found
Keine zugehörigen Merge Requests gefunden
Leerzeichenänderungen ausblenden
Inline Nebeneinander
werden angezeigt mit 260 Ergänzungen und 3 Löschungen
bricks.xml
+ 48
− 0
Zeige Datei @ 56019da6
......@@ -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>
locale.xml
+ 40
− 1
Zeige Datei @ 56019da6
......@@ -1450,7 +1450,7 @@ M&ouml;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&ouml;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>
src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
+ 4
− 0
Zeige Datei @ 56019da6
......@@ -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">
......
src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
+ 4
− 0
Zeige Datei @ 56019da6
......@@ -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">
......
src/QUI/Bricks/Controls/Slider/PromosliderWallpaper.css
+ 0
− 2
Zeige Datei @ 56019da6
......@@ -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;
......
src/QUI/Bricks/Controls/TextAndImage.css 0 → 100644
+ 45
− 0
Zeige Datei @ 56019da6
.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
src/QUI/Bricks/Controls/TextAndImage.html 0 → 100644
+ 44
− 0
Zeige Datei @ 56019da6
{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
src/QUI/Bricks/Controls/TextAndImage.php 0 → 100644
+ 75
− 0
Zeige Datei @ 56019da6
<?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');
}
}
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren

PCSG & QUIQQER support and DEV System - GitLab