From 6d418bc4efdadb2c4cfa4db045603eb77a97e7c3 Mon Sep 17 00:00:00 2001 From: akarl Date: Fri, 24 Jan 2020 15:29:07 +0100 Subject: [PATCH] =?UTF-8?q?Abschluss=20Header=20(exklusive=20mobiles=20Des?= =?UTF-8?q?ign)=20Beginn=20=C3=9Cberarbeitung=20Footer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_public/src/less/_modules/footer.less | 16 +- .../_public/src/less/_modules/header.less | 6 +- .../src/less/_variables/variables.less | 4 +- frontend/index/footer.tpl | 80 ++--- frontend/index/index.tpl | 286 ++++++++++++++++++ frontend/plugins/advanced_menu/index.tpl | 16 +- 6 files changed, 360 insertions(+), 48 deletions(-) create mode 100644 frontend/index/index.tpl diff --git a/frontend/_public/src/less/_modules/footer.less b/frontend/_public/src/less/_modules/footer.less index 225794b..2e65379 100644 --- a/frontend/_public/src/less/_modules/footer.less +++ b/frontend/_public/src/less/_modules/footer.less @@ -5,9 +5,21 @@ @media screen and (min-width: 48em) { - .footer-main { + .footer--top-wrapper { background: @brand-footer; - } + .container { + background: @brand-footer; + color: #fff; + a, .column--headline { + color: #fff; } } } + .footer--bottom-wrapper { + border-top: 2px solid #fff; + background: @brand-payment; + .container { + background: @brand-payment; + color: #fff; + a, .column--headline { + color: #fff; } } } .footer-main .footer--column { width: 33%; diff --git a/frontend/_public/src/less/_modules/header.less b/frontend/_public/src/less/_modules/header.less index 2d8215c..d9f44d8 100644 --- a/frontend/_public/src/less/_modules/header.less +++ b/frontend/_public/src/less/_modules/header.less @@ -175,9 +175,11 @@ .is--active .navigation--link, .is--hovered .navigation--link, .is--active .navigation--link:hover { - background-image: linear-gradient(to bottom, #fff 0%, #fff 40%, @brand-primary 80%, @brand-primary 100%)!important; + background: #fff; font-weight: 700; - color: #fff } } + color: @link-red; + .wbn-icon-set:before { + color: @link-red; } } } .advanced-menu { border-top: 1px solid #12428e; diff --git a/frontend/_public/src/less/_variables/variables.less b/frontend/_public/src/less/_variables/variables.less index c36ad83..80e717e 100644 --- a/frontend/_public/src/less/_variables/variables.less +++ b/frontend/_public/src/less/_variables/variables.less @@ -1,5 +1,7 @@ /* *** COLORS ******************************************************************************************************* */ -@brand-footer: #1D4788; +@brand-footer : #1D4788; @brand-payment: #1A3764; +@link-red : #D9400B; + diff --git a/frontend/index/footer.tpl b/frontend/index/footer.tpl index c1270eb..dc6bcf2 100644 --- a/frontend/index/footer.tpl +++ b/frontend/index/footer.tpl @@ -1,47 +1,55 @@ {* Footer menu *} {block name='frontend_index_footer_menu'} -
- {include file='frontend/index/footer-navigation.tpl'} +
+
+
+ {include file='frontend/index/footer-navigation.tpl'} +
+
{/block} {* Copyright in the footer *} {block name='frontend_index_footer_copyright'} -
+
+
+
- {* Vat info *} - {block name='frontend_index_footer_vatinfo'} -
-

- {if $sOutputNet} - {s name='FooterInfoExcludeVat' namespace="frontend/index/footer"}{/s} - {else} - {s name='FooterInfoIncludeVat' namespace="frontend/index/footer"}{/s} - {/if} -

+ {* Vat info *} + {block name='frontend_index_footer_vatinfo'} +
+

+ {if $sOutputNet} + {s name='FooterInfoExcludeVat' namespace="frontend/index/footer"}{/s} + {else} + {s name='FooterInfoIncludeVat' namespace="frontend/index/footer"}{/s} + {/if} +

+
+ {/block} + + {block name='frontend_index_footer_minimal'} + {include file="frontend/index/footer_minimal.tpl" hideCopyrightNotice=true} + {/block} + + {* Shopware footer *} + {block name="frontend_index_shopware_footer"} + + {* Copyright *} + {block name="frontend_index_shopware_footer_copyright"} +
+ {s name="IndexCopyright"}{/s} +
+ {/block} + + {* Logo *} + {block name="frontend_index_shopware_footer_logo"} + + {/block} + {/block}
- {/block} - - {block name='frontend_index_footer_minimal'} - {include file="frontend/index/footer_minimal.tpl" hideCopyrightNotice=true} - {/block} - - {* Shopware footer *} - {block name="frontend_index_shopware_footer"} - - {* Copyright *} - {block name="frontend_index_shopware_footer_copyright"} -
- {s name="IndexCopyright"}{/s} -
- {/block} - - {* Logo *} - {block name="frontend_index_shopware_footer_logo"} - - {/block} - {/block} +
{/block} diff --git a/frontend/index/index.tpl b/frontend/index/index.tpl new file mode 100644 index 0000000..04a1550 --- /dev/null +++ b/frontend/index/index.tpl @@ -0,0 +1,286 @@ +{block name="frontend_index_start"}{/block} +{block name="frontend_index_doctype"} + +{/block} + +{block name='frontend_index_html'} + +{/block} + +{block name='frontend_index_header'} + {include file='frontend/index/header.tpl'} +{/block} + + + + {block name='frontend_index_after_body'}{/block} + + {block name="frontend_index_page_wrap"} +
+ + {* Message if javascript is disabled *} + {block name="frontend_index_no_script_message"} + + {/block} + + {block name='frontend_index_before_page'}{/block} + + {* Shop header *} + {block name='frontend_index_navigation'} +
+ {* Include the top bar navigation *} + {block name='frontend_index_top_bar_container'} + {include file="frontend/index/topbar-navigation.tpl"} + {/block} + + {block name='frontend_index_header_navigation'} +
+ + {* Logo container *} + {block name='frontend_index_logo_container'} + {include file="frontend/index/logo-container.tpl"} + {/block} + + {* Shop navigation *} + {block name='frontend_index_shop_navigation'} + {include file="frontend/index/shop-navigation.tpl"} + {/block} + + {block name='frontend_index_container_ajax_cart'} +
+ {/block} +
+ {/block} +
+ + {* Maincategories navigation top *} + {block name='frontend_index_navigation_categories_top'} + + {/block} + {/block} + + {block name='frontend_index_emotion_loading_overlay'} + {if $hasEmotion} +
+ +
+ {/if} + {/block} + + {block name='frontend_index_content_main'} +
+ + {* Breadcrumb *} + {block name='frontend_index_breadcrumb'} + {if count($sBreadcrumb)} + + {/if} + {/block} + + {* Content top container *} + {block name="frontend_index_content_top"}{/block} + +
+ + {* Cookie consent manager*} + {block name='frontend_index_cookie_consent_manager'} + {include file='frontend/index/cookie_consent.tpl'} + {/block} + + {* Sidebar left *} + {block name='frontend_index_content_left'} + {include file='frontend/index/sidebar.tpl'} + {/block} + + {* Main content *} + {block name='frontend_index_content_wrapper'} +
+ {block name='frontend_index_content'}{/block} +
+ {/block} + + {* Sidebar right *} + {block name='frontend_index_content_right'}{/block} + + {* Last seen products *} + {block name='frontend_index_left_last_articles'} + {if $sLastArticlesShow && !$isEmotionLandingPage} + {* Last seen products *} +
+
+ {s namespace="frontend/plugins/index/viewlast" name='WidgetsRecentlyViewedHeadline'}{/s} +
+
+
+
+
+ {/if} + {/block} +
+
+ {/block} + + {* Footer *} + {block name="frontend_index_footer"} +
+
+ Bilder +
+ {block name="frontend_index_footer_container"} + {include file='frontend/index/footer.tpl'} + {/block} +
+ {/block} + + {block name='frontend_index_body_inline'}{/block} +
+ {/block} + + {* If required add the cookiePermission hint *} + {block name='frontend_index_cookie_permission'} + {if {config name="show_cookie_note"}} + {include file="frontend/_includes/cookie_permission_note.tpl"} + {/if} + {/block} + + {block name="frontend_index_header_javascript"} + {$controllerData = [ + 'vat_check_enabled' => {config name='vatcheckendabled'}, + 'vat_check_required' => {config name='vatcheckrequired'}, + 'register' => {url controller="register"}, + 'checkout' => {url controller="checkout"}, + 'ajax_search' => {url controller="ajax_search" _seo=false}, + 'ajax_cart' => {url controller='checkout' action='ajaxCart' _seo=false}, + 'ajax_validate' => {url controller="register" _seo=false}, + 'ajax_add_article' => {url controller="checkout" action="addArticle" _seo=false}, + 'ajax_listing' => {url module="widgets" controller="listing" action="listingCount" _seo=false}, + 'ajax_cart_refresh' => {url controller="checkout" action="ajaxAmount" _seo=false}, + 'ajax_address_selection' => {url controller="address" action="ajaxSelection" fullPath _seo=false}, + 'ajax_address_editor' => {url controller="address" action="ajaxEditor" fullPath _seo=false} + ]} + + {$themeConfig = [ + 'offcanvasOverlayPage' => $theme.offcanvasOverlayPage + ]} + + {$lastSeenProductsKeys = []} + {foreach $sLastArticlesConfig as $key => $value} + {$lastSeenProductsKeys[$key] = $value} + {/foreach} + + {$lastSeenProductsConfig = [ + 'baseUrl' => $Shop->getBaseUrl(), + 'shopId' => $Shop->getId(), + 'noPicture' => {link file="frontend/_public/src/img/no-picture.jpg"}, + 'productLimit' => {"{config name=lastarticlestoshow}"|floor}, + 'currentArticle' => "" + ]} + + {if $sArticle} + {$lastSeenProductsConfig.currentArticle = $sLastArticlesConfig} + {$lastSeenProductsConfig.currentArticle.articleId = $sArticle.articleID} + {$lastSeenProductsConfig.currentArticle.linkDetailsRewritten = $sArticle.linkDetailsRewrited} + {$lastSeenProductsConfig.currentArticle.articleName = $sArticle.articleName} + {if $sArticle.additionaltext} + {$lastSeenProductsConfig.currentArticle.articleName = $lastSeenProductsConfig.currentArticle.articleName|cat:' ':$sArticle.additionaltext} + {/if} + {$lastSeenProductsConfig.currentArticle.imageTitle = $sArticle.image.description} + {$lastSeenProductsConfig.currentArticle.images = []} + + {foreach $sArticle.image.thumbnails as $key => $image} + {$lastSeenProductsConfig.currentArticle.images[$key] = [ + 'source' => $image.source, + 'retinaSource' => $image.retinaSource, + 'sourceSet' => $image.sourceSet + ]} + {/foreach} + {/if} + + {$csrfConfig = [ + 'generateUrl' => {url controller="csrftoken" fullPath=false}, + 'basePath' => {$Shop->getBasePath()|cat:'/'}, + 'shopId' => $Shop->getId() + ]} + + {if {config name="shareSessionBetweenLanguageShops"} && $Shop->getMain()} + {$csrfConfig['shopId'] = $Shop->getMain()->getId()} + {/if} + + {* let the user modify the data here *} + {block name="frontend_index_header_javascript_data"}{/block} + + + + {include file="frontend/index/datepicker-config.tpl"} + + {if $theme.additionalJsLibraries} + {$theme.additionalJsLibraries} + {/if} + {/block} + + {block name="frontend_index_header_javascript_jquery"} + {* Add the partner statistics widget, if configured *} + {if !{config name=disableShopwareStatistics} } + {include file='widgets/index/statistic_include.tpl'} + {/if} + {/block} + + {* Include jQuery and all other javascript files at the bottom of the page *} + {block name="frontend_index_header_javascript_jquery_lib"} + {compileJavascript timestamp={themeTimestamp} output="javascriptFiles"} + {foreach $javascriptFiles as $file} + {block name="frontend_index_header_javascript_jquery_lib_file"} + + {/block} + {/foreach} + {/block} + +{block name="frontend_index_javascript_async_ready"} + {include file="frontend/index/script-async-ready.tpl"} +{/block} + + + diff --git a/frontend/plugins/advanced_menu/index.tpl b/frontend/plugins/advanced_menu/index.tpl index f24e778..05dcbfb 100644 --- a/frontend/plugins/advanced_menu/index.tpl +++ b/frontend/plugins/advanced_menu/index.tpl @@ -1,11 +1,15 @@ +{debug} + +{$category|@print_r} + {function name="categories_top" level=0} {$columnIndex = 0} {$menuSizePercentage = 100 - (25 * $columnAmount * intval($hasTeaser))} {$columnCount = 4 - ($columnAmount * intval($hasTeaser))} - {*