Revisionen vergleichen

Henning Leutz · Michael Danielczok · Michael Danielczok · Michael Danielczok · Michael Danielczok · Michael Danielczok
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+include:
+  - project: 'quiqqer/stabilization/semantic-release'
+    file: '/ci-templates/.gitlab-ci.yml'
--- a/bin/css/style.css
+++ b/bin/css/style.css
@@ -789,6 +789,16 @@ h1.page-header-text-title {

 /* mobile menu */

+.megaMenu-hide-on-desktop {
+    display: flex;
+}
+
+.megaMenu-hide-on-desktop .quiqqer-menu-megaMenu-mobile {
+    display: flex;
+    align-items: center;
+    margin-left: auto;
+}
+
 .quiqqer-menu-megaMenu-mobile-search {
    float: right;
    display: none;

--- a/bin/init.js
+++ b/bin/init.js
@@ -17,16 +17,26 @@ window.addEvent("domready", function () {
         * social share buttons
         */
        if (social) {
-            var SlideOutElm = document.getElement(
+            let SlideOutElm = document.getElement(
                '[data-qui="package/quiqqer/menu/bin/SlideOut"]'
            );

-            Controls.getControlByElement(SlideOutElm).then(function () {
-                new Element('div', {
-                    'class': 'mobile-bar-social hide-on-desktop',
-                    html   : socialHTML
-                }).inject(SlideOutElm);
-            });
+            if (!SlideOutElm) {
+                SlideOutElm = document.getElement(
+                    '[data-qui="package/quiqqer/menu/bin/SlideoutAdvanced"]'
+                );
+            }
+
+            if (SlideOutElm) {
+                Controls.getControlByElement(SlideOutElm).then(function() {
+                    new Element('div', {
+                        'class': 'mobile-bar-social hide-on-desktop',
+                        html: socialHTML
+                    }).inject(SlideOutElm);
+                }).catch((err) => {
+                    console.error(err);
+                });
+            }
        }
    });


--- a/composer.json
+++ b/composer.json
@@ -26,8 +26,6 @@
        "quiqqer\/utils": ">=1.7|dev-master|dev-dev",
        "quiqqer\/page-transition": "1.*|dev-master|dev-dev",
        "quiqqer\/pace": ">=1.2.0|dev-master|dev-dev",
-        "quiqqer\/buttons": ">=1.0.0|dev-master|dev-dev",
-        "quiqqer\/smarty3": ">=1.10.0|dev-master"
    },
    "autoload": {
        "psr-4": {

--- 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-businessPro::header::begin" Template=$Template}
    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1,maximum-scale=1"/>

@@ -15,16 +16,26 @@
    </script>

    {fetch template="template/head/styles.html" Template=$Template}
+    {template_event name="quiqqer::template::header::afterCSSStyles" Template=$Template}
    {template_event name="quiqqer::template-businessPro::header::afterCSSStyles" Template=$Template}

    {$settingsCSS}
+    {template_event name="quiqqer::template::header::afterSettingsCSS" Template=$Template}
    {template_event name="quiqqer::template-businessPro::header::afterSettingsCSS" Template=$Template}

+    {template_event name="quiqqer::template::header::end" Template=$Template}
    {template_event name="quiqqer::template-businessPro::header::end" Template=$Template}
 </head>
 <body class="{$bodyClass} page-{$Site->getId()} {$typeClass}" id="body-top">
+{template_event name="quiqqer::template::body::begin" Template=$Template}
 {template_event name="quiqqer::template-businessPro::body::begin" Template=$Template}

+{if $useSlideOutMenu}
+<div class="slideout-panel">
+{/if}
+
+{template_event name="quiqqer::template::body::beforeMenu" Template=$Template}
+
 {* main navigation / menu *}
 {fetch template="template/menu.html"
    Project=$Project
@@ -32,6 +43,7 @@
    Template=$Template
 }

+{template_event name="quiqqer::template::body::afterMenu" Template=$Template}
 {template_event name="quiqqer::template-businessPro::body::afterMenu" Template=$Template}

 {fetch template="template/page.html"
@@ -43,10 +55,15 @@
    Breadcrumb=$Breadcrumb
 }

+{if $useSlideOutMenu}
+</div>
+{/if}
+
 {* javascript *}
 {fetch template="template/scripts.html" Template=$Template URL_OPT_DIR=$URL_OPT_DIR}

 {template_event name="quiqqer::template-businessPro::body::end" Template=$Template}
+{template_event name="quiqqer::template::body::end" Template=$Template}

 </body>
 </html>
--- a/index.php
+++ b/index.php
 <?php

 $Locale = QUI::getLocale();
-$lang   = $Project->getLang();
+$lang = $Project->getLang();

 /**
 * Emotion
@@ -9,7 +9,8 @@
 QUI\Utils\Site::setRecursiveAttribute($Site, 'image_emotion');

 // Content behavior
-if ($Site->getAttribute('templateBusinessPro.showTitle') ||
+if (
+    $Site->getAttribute('templateBusinessPro.showTitle') ||
    $Site->getAttribute('templateBusinessPro.showShort')
 ) {
    $Template->setAttribute('content-header', false);
@@ -18,14 +19,16 @@
 /**
 * search
 */
-$search     = '';
-$dataQui    = '';
-$noSearch   = 'no-search';
+$search = '';
+$dataQui = '';
+$noSearch = 'no-search';
 $searchType = false;

 /* search setting is on? template header allowed? */
-if ($Project->getConfig('templateBusinessPro.settings.search') != 'hide'
-    && $Template->getAttribute('template-header')) {
+if (
+    $Project->getConfig('templateBusinessPro.settings.search') != 'hide'
+    && $Template->getAttribute('template-header')
+) {
    $noSearch = '';

    $types = [
@@ -46,16 +49,18 @@
    $searchSites = $Project->getSites([
        'where' => [
            'type' => [
-                'type'  => 'IN',
+                'type' => 'IN',
                'value' => $types
            ]
        ],
        'limit' => 1
    ]);

+    $lg = 'quiqqer/template-businesspro';
+
    if (count($searchSites)) {
        try {
-            $searchUrl  = $searchSites[0]->getUrlRewritten();
+            $searchUrl = $searchSites[0]->getUrlRewritten();
            $searchForm = '';

            switch ($Project->getConfig('templateBusinessPro.settings.search')) {
@@ -66,7 +71,8 @@
                    $searchForm .= '<form  action="' . $searchUrl . '" class="header-bar-suggestSearch hide-on-mobile" ';
                    $searchForm .= 'method="get" style="position: relative; right: auto; float: right;">';
                    $searchForm .= '<input type="search" name="search" class="only-input" ' . $dataQui . ' ';
-                    $searchForm .= 'placeholder="' . $Locale->get('quiqqer/template-businesspro', 'navbar.search.text') . '" /></form>';
+                    $searchForm .= 'placeholder="' . $Locale->get($lg, 'navbar.search.text') . '" />';
+                    $searchForm .= '</form>';
                    break;

                case 'inputAndIcon':
@@ -76,7 +82,7 @@
                    $searchForm .= '<form  action="' . $searchUrl . '" class="header-bar-suggestSearch hide-on-mobile" method="get">';
                    $searchForm .= '<div class="header-bar-suggestSearch-wrapper">';
                    $searchForm .= '<input type="search" name="search" class="input-and-icon" ' . $dataQui . ' ';
-                    $searchForm .= 'placeholder="' . $Locale->get('quiqqer/template-businesspro', 'navbar.search.text') . '" />';
+                    $searchForm .= 'placeholder="' . $Locale->get($lg, 'navbar.search.text') . '" />';
                    $searchForm .= '</div><span class="fa fa-fw fa-search"></span></form>';
                    break;

@@ -87,7 +93,7 @@
                    $searchForm .= '<form action="' . $searchUrl . '" ';
                    $searchForm .= 'class="header-bar-suggestSearch header-bar-suggestSearch-inputAndIconVisible hide-on-mobile" method="get">';
                    $searchForm .= '<input type="search" name="search" class="input-inputAndIconVisible" ' . $dataQui . ' ';
-                    $searchForm .= 'placeholder="' . $Locale->get('quiqqer/template-businesspro', 'navbar.search.text') . '" />';
+                    $searchForm .= 'placeholder="' . $Locale->get($lg, 'navbar.search.text') . '" />';
                    $searchForm .= '<span class="fa fa-fw fa-search"></span></form>';
                    break;
            }
@@ -104,16 +110,17 @@
 }

 // social
-$social          = 'false';
-$socialNav       = '';
-$socialFooter    = '';
+$social = 'false';
+$socialNav = '';
+$socialFooter = '';
 $socialMobileNav = '';

-if (($Project->getConfig('templateBusinessPro.settings.social.show.nav')
+if (
+    ($Project->getConfig('templateBusinessPro.settings.social.show.nav')
        || $Project->getConfig('templateBusinessPro.settings.social.show.footer'))
    && ($Template->getAttribute('template-footer') || $Template->getAttribute('template-header'))
 ) {
-    $social     = 'true';
+    $social = 'true';
    $socialHTML = '';

    // check which socials should be displayed
@@ -149,8 +156,10 @@
    }

    // prepare social for nav
-    if ($Project->getConfig('templateBusinessPro.settings.social.show.nav')
-        && $Template->getAttribute('template-header')) {
+    if (
+        $Project->getConfig('templateBusinessPro.settings.social.show.nav')
+        && $Template->getAttribute('template-header')
+    ) {
        $socialNav .= '<div class="header-bar-social hide-on-mobile ' . $noSearch . $searchType . '">';
        $socialNav .= $socialHTML;
        $socialNav .= '</div>';
@@ -161,8 +170,10 @@
    }

    // prepare social for footer
-    if ($Project->getConfig('templateBusinessPro.settings.social.show.footer')
-        && $Template->getAttribute('template-footer')) {
+    if (
+        $Project->getConfig('templateBusinessPro.settings.social.show.footer')
+        && $Template->getAttribute('template-footer')
+    ) {
        $socialFooter .= '<div class="footer-bar-social">';
        $socialFooter .= $socialHTML;
        $socialFooter .= '</div>';
@@ -189,12 +200,12 @@

    /* Logo in menu */
    $imgTitle = $Project->get(1)->getAttribute('title');
-    $imgAlt   = '';
-    $logoUrl  = $Project->getMedia()->getPlaceholder();
+    $imgAlt = '';
+    $logoUrl = $Project->getMedia()->getPlaceholder();

    if ($Project->getMedia()->getLogoImage()) {
-        $Logo        = $Project->getMedia()->getLogoImage();
-        $logoUrl     = $Logo->getSizeCacheUrl(400, 300);
+        $Logo = $Project->getMedia()->getLogoImage();
+        $logoUrl = $Logo->getSizeCacheUrl(400, 300);
        $imgAltArray = json_decode($Logo->getAttribute('title'), true);

        if (isset($imgTitleArray[$lang])) {
@@ -222,8 +233,8 @@
 * Template config
 */
 $templateSettings = QUI\TemplateBusinessPro\Utils::getConfig([
-    'Project'  => $Project,
-    'Site'     => $Site,
+    'Project' => $Project,
+    'Site' => $Site,
    'Template' => $Template
 ]);

@@ -256,13 +267,13 @@
        break;
 }

-$templateSettings['BricksManager']   = QUI\Bricks\Manager::init();
-$templateSettings['Breadcrumb']      = $Breadcrumb;
-$templateSettings['MegaMenu']        = $MegaMenu;
-$templateSettings['bodyClass']       = $bodyClass;
-$templateSettings['startPage']       = $startPage;
-$templateSettings['searchType']      = $searchType;
-$templateSettings['social']          = $social;
+$templateSettings['BricksManager'] = QUI\Bricks\Manager::init();
+$templateSettings['Breadcrumb'] = $Breadcrumb;
+$templateSettings['MegaMenu'] = $MegaMenu;
+$templateSettings['bodyClass'] = $bodyClass;
+$templateSettings['startPage'] = $startPage;
+$templateSettings['searchType'] = $searchType;
+$templateSettings['social'] = $social;
 $templateSettings['socialMobileNav'] = $socialMobileNav;

 $Engine->assign($templateSettings);
--- a/src/QUI/TemplateBusinessPro/EventHandler.php
+++ b/src/QUI/TemplateBusinessPro/EventHandler.php
 <?php
+
 /**
 * This file contains \QUI\TemplateBusinessPro\EventHandler
 */
@@ -19,7 +20,7 @@ class EventHandler
     *
     * @return void
     */
-    public static function onProjectConfigSave()
+    public static function onProjectConfigSave(): void
    {
        QUI\Cache\Manager::clear('quiqqer/templateBusinessPro');
    }
@@ -31,13 +32,13 @@ public static function onProjectConfigSave()
     * @return void
     * @throws QUI\Exception
     */
-    public static function onSiteSave($Site)
+    public static function onSiteSave(QUI\Interfaces\Projects\Site $Site): void
    {
-        $Project   = $Site->getProject();
-        $cacheName = md5($Project->getName().$Project->getLang().$Site->getId());
+        $Project = $Site->getProject();
+        $cacheName = md5($Project->getName() . $Project->getLang() . $Site->getId());

        try {
-            QUI\Cache\Manager::clear('quiqqer/templateBusinessPro'.$cacheName);
+            QUI\Cache\Manager::clear('quiqqer/templateBusinessPro' . $cacheName);
        } catch (QUI\Exception $Exception) {
            QUI\System\Log::writeException($Exception);
        }

--- a/src/QUI/TemplateBusinessPro/Utils.php
+++ b/src/QUI/TemplateBusinessPro/Utils.php
@@ -24,11 +24,11 @@ class Utils
     */
    public static function getConfig($params)
    {
-        $cacheName = md5($params['Project']->getName().$params['Project']->getLang().$params['Site']->getId());
+        $cacheName = md5($params['Project']->getName() . $params['Project']->getLang() . $params['Site']->getId());

        try {
            return QUI\Cache\Manager::get(
-                'quiqqer/templateBusinessPro/'.$cacheName
+                'quiqqer/templateBusinessPro/' . $cacheName
            );
        } catch (QUI\Exception $Exception) {
        }
@@ -36,7 +36,7 @@ public static function getConfig($params)
        $config = [];

        /* @var $Project QUI\Projects\Project */
-        $Project  = $params['Project'];
+        $Project = $params['Project'];
        $Template = $params['Template'];

        /**
@@ -47,27 +47,27 @@ public static function getConfig($params)
         * own site type
         */

-        $showHeader     = false;
+        $showHeader = false;
        $showBreadcrumb = false;

        switch ($Template->getLayoutType()) {
            case 'layout/startPage':
-                $showHeader     = $Project->getConfig('templateBusinessPro.settings.showHeaderStartPage');
+                $showHeader = $Project->getConfig('templateBusinessPro.settings.showHeaderStartPage');
                $showBreadcrumb = $Project->getConfig('templateBusinessPro.settings.showBreadcrumbStartPage');
                break;

            case 'layout/noSidebar':
-                $showHeader     = $Project->getConfig('templateBusinessPro.settings.showHeaderNoSidebar');
+                $showHeader = $Project->getConfig('templateBusinessPro.settings.showHeaderNoSidebar');
                $showBreadcrumb = $Project->getConfig('templateBusinessPro.settings.showBreadcrumbNoSidebar');
                break;

            case 'layout/rightSidebar':
-                $showHeader     = $Project->getConfig('templateBusinessPro.settings.showHeaderRightSidebar');
+                $showHeader = $Project->getConfig('templateBusinessPro.settings.showHeaderRightSidebar');
                $showBreadcrumb = $Project->getConfig('templateBusinessPro.settings.showBreadcrumbRightSidebar');
                break;

            case 'layout/leftSidebar':
-                $showHeader     = $Project->getConfig('templateBusinessPro.settings.showHeaderLeftSidebar');
+                $showHeader = $Project->getConfig('templateBusinessPro.settings.showHeaderLeftSidebar');
                $showBreadcrumb = $Project->getConfig('templateBusinessPro.settings.showBreadcrumbLeftSidebar');
                break;
        }
@@ -97,19 +97,20 @@ public static function getConfig($params)
        $settingsCSS = include 'settings.css.php';

        $config += [
-            'quiTplType'     => $Project->getConfig('templateBusinessPro.settings.standardType'),
-            'showHeader'     => $showHeader,
+            'quiTplType' => $Project->getConfig('templateBusinessPro.settings.standardType'),
+            'showHeader' => $showHeader,
            'showBreadcrumb' => $showBreadcrumb,
-            'settingsCSS'    => '<style data-no-cache="1">'.$settingsCSS.'</style>',
-            'typeClass'      => 'type-'.str_replace(['/', ':'], '-', $params['Site']->getAttribute('type')),
-            'showPageTitle'  => $showPageTitle,
-            'showPageShort'  => $showPageShort,
-            'themeColor'     => $themeColor
+            'settingsCSS' => '<style data-no-cache="1">' . $settingsCSS . '</style>',
+            'typeClass' => 'type-' . str_replace(['/', ':'], '-', $params['Site']->getAttribute('type')),
+            'showPageTitle' => $showPageTitle,
+            'showPageShort' => $showPageShort,
+            'themeColor' => $themeColor,
+            'useSlideOutMenu' => true, // for now is always true because quiqqer use currently only SlideOut nav
        ];

        // set cache
        QUI\Cache\Manager::set(
-            'quiqqer/templateBusinessPro/'.$cacheName,
+            'quiqqer/templateBusinessPro/' . $cacheName,
            $config
        );
No results found