Skip to content
Code-Schnipsel Gruppen Projekte
Commit 11b31bfb erstellt von Michael Danielczok's avatar Michael Danielczok
Dateien durchsuchen

fix: register smarty functions (required smarty4 >= 2.0.7)

Übergeordneter 9a559f7f
No related branches found
No related tags found
2 Merge Requests!25Update 'next-3.x' with latest changes from 'main',!24fix: adjust paths to standard mail templates in quiqqer/core
Pipeline #12154 fehlgeschlagen mit Phase
in 2 Minuten und 53 Sekunden
Leerzeichenänderungen ausblenden
Inline Nebeneinander
werden angezeigt mit 33 Ergänzungen und 26 Löschungen
composer.json
+ 2
− 1
Zeige Datei @ 11b31bfb
......@@ -28,7 +28,8 @@
"quiqqer/unsemantic": "^2",
"quiqqer-asset/fastclick": "^1",
"quiqqer/tooltips": "^2",
"quiqqer/currency": "^2"
"quiqqer/currency": "^2",
"quiqqer/smarty4": "^2.0.7"
},
"autoload": {
"psr-4": {
......
index.php
+ 10
− 4
Zeige Datei @ 11b31bfb
<?php
/**
* Emotion
* Register smarty functions
*/
if (method_exists($Engine, 'getSmarty')) {
$Engine->getSmarty()->registerClass('TemplateCologneUtils', 'QUI\TemplateCologne\Utils');
}
/**
* Emotion
*/
QUI\Utils\Site::setRecursiveAttribute($Site, 'image_emotion');
QUI\Utils\Site::setRecursiveAttribute($Site, 'layout');
......@@ -13,7 +19,7 @@
$templateSettings = QUI\TemplateCologne\Utils::getConfig([
'Project' => $Project,
'Template' => $Template,
'Site' => $Site
'Site' => $Site
]);
/**
......@@ -93,7 +99,7 @@
/* user avatar */
$Avatar = new QUI\FrontendUsers\Controls\UserIcon([
'showLogout' => false, // template cologne use own logout popup (see bin/javascript/init.js)
'User' => QUI::getUserBySession()
'User' => QUI::getUserBySession()
]);
/* product page - for layouts */
......@@ -134,7 +140,7 @@
$registerSite = $Project->getSites([
'where' => [
'type' => [
'type' => 'IN',
'type' => 'IN',
'value' => $registerSiteTypes
]
],
......
layout/leftSidebar.html
+ 2
− 2
Zeige Datei @ 11b31bfb
......@@ -9,7 +9,7 @@
{if !empty( $prefixContentBricks )}
{foreach from=$prefixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section
class="template-brick-container template-brick-contentPrefix brick-id-{$Brick->getAttribute('id')} {$classes}">
......@@ -63,7 +63,7 @@
{if !empty( $suffixContentBricks )}
{foreach from=$suffixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-contentSuffix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-row">
......
layout/noSidebar.html
+ 2
− 2
Zeige Datei @ 11b31bfb
......@@ -6,7 +6,7 @@
<div class="main-no-sidebar">
{if !empty( $prefixContentBricks )}
{foreach from=$prefixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-contentPrefix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-row">
......@@ -58,7 +58,7 @@
{if !empty( $suffixContentBricks )}
{foreach from=$suffixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-contentSuffix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-row">
......
layout/noSidebarThin.html
+ 2
− 2
Zeige Datei @ 11b31bfb
......@@ -7,7 +7,7 @@
<div class="main-no-sidebar-thin">
{if !empty( $prefixContentBricks )}
{foreach from=$prefixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-contentPrefix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-row">
......@@ -58,7 +58,7 @@
{if !empty( $suffixContentBricks )}
{foreach from=$suffixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-contentSuffix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-row">
......
layout/rightSidebar.html
+ 2
− 2
Zeige Datei @ 11b31bfb
......@@ -10,7 +10,7 @@
{if !empty( $prefixContentBricks )}
{foreach from=$prefixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-contentPrefix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-row">
......@@ -62,7 +62,7 @@
{if !empty( $suffixContentBricks )}
{foreach from=$suffixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-contentSuffix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-row">
......
layout/startPage.html
+ 2
− 2
Zeige Datei @ 11b31bfb
......@@ -6,7 +6,7 @@
<div class="main-start-page">
{if !empty( $prefixContentBricks )}
{foreach from=$prefixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-contentPrefix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-row">
......@@ -59,7 +59,7 @@
{if !empty( $suffixContentBricks )}
{foreach from=$suffixContentBricks item=Brick}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-contentSuffix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-row">
......
quiqqer/order/src/QUI/ERP/Order/Controls/Basket/Basket.html
+ 2
− 2
Zeige Datei @ 11b31bfb
......@@ -9,7 +9,7 @@
>
{locale group="quiqqer/erp" var="article.list.articles.header.pos"}
</th>
{if QUI\TemplateCologne\Utils::getSetting('order.basket.showImages')}
{if $TemplateCologneUtils::getSetting('order.basket.showImages')}
<th class="quiqqer-order-basket-articles-header-image"
title="{locale group='quiqqer/erp' var='article.list.articles.header.image'}"
>
......@@ -50,7 +50,7 @@
>
{$pos}
</td>
{if QUI\TemplateCologne\Utils::getSetting('order.basket.showImages')}
{if $TemplateCologneUtils::getSetting('order.basket.showImages')}
<td class="quiqqer-order-basket-articles-article-image"
data-label="{locale group='quiqqer/erp' var='article.list.articles.header.image'}"
>
......
quiqqer/products/src/QUI/ERP/Products/Controls/Category/ProductListDetails.html
+ 1
− 1
Zeige Datei @ 11b31bfb
......@@ -42,7 +42,7 @@
{/if}
{if $Project->getConfig('templateCologne.settings.categoryShowStock')}
{assign var=ShippingTimeFrontendView value=\QUI\TemplateCologne\Utils::getShippingTimeFrontendView($Product->getId())}
{assign var=ShippingTimeFrontendView value=$TemplateCologneUtils::getShippingTimeFrontendView($Product->getId())}
{if $ShippingTimeFrontendView}
<div class="cologne-productList-product-details-content-shippingTime">
{$ShippingTimeFrontendView->create()}
......
quiqqer/products/src/QUI/ERP/Products/Controls/Category/ProductListGallery.html
+ 1
− 1
Zeige Datei @ 11b31bfb
......@@ -36,7 +36,7 @@
</div>
{if $Project->getConfig('templateCologne.settings.categoryShowStock')}
{assign var=ShippingTimeFrontendView value=\QUI\TemplateCologne\Utils::getShippingTimeFrontendView($Product->getId())}
{assign var=ShippingTimeFrontendView value=$TemplateCologneUtils::getShippingTimeFrontendView($Product->getId())}
{if $ShippingTimeFrontendView}
<div class="cologne-products-productGallery-products-product-price-shippingTime">
{$ShippingTimeFrontendView->create()}
......
quiqqer/products/src/QUI/ERP/Products/Controls/Category/ProductListList.html
+ 1
− 1
Zeige Datei @ 11b31bfb
......@@ -16,7 +16,7 @@
</div>
{if $Project->getConfig('templateCologne.settings.categoryShowStock')}
{assign var=ShippingTimeFrontendView value=\QUI\TemplateCologne\Utils::getShippingTimeFrontendView($Product->getId())}
{assign var=ShippingTimeFrontendView value=$TemplateCologneUtils::getShippingTimeFrontendView($Product->getId())}
{if $ShippingTimeFrontendView}
<div class="quiqqer-productList-product-list-text-shippingTime">
{$ShippingTimeFrontendView->create()}
......
quiqqer/products/src/QUI/ERP/Products/Controls/Products/Product.html
+ 2
− 2
Zeige Datei @ 11b31bfb
......@@ -69,12 +69,12 @@
{/foreach}
{assign var=ShippingTimeFrontendView
value=\QUI\TemplateCologne\Utils::getShippingTimeFrontendView($Product->getId())}
value=$TemplateCologneUtils::getShippingTimeFrontendView($Product->getId())}
{if $ShippingTimeFrontendView}
{$ShippingTimeFrontendView->create()}
{/if}
{assign var=StockFrontendView value=\QUI\TemplateCologne\Utils::getStockFrontendView($Product->getId())}
{assign var=StockFrontendView value=$TemplateCologneUtils::getStockFrontendView($Product->getId())}
{if $StockFrontendView}
{$StockFrontendView->create()}
{/if}
......
quiqqer/products/src/QUI/ERP/Products/Controls/Products/ProductVariant.html
+ 2
− 2
Zeige Datei @ 11b31bfb
......@@ -52,12 +52,12 @@
{/foreach}
{assign var=ShippingTimeFrontendView
value=\QUI\TemplateCologne\Utils::getShippingTimeFrontendView($Product->getId())}
value=$TemplateCologneUtils::getShippingTimeFrontendView($Product->getId())}
{if $ShippingTimeFrontendView}
{$ShippingTimeFrontendView->create()}
{/if}
{assign var=StockFrontendView value=\QUI\TemplateCologne\Utils::getStockFrontendView($Product->getId())}
{assign var=StockFrontendView value=$TemplateCologneUtils::getStockFrontendView($Product->getId())}
{if $StockFrontendView}
{$StockFrontendView->create()}
{/if}
......
template/page.html
+ 2
− 2
Zeige Datei @ 11b31bfb
......@@ -25,7 +25,7 @@
{assign var=brickNoPadding value="brick-no-spacing"}
{/if}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-headerSuffix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-container template-grid-row {$brickFullWidth} {$brickNoPadding}">
......@@ -54,7 +54,7 @@
{assign var=brickNoPadding value="brick-no-spacing"}
{/if}
{assign var=classes value=\QUI\TemplateCologne\Utils::convertBrickCSSClass($Brick->getAttribute('classes'))}
{assign var=classes value=$TemplateCologneUtils::convertBrickCSSClass($Brick->getAttribute('classes'))}
<section class="template-brick-container template-brick-footerPrefix brick-id-{$Brick->getAttribute('id')} {$classes}">
<div class="template-grid-container template-grid-row {$brickFullWidth} {$brickNoPadding}">
......
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