diff --git a/bin/css/order.css b/bin/css/order.css
index 4746254ddc581a46002f780a25a677e3d083fe68..05f67e4ccbad11be21117e6f64806c939b7476df 100644
--- a/bin/css/order.css
+++ b/bin/css/order.css
@@ -2,8 +2,6 @@
=================================================== */
.quiqqer-order-ordering .quiqqer-order-ordering-timeline {
border-bottom: none;
- padding-top: 0;
- margin-bottom: 0 !important;
}
.quiqqer-order-ordering-timeline a {
@@ -157,7 +155,6 @@ td.quiqqer-order-basket-articles-article-remove button:hover {
background: #f8f8f8;
border: 1px solid #ddd;
clear: both;
- float: left;
margin-top: 20px;
min-height: 90px;
padding: 20px;
@@ -183,7 +180,6 @@ td.quiqqer-order-basket-articles-article-remove button:hover {
.quiqqer-order-basket-total {
background: #f8f8f8;
border: 1px solid #ddd;
- float: right;
margin-top: 20px;
padding: 5px 10px;
text-align: right;
diff --git a/bin/css/style.css b/bin/css/style.css
index 0bb47fe1ab69a05d5463d96fea18f0ab9ad05c64..a184fee7d9a121ce5f66d7144607513708dd4a90 100644
--- a/bin/css/style.css
+++ b/bin/css/style.css
@@ -107,6 +107,10 @@ body.type-quiqqer-order-types-shoppingCart.type-minimal-design {
min-height: 100vh;
}
+.slideout-panel {
+ min-height: 100vh;
+}
+
p {
margin-bottom: 1.3rem;
}
@@ -416,13 +420,6 @@ a.toTop:before {
padding-right: 20px;
}
-/* workaround to stop collapsing margins */
-/*.layout-start-page .template-header-suffix,
-.layout-start-page .template-footer-prefix,
-.layout-start-page .cologne-main {
- overflow: auto;
-}*/
-
/***********/
/* Layouts */
/***********/
@@ -942,6 +939,10 @@ a.toTop:before {
/** footer
===================================== */
+.template-footer-wrapper {
+ margin-top: auto;
+}
+
.template-footer {
background: #f8f8f8;
border-top: 1px solid #ddd;
diff --git a/index.php b/index.php
index 72af202c90ca9402c717ccce11676e69001d617e..9d0011f0e34a7cec4c7211e62584f92ef0651ed0 100644
--- a/index.php
+++ b/index.php
@@ -12,7 +12,7 @@
*/
$templateSettings = QUI\TemplateCologne\Utils::getConfig([
'Project' => $Project,
- 'Site' => $Site,
+ 'Site' => $Site
]);
/**
@@ -57,8 +57,11 @@
$createBasketButton = true;
if ($Site->getAttribute('type') == 'quiqqer/order:types/orderingProcess' ||
- $Site->getAttribute('type') == 'quiqqer/order:types/shoppingCart') {
+ $Site->getAttribute('type') == 'quiqqer/order:types/shoppingCart' ||
+ $Site->getAttribute('type') == 'quiqqer/order-simple-checkout:types/simpleCheckout') {
$createBasketButton = false;
+
+ $Template->setAttribute('content-header', false);
}
$InitialBasketPrice = new QUI\ERP\Money\Price(0, $Currency);
diff --git a/locale.xml b/locale.xml
index 3a337786330c7b21cc1f891c0affbcdb80e144bf..f8b00333ce6315c4e37857669692312812da2ded 100644
--- a/locale.xml
+++ b/locale.xml
@@ -249,18 +249,64 @@
<de><![CDATA[Header anzeigen]]></de>
<en><![CDATA[Show header]]></en>
</locale>
- <locale name="siteSettings.showEmotion.default">
+ <locale name="siteSettings.header.display.default">
<de><![CDATA[Standard Template-Einstellung übernehmen]]></de>
<en><![CDATA[Default template setting]]></en>
</locale>
<locale name="siteSettings.info" html="true">
- <de><![CDATA[<string>Header anzeigen</strong> überschreibt die Template Einstellung.]]></de>
- <en><![CDATA[<string>Show header</strong> overwrites the template settings.]]></en>
+ <de><![CDATA[Im Header werden sowohl der Titel als auch die Kurzbeschreibung angezeigt (sofern sie nicht ausdrücklich anders konfiguriert sind). Wenn man den Header vollständig deaktiviert, erscheinen der Titel und die Kurzbeschreibung über dem eigentlichen Seiteninhalt. Wenn man den Titel und die Kurzbeschreibung komplett ausblenden möchte, muss man dies separat konfigurieren. <br>Die Einstellung <strong>"Header anzeigen"</strong> überschreibt die Template-Einstellungen.]]></de>
+ <en><![CDATA[In the header, both the title and the short description are displayed (unless explicitly configured otherwise). If you completely disable the header, the title and short description will be shown above the actual page content. If you want to hide the title and short description completely, you must configure that separately. <br>The <strong>"Show Header" setting</strong> overrides the template settings.]]></en>
</locale>
+
+ <!-- page title -->
+ <locale name="siteSettings.pageTitle">
+ <de><![CDATA[Seitentitel anzeigen]]></de>
+ <en><![CDATA[Show page titel]]></en>
+ </locale>
+ <locale name="siteSettings.pageTitle.default">
+ <de><![CDATA[Standard Template-Einstellung übernehmen]]></de>
+ <en><![CDATA[Default template setting]]></en>
+ </locale>
+ <locale name="siteSettings.pageTitle.header">
+ <de><![CDATA[Im Header bzw. vor dem Seiteninhalt (wenn der Header deaktiviert ist)]]></de>
+ <en><![CDATA[In header or before page content (if header is disabled)]]></en>
+ </locale>
+ <locale name="siteSettings.pageTitle.breadcrumb">
+ <de><![CDATA[In der Brotkrümelnavigation (breadcrumb)]]></de>
+ <en><![CDATA[In breadcrumb]]></en>
+ </locale>
+ <locale name="siteSettings.pageTitle.both">
+ <de><![CDATA[Im Header und in der Brotkrümelnavigation]]></de>
+ <en><![CDATA[Both: in header and breadcrumb]]></en>
+ </locale>
+ <locale name="siteSettings.pageTitle.disable">
+ <de><![CDATA[Deaktiviert]]></de>
+ <en><![CDATA[Disabled]]></en>
+ </locale>
+
+ <!-- page description -->
+ <locale name="siteSettings.pageDesc">
+ <de><![CDATA[Seiten Kurzbeschreibung]]></de>
+ <en><![CDATA[Page short description]]></en>
+ </locale>
+ <locale name="siteSettings.pageDesc.default">
+ <de><![CDATA[Standard Template-Einstellung übernehmen]]></de>
+ <en><![CDATA[Default template setting]]></en>
+ </locale>
+ <locale name="siteSettings.pageDesc.enable">
+ <de><![CDATA[Aktiviert]]></de>
+ <en><![CDATA[Enabled]]></en>
+ </locale>
+ <locale name="siteSettings.pageDesc.disable">
+ <de><![CDATA[Deaktiviert]]></de>
+ <en><![CDATA[Disabled]]></en>
+ </locale>
+
<locale name="siteSettings.largeSpacing">
<de><![CDATA[Standard-Abstand erhöhen? Das beeinflusst den vertikalen Abstand zwischen Bausteinen, Seiteninhalt, usw. Meistens benutzt für Landing-Page.]]></de>
<en><![CDATA[Increase standard distance? This affects the vertical distance between bricks, side content, etc. Mostly used for landing page.]]></en>
</locale>
+
<locale name="siteSettings.pageCustomClass">
<de><![CDATA[CSS Klasse]]></de>
<en><![CDATA[CSS class]]></en>
diff --git a/site.xml b/site.xml
index f29ac910aa3a8bcee51fda5ac0da308eec4cdcef..671d26acbdbc5bcc410e696056c030ba9002c6b3 100644
--- a/site.xml
+++ b/site.xml
@@ -4,6 +4,8 @@
<!-- global attributes -->
<attributes>
<attribute>templateCologne.header</attribute>
+ <attribute>templateCologne.pageTitle</attribute>
+ <attribute>templateCologne.pageDesc</attribute>
<attribute>templateCologne.largeSpacing</attribute>
<attribute>templateCologne.pageCustomClass</attribute>
<attribute>templateCologne.independentMenuId</attribute>
@@ -25,7 +27,7 @@
</text>
<option value="default">
<locale group="quiqqer/template-cologne"
- var="siteSettings.showEmotion.default"/>
+ var="siteSettings.header.display.default"/>
</option>
<option value="afterNav">
<locale group="quiqqer/template-cologne"
@@ -45,6 +47,54 @@
var="siteSettings.info"/>
</text>
+ <!-- show page title -->
+ <select conf="templateCologne.pageTitle">
+ <text>
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageTitle"/>
+ </text>
+ <option value="default">
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageTitle.default"/>
+ </option>
+ <option value="header">
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageTitle.header"/>
+ </option>
+ <option value="breadcrumb">
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageTitle.breadcrumb"/>
+ </option>
+ <option value="both">
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageTitle.both"/>
+ </option>
+ <option value="disable">
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageTitle.disable"/>
+ </option>
+ </select>
+
+ <!-- show page description -->
+ <select conf="templateCologne.pageDesc">
+ <text>
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageDesc"/>
+ </text>
+ <option value="default">
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageDesc.default"/>
+ </option>
+ <option value="enable">
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageDesc.enable"/>
+ </option>
+ <option value="disable">
+ <locale group="quiqqer/template-cologne"
+ var="siteSettings.pageDesc.disable"/>
+ </option>
+ </select>
+
<!-- more spacing between bricks -->
<input conf="templateCologne.largeSpacing" type="checkbox">
<text>
diff --git a/src/QUI/TemplateCologne/Utils.php b/src/QUI/TemplateCologne/Utils.php
index be0a70448888f49c88a8652d475c478eef14ddca..ebd541fb689ced29832bc6807d245befc2d4ccda 100644
--- a/src/QUI/TemplateCologne/Utils.php
+++ b/src/QUI/TemplateCologne/Utils.php
@@ -154,7 +154,8 @@ public static function getConfig($params)
}
if ($Site->getAttribute('type') === 'quiqqer/order:types/orderingProcess' ||
- $Site->getAttribute('type') === 'quiqqer/order:types/shoppingCart'
+ $Site->getAttribute('type') === 'quiqqer/order:types/shoppingCart' ||
+ $Site->getAttribute('type') === 'quiqqer/order-simple-checkout:types/simpleCheckout'
) {
switch ($Project->getConfig('templateCologne.settings.checkoutAppearance')) {
case 'compact':
@@ -184,6 +185,25 @@ public static function getConfig($params)
$header = $Site->getAttribute('templateCologne.header');
}
+ /* site own page title settings */
+ switch ($Site->getAttribute('templateCologne.pageTitle')) {
+ case 'header':
+ case 'breadcrumb':
+ case 'both':
+ case 'disable':
+ $pageTitle = $Site->getAttribute('templateCologne.pageTitle');
+ }
+
+ /* site own page description settings */
+ switch ($Site->getAttribute('templateCologne.pageDesc')) {
+ case 'enable':
+ $pageShortDesc = $Site->getAttribute('templateCologne.pageDesc');
+ break;
+
+ case 'disable':
+ $pageShortDesc = false;
+ }
+
// basket style
$basketStyle = 'full';
@@ -340,11 +360,9 @@ private static function getPredefinedFooter($Project)
$lang = $Project->getLang();
/** Predefined footer: short text */
- $shortText = false;
+ $shortText = [];
if ($Project->getConfig('templateCologne.settings.predefinedFooter.shortText')) {
- $shortText = [];
-
$titles = json_decode(
$Project->getConfig(
'templateCologne.settings.predefinedFooter.shortText.title'
@@ -362,11 +380,9 @@ private static function getPredefinedFooter($Project)
}
/** Predefined footer: url list */
- $urlList = false;
+ $urlList = [];
if ($Project->getConfig('templateCologne.settings.predefinedFooter.urlList')) {
- $urlList = [];
-
$titles = json_decode(
$Project->getConfig(
'templateCologne.settings.predefinedFooter.urlList.title'
@@ -485,7 +501,7 @@ private static function getPredefinedFooter($Project)
}
/** Featured products */
- $featuredProducts = false;
+ $featuredProducts = [];
if ($Project->getConfig('templateCologne.settings.predefinedFooter.featuredProducts')) {
$FeaturedProduct = new QUI\ProductBricks\Controls\FeaturedProducts([
@@ -513,7 +529,7 @@ private static function getPredefinedFooter($Project)
}
/** Predefined footer: Payments Control */
- $paymentsData = false;
+ $paymentsData = [];
if ($Project->getConfig('templateCologne.settings.predefinedFooter.payments') &&
\class_exists('\QUI\ERP\Accounting\Payments\Payments')