Merge branch 'dev'

88a600fa · Michael Danielczok · ad8eb947 · 7f9871be · 88a600fa · 88a600fa
Commit 88a600fa erstellt 2 years ago von Michael Danielczok
--- a/bin/css/style.css
+++ b/bin/css/style.css
@@ -1621,6 +1621,13 @@ a.toTop:before {
    width: 100%;
 }

+/*************************/
+/* Passwort reset window */
+/*************************/
+.qui-controls-user-password-quiWindow .qui-window-popup-title {
+    display: none;
+}
+
 /** Product Children Slider (horizontal)
 ===================================== */
 /* @todo das muss noch geprüft werden - nicht alle Regeln werden benötigt */

--- a/index.html
+++ b/index.html
 <!doctype html>
 <html itemscope itemtype="{$Site->getAttribute('meta.itemscope')}" lang="{$Project->getLang()}">
 <head>
+    {template_event name="quiqqer::template::header::begin" Template=$Template}
    {template_event name="quiqqer::template-cologne::header::begin" Template=$Template}
    <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1"/>

@@ -28,8 +29,10 @@
    {template_event name="quiqqer::template-cologne::header::afterSettingsCSS" Template=$Template}

    {template_event name="quiqqer::template-cologne::header::end" Template=$Template}
+    {template_event name="quiqqer::template::header::end" Template=$Template}
 </head>
 <body class="page-{$Site->getId()} {$typeClass} {$siteType} {$minimalDesignClass} {$pageCustomClass}">
+{template_event name="quiqqer::template::body::begin" Template=$Template}
 {template_event name="quiqqer::template-cologne::body::begin" Template=$Template}

 {if $useSlideOutMenu}
@@ -85,5 +88,6 @@
 </div>
 {/if}
 {template_event name="quiqqer::template-cologne::body::end" Template=$Template}
+{template_event name="quiqqer::template::body::end" Template=$Template}
 </body>
 </html>
--- a/index.php
+++ b/index.php
@@ -59,7 +59,9 @@
 $logoWidth  = false;

 try {
-    $logoWidth = $Logo->getResizeSize(false, $logoHeight)['width'];
+    if ($Logo) {
+        $logoWidth = $Logo->getResizeSize(false, $logoHeight)['width'];
+    }
 } catch (QUI\Exception $Exception) {
    QUI\System\Log::addNotice($Exception->getMessage());
 }

--- a/src/QUI/TemplateCologne/Controls/Menu/Categories.php
+++ b/src/QUI/TemplateCologne/Controls/Menu/Categories.php
@@ -78,11 +78,17 @@ public function getBody()
        } catch (QUI\Exception $Exception) {
        }

+        $showBasketButton = $this->getAttribute('showBasketButton');
+
+        if (!QUI::getPackageManager()->isInstalled('quiqqer/order')) {
+            $showBasketButton = false;
+        }
+
        $Engine->assign([
            'menuFile'         => $this->getAttribute('menuFile'),
            'this'             => $this,
            'showDescFor'      => $this->getAttribute('showDescFor'),
-            'showBasketButton' => $this->getAttribute('showBasketButton'),
+            'showBasketButton' => $showBasketButton,
            'Site'             => $Site,
            'Project'          => $Project
        ]);