Skip to content
Code-Schnipsel Gruppen Projekte
Commit 8f350e8d 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 64e12fff 8916b679
No related branches found
No related tags found
Keine zugehörigen Merge Requests gefunden
Alle erweitern Leerzeichenänderungen ausblenden
Inline Nebeneinander
werden angezeigt mit 327 Ergänzungen und 153 Löschungen
bin/Controls/BoxContentAdvanced.Settings.html
+ 4
− 0
Zeige Datei @ 8f350e8d
......@@ -11,6 +11,10 @@
<span class="entry-title">{{entryImage}}</span>
<input class="media-image" data-qui-options-selectable_types="image" data-qui-options-cssclasses="1" name="entryImage"/>
</label>
<label>
<span class="entry-title">{{entryUrl}}</span>
<input type="text" name="entryUrl" class="project-site" data-external="1" />
</label>
<label>
<span class="entry-title">{{entryOrder}}</span>
<input type="number" name="entryOrder"/>
......
bin/Controls/BoxContentAdvanced.css
+ 4
− 0
Zeige Datei @ 8f350e8d
......@@ -99,3 +99,7 @@
background: #fff;
height: 120px !important;
}
.quiqqer-bricks-boxContentAdvanced-entry .qui-controls-project-site-input {
display: flex;
}
\ No newline at end of file
bin/Controls/BoxContentAdvanced.js
+ 1
− 0
Zeige Datei @ 8f350e8d
......@@ -46,6 +46,7 @@ define('package/quiqqer/bricks/bin/Controls/BoxContentAdvanced', [
'entryTitle' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryTitle'),
'entrySubTitle': QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entrySubTitle'),
'entryImage' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryImage'),
'entryUrl' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryUrl'),
'entryOrder' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryOrder'),
'entryContent' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryContent')
})
......
bricks.xml
+ 120
− 107
Zeige Datei @ 8f350e8d
Dieser Diff ist reduziert.
locale.xml
+ 16
− 0
Zeige Datei @ 8f350e8d
......@@ -365,6 +365,10 @@
<en><![CDATA[Sort]]></en>
<pl><![CDATA[Sortowanie]]></pl>
</locale>
<locale name="brick.control.order.order_field">
<de><![CDATA[Manuell]]></de>
<en><![CDATA[Manual]]></en>
</locale>
<locale name="site.area.window.settings.setting.width">
<de><![CDATA[Breite]]></de>
......@@ -1445,6 +1449,14 @@ M&ouml;chten Sie die Bausteine aus der Bausteinzone entfernen?</p>]]></de>
<de><![CDATA[Standard]]></de>
<en><![CDATA[Standard]]></en>
</locale>
<locale name="bricks.BoxContentAdvanced.template.boxWithShadow">
<de><![CDATA[Moderne Boxen mit Schatten)]]></de>
<en><![CDATA[Modern boxes with shadow]]></en>
</locale>
<locale name="bricks.BoxContentAdvanced.centerText">
<de><![CDATA[Text zentrieren (Titel und Inhalt)]]></de>
<en><![CDATA[Centre text (title and content)]]></en>
</locale>
<locale name="bricks.BoxContentAdvanced.entriesPerLine">
<de><![CDATA[Anzahl der Boxen (Einträge) pro Zeile]]></de>
<en><![CDATA[Number of boxes (entries) per line]]></en>
......@@ -1461,6 +1473,10 @@ M&ouml;chten Sie die Bausteine aus der Bausteinzone entfernen?</p>]]></de>
<de><![CDATA[Bild]]></de>
<en><![CDATA[Image]]></en>
</locale>
<locale name="bricks.BoxContentAdvanced.entries.settings.entryUrl">
<de><![CDATA[Seiten-Url]]></de>
<en><![CDATA[Site url]]></en>
</locale>
<locale name="bricks.BoxContentAdvanced.entries.settings.entryOrder">
<de><![CDATA[Priorität]]></de>
<en><![CDATA[Priority]]></en>
......
src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.css 0 → 100644
+ 38
− 0
Zeige Datei @ 8f350e8d
.quiqqer-boxContentAdvanced-wrapper.template-boxWithShadow {
overflow: visible;
}
.quiqqer-boxContentAdvanced-entries__boxWithShadow {
padding: 2rem 0;
}
.quiqqer-boxContentAdvanced-entries__boxWithShadow .quiqqer-boxContentAdvanced-entry {
box-shadow: 0 20px 40px -12px rgba(0,0,0,0.13);
background-color: #fff;
}
.quiqqer-boxContentAdvanced-entries__boxWithShadow .quiqqer-boxContentAdvanced-entry-img {
background: #f8f8f8;
margin-bottom: 1rem;
text-align: center;
}
.quiqqer-boxContentAdvanced-entries__boxWithShadow header {
padding-left: 1rem;
padding-right: 1rem;
}
.quiqqer-boxContentAdvanced-entries__boxWithShadow .quiqqer-boxContentAdvanced-entry-content {
padding-left: 1rem;
padding-right: 1rem;
}
.quiqqer-boxContentAdvanced-entries__boxWithShadow .quiqqer-boxContentAdvanced-entry-img .fa {
margin-bottom: 3rem;
margin-top: 3rem;
}
.quiqqer-boxContentAdvanced-entries__boxWithShadow .centerText header,
.quiqqer-boxContentAdvanced-entries__boxWithShadow .centerText .quiqqer-boxContentAdvanced-entry-content {
text-align: center;
}
\ No newline at end of file
src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html 0 → 100644
+ 57
− 0
Zeige Datei @ 8f350e8d
<div class="quiqqer-boxContentAdvanced-entries quiqqer-boxContentAdvanced-entries__boxWithShadow">
{assign var=centerTex value=''}
{if $centerText}
{assign var=centerText value='centerText'}
{/if}
{foreach from=$entries item=entry}
{if $entry.entryUrl && QUI\Projects\Site\Utils::getSiteByLink($entry.entryUrl)}
{assign var=TargetSite value=QUI\Projects\Site\Utils::getSiteByLink($entry.entryUrl)}
{/if}
<div class="quiqqer-boxContentAdvanced-entry-container quiqqer-boxContentAdvanced{$entriesPerLine} {$centerText}"
{if $entry.entryOrder}style="order: {$entry.entryOrder}"{/if}>
<div class="quiqqer-boxContentAdvanced-entry">
{if $entry.entryImage}
{if $entry.entryUrl}
<a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
{/if}
<div class="quiqqer-boxContentAdvanced-entry-img control-color">
{image src=$entry.entryImage width="500"}
</div>
{if $entry.entryUrl}
</a>
{/if}
{/if}
<header>
<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')}">
{/if}
{$entry.entryTitle|escape:'html'}
{if $entry.entryUrl}
</a>
{/if}
</h4>
{if $entry.entrySubTitle}
<span class="quiqqer-boxContentAdvanced-entry-subTitle">
{$entry.entrySubTitle|escape:'html'}
</span>
{/if}
</header>
{if $entry.entryContent}
<div class="quiqqer-boxContentAdvanced-entry-content">
{$entry.entryContent}
</div>
{/if}
</div>
</div>
{/foreach}
</div>
\ No newline at end of file
src/QUI/Bricks/Controls/BoxContentAdvanced.css
+ 8
− 39
Zeige Datei @ 8f350e8d
......@@ -52,49 +52,18 @@
width: 10%;
}
/* general styling */
.quiqqer-boxContentAdvanced-entry-img {
margin-bottom: 2rem;
text-align: center;
@media screen and (max-width: 767px) {
.quiqqer-boxContentAdvanced-entries .quiqqer-boxContentAdvanced-entry-container {
flex: 1 0 280px;
}
}
.quiqqer-boxContentAdvanced-entry-img picture {
display: block;
height: 250px;
width: auto !important;
.quiqqer-boxContentAdvanced-entry-img picture,
.quiqqer-boxContentAdvanced-entry-img img {
width: auto;
}
.quiqqer-boxContentAdvanced-entry-img .fa {
font-size: 40px;
font-size: 60px;
margin-bottom: 2rem;
}
.quiqqer-boxContentAdvanced-entry header {
text-align: center;
}
.quiqqer-boxContentAdvanced-entry-title {
font-size: 1.25rem;
}
.quiqqer-boxContentAdvanced-entry-subTitle {
font-size: 0.9rem;
}
.quiqqer-boxContentAdvanced-entry-content {
text-align: center;
}
.quiqqer-boxContentAdvanced-entry-content *:last-child {
margin-bottom: 0;
}
@media screen and (max-width: 767px) {
.quiqqer-boxContentAdvanced-entry-container {
flex: 1 0 280px;
}
.quiqqer-boxContentAdvanced-entry-img picture {
height: auto;
}
}
\ No newline at end of file
src/QUI/Bricks/Controls/BoxContentAdvanced.html
+ 1
− 1
Zeige Datei @ 8f350e8d
......@@ -10,7 +10,7 @@
</div>
{/if}
<div class="quiqqer-boxContentAdvanced-wrapper grid-children">
<div class="quiqqer-boxContentAdvanced-wrapper grid-children template-{$this->getAttribute('template')}">
<div class="grid-children-container">
{$entriesTemplate}
</div>
......
src/QUI/Bricks/Controls/BoxContentAdvanced.php
+ 16
− 1
Zeige Datei @ 8f350e8d
......@@ -27,6 +27,7 @@ public function __construct($attributes = [])
'title' => 'Box Content Advanced',
'entriesPerLine' => 3,
'template' => 'standard',
'centerText' => false,
'entries' => []
]);
......@@ -53,10 +54,24 @@ public function getBody()
$Engine->assign([
'entries' => $entries,
'centerText' => $this->getAttribute('centerText'),
'entriesPerLine' => '-' . $this->getAttribute('entriesPerLine')
]);
$entriesTemplate = $Engine->fetch(dirname(__FILE__) . '/BoxContentAdvanced.standard.html');
switch ($this->getAttribute('template')) {
case 'boxWithShadow':
$boxTemplate = '/BoxContentAdvanced.boxWithShadow.html';
$boxCss = '/BoxContentAdvanced.boxWithShadow.css';
break;
case 'default':
default:
$boxTemplate = '/BoxContentAdvanced.standard.html';
$boxCss = '/BoxContentAdvanced.standard.css';
break;
}
$entriesTemplate = $Engine->fetch(dirname(__FILE__) . $boxTemplate);
$this->addCSSFile(dirname(__FILE__) . $boxCss);
$Engine->assign([
'this' => $this,
......
src/QUI/Bricks/Controls/BoxContentAdvanced.standard.css 0 → 100644
+ 31
− 0
Zeige Datei @ 8f350e8d
.quiqqer-boxContentAdvanced-entries__standard .quiqqer-boxContentAdvanced-entry-img {
margin-bottom: 2rem;
text-align: center;
}
.quiqqer-boxContentAdvanced-entries__standard .quiqqer-boxContentAdvanced-entry-img picture {
height: 250px;
}
.quiqqer-boxContentAdvanced-entries__standard .quiqqer-boxContentAdvanced-entry-title {
font-size: 1.25rem;
}
.quiqqer-boxContentAdvanced-entries__standard .quiqqer-boxContentAdvanced-entry-subTitle {
font-size: 0.9rem;
}
.quiqqer-boxContentAdvanced-entries__standard .quiqqer-boxContentAdvanced-entry-content *:last-child {
margin-bottom: 0;
}
.quiqqer-boxContentAdvanced-entries__standard .centerText header,
.quiqqer-boxContentAdvanced-entries__standard .centerText .quiqqer-boxContentAdvanced-entry-content {
text-align: center;
}
@media screen and (max-width: 767px) {
.quiqqer-boxContentAdvanced-entries__standard .quiqqer-boxContentAdvanced-entry-img picture {
height: auto;
}
}
\ No newline at end of file
src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
+ 31
− 5
Zeige Datei @ 8f350e8d
<div class="quiqqer-boxContentAdvanced-entries quiqqer-boxContentAdvanced__standard">
<div class="quiqqer-boxContentAdvanced-entries quiqqer-boxContentAdvanced-entries__standard">
{assign var=centerTex value=''}
{if $centerText}
{assign var=centerText value='centerText'}
{/if}
{foreach from=$entries item=entry}
<div class="quiqqer-boxContentAdvanced-entry-container quiqqer-boxContentAdvanced{$entriesPerLine}"
{if $entry.entryUrl && QUI\Projects\Site\Utils::getSiteByLink($entry.entryUrl)}
{assign var=TargetSite value=QUI\Projects\Site\Utils::getSiteByLink($entry.entryUrl)}
{/if}
<div class="quiqqer-boxContentAdvanced-entry-container quiqqer-boxContentAdvanced{$entriesPerLine} {$centerText}"
{if $entry.entryOrder}style="order: {$entry.entryOrder}"{/if}>
<div class="quiqqer-boxContentAdvanced-entry">
{if $entry.entryImage}
<div class="quiqqer-boxContentAdvanced-entry-img control-color">
{image src=$entry.entryImage width="500"}
</div>
{if $entry.entryUrl}
<a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
{/if}
<div class="quiqqer-boxContentAdvanced-entry-img control-color">
{image src=$entry.entryImage width="500"}
</div>
{if $entry.entryUrl}
</a>
{/if}
{/if}
<header>
<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')}">
{/if}
{$entry.entryTitle|escape:'html'}
{if $entry.entryUrl}
</a>
{/if}
</h4>
{if $entry.entrySubTitle}
<span class="quiqqer-boxContentAdvanced-entry-subTitle">
{$entry.entrySubTitle|escape:'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