First upload

2025-02-02 13:37:56 +01:00
commit 8d227c9191
3281 changed files with 362319 additions and 0 deletions
--- a/shop/source/Application/views/flow/tpl/widget/address/billing_address.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/address/billing_address.tpl
@@ -0,0 +1,13 @@
+[{if $oxcmp_user->oxuser__oxcompany->value}] [{$oxcmp_user->oxuser__oxcompany->value}]<br> [{/if}]
+[{if $oxcmp_user->oxuser__oxaddinfo->value}] [{$oxcmp_user->oxuser__oxaddinfo->value}]<br>[{/if}]
+[{if $oxcmp_user->oxuser__oxustid->value}] [{oxmultilang ident="VAT_ID_NUMBER"}] [{$oxcmp_user->oxuser__oxustid->value}]<br> [{/if}]
+[{if $oxcmp_user->oxuser__oxsal->value || $oxcmp_user->oxuser__oxfname->value || $oxcmp_user->oxuser__oxlname->value}][{$oxcmp_user->oxuser__oxsal->value|oxmultilangsal}]&nbsp;[{$oxcmp_user->oxuser__oxfname->value}]&nbsp;[{$oxcmp_user->oxuser__oxlname->value}]<br>[{/if}]
+[{if $oxcmp_user->oxuser__oxstreet->value || $oxcmp_user->oxuser__oxstreetnr->value}][{$oxcmp_user->oxuser__oxstreet->value}]&nbsp;[{$oxcmp_user->oxuser__oxstreetnr->value}]<br>[{/if}]
+[{if $oxcmp_user->oxuser__oxstateid->value}][{$oxcmp_user->oxuser__oxstateid->value}] [{/if}]
+[{if $oxcmp_user->oxuser__oxzip->value || $oxcmp_user->oxuser__oxcity->value}][{$oxcmp_user->oxuser__oxzip->value}]&nbsp;[{$oxcmp_user->oxuser__oxcity->value}]<br>[{/if}]
+[{if $oxcmp_user->oxuser__oxcountry->value}][{$oxcmp_user->oxuser__oxcountry->value}]<br><br>[{/if}]
+[{if $oxcmp_user->oxuser__oxusername->value}]<strong>[{oxmultilang ident="EMAIL"}]</strong> [{$oxcmp_user->oxuser__oxusername->value}]<br><br>[{/if}]
+[{if $oxcmp_user->oxuser__oxfon->value}]<strong>[{oxmultilang ident="PHONE"}]</strong> [{$oxcmp_user->oxuser__oxfon->value}]<br>[{/if}]
+[{if $oxcmp_user->oxuser__oxfax->value}]<strong>[{oxmultilang ident="FAX"}]</strong> [{$oxcmp_user->oxuser__oxfax->value}]<br>[{/if}]
+[{if $oxcmp_user->oxuser__oxmobfon->value}]<strong>[{oxmultilang ident="CELLUAR_PHONE"}]</strong> [{$oxcmp_user->oxuser__oxmobfon->value}]<br>[{/if}]
+[{if $oxcmp_user->oxuser__oxprivfon->value}]<strong>[{oxmultilang ident="PERSONAL_PHONE"}]</strong> [{$oxcmp_user->oxuser__oxprivfon->value}]<br>[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/address/shipping_address.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/address/shipping_address.tpl
@@ -0,0 +1,11 @@
+[{if $delivadr}]
+    [{if $delivadr->oxaddress__oxcompany->value}] <strong>[{$delivadr->oxaddress__oxcompany->value}]</strong><br>[{/if}]
+    [{if $delivadr->oxaddress__oxaddinfo->value}] [{$delivadr->oxaddress__oxaddinfo->value}]<br>[{/if}]
+    [{if $delivadr->oxaddress__oxsal->value || $delivadr->oxaddress__oxfname->value || $delivadr->oxaddress__oxlname->value}][{$delivadr->oxaddress__oxsal->value|oxmultilangsal}]&nbsp;[{$delivadr->oxaddress__oxfname->value}]&nbsp;[{$delivadr->oxaddress__oxlname->value}]<br>[{/if}]
+    [{if $delivadr->oxaddress__oxstreet->value || $delivadr->oxaddress__oxstreetnr->value}][{$delivadr->oxaddress__oxstreet->value}]&nbsp;[{$delivadr->oxaddress__oxstreetnr->value}]<br>[{/if}]
+    [{if $delivadr->oxaddress__oxstateid->value}][{$delivadr->oxaddress__oxstateid->value}] [{/if}]
+    [{if $delivadr->oxaddress__oxzip->value || $delivadr->oxaddress__oxcity->value}][{$delivadr->oxaddress__oxzip->value}]&nbsp;[{$delivadr->oxaddress__oxcity->value}]<br>[{/if}]
+    [{if $delivadr->oxaddress__oxcountry->value}][{$delivadr->oxaddress__oxcountry->value}]<br><br>[{/if}]
+    [{if $delivadr->oxaddress__oxfon->value}]<strong>[{oxmultilang ident="PHONE"}]</strong> [{$delivadr->oxaddress__oxfon->value}]<br>[{/if}]
+    [{if $delivadr->oxaddress__oxfax->value}]<strong>[{oxmultilang ident="FAX"}]</strong> [{$delivadr->oxaddress__oxfax->value}]<br>[{/if}]
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/breadcrumb.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/breadcrumb.tpl
@@ -0,0 +1,24 @@
+[{block name="dd_widget_breadcrumb"}]
+    [{strip}]
+        <div class="row">
+            <div class="col-xs-12">
+                [{block name="dd_widget_breadcrumb_list_inner"}]
+                    <ol id="breadcrumb" class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList">
+                        [{block name="dd_widget_breadcrumb_list"}]
+                            <li class="text-muted">[{oxmultilang ident="YOU_ARE_HERE"}]:</li>
+                            
+                            [{foreach from=$oView->getBreadCrumb() item="sCrum" name="breadcrumb"}]
+                                <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"[{if $smarty.foreach.breadcrumb.last}] class="active"[{/if}]>
+                                    <a href="[{if $sCrum.link}][{$sCrum.link}][{else}]#[{/if}]" title="[{$sCrum.title|escape:'html'}]" itemprop="item">
+                                        <span itemprop="name">[{$sCrum.title}]</span>
+                                    </a>
+                                    <meta itemprop="position" content="[{$smarty.foreach.breadcrumb.iteration}]" />
+                                </li>
+                            [{/foreach}]
+                        [{/block}]
+                    </ol>
+                [{/block}]
+            </div>
+        </div>
+    [{/strip}]
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/dynscript.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/dynscript.tpl
@@ -0,0 +1,216 @@
+[{oxscript}]
+
+[{assign var="oConfig" value=$oViewConf->getConfig()}]
+
+<script type="text/javascript">[{strip}]
+    var sBaseUrl = '[{$oViewConf->getSelfActionLink()}]';
+    var sActCl = '[{$oViewConf->getTopActiveClassName()}]';
+[{/strip}]</script>
+
+[{* Google Analytics Page Tracking *}]
+[{assign var="sGATrackingId" value=$oViewConf->getViewThemeParam('sGATrackingId')}]
+[{if $oViewConf->getViewThemeParam('blUseGAPageTracker') && $sGATrackingId}]
+    <script>
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+        ga('create', '[{$sGATrackingId}]');
+        [{* IP-Adressen anonymisieren *}]
+        [{if $oViewConf->getViewThemeParam('blGAAnonymizeIPs')}]
+            ga('set', 'anonymizeIp', true);
+        [{/if}]
+        ga('send', 'pageview');
+    </script>
+[{/if}]
+
+[{* Google Analytics eCommerce Tracking *}]
+[{if $oViewConf->getViewThemeParam('blUseGAEcommerceTracking') && $sGATrackingId && $oViewConf->getTopActiveClassName() == 'thankyou'}]
+    [{assign var="oOrder" value=$oView->getOrder()}]
+
+    [{if $oOrder}]
+        [{if !$oViewConf->getViewThemeParam('blUseGAPageTracker')}]
+            <script>
+                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+                })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+                ga('create', '[{$sGATrackingId}]');
+                [{* IP-Adressen anonymisieren *}]
+                [{if $oViewConf->getViewThemeParam('blGAAnonymizeIPs')}]
+                    ga('set', 'anonymizeIp', true);
+                [{/if}]
+            </script>
+        [{/if}]
+
+
+        <script>
+            ga( 'require', 'ecommerce' );
+
+            ga( 'ecommerce:addTransaction', {
+                'id': '[{$oOrder->oxorder__oxordernr->value}]',           // Transaction ID. Required.
+                'affiliation': '[{$oxcmp_shop->oxshops__oxname->value}]', // Affiliation or store name.
+                'revenue': '[{$oOrder->oxorder__oxtotalordersum->value}]', // Grand Total.
+                'shipping': '[{$oOrder->oxorder__oxdelcost->value}]',     // Shipping.
+                'tax': '[{math equation="x+y" x=$oOrder->oxorder__oxartvatprice1->value y=$oOrder->oxorder__oxartvatprice2->value}]' // Tax.
+            });
+
+            [{foreach from=$oOrder->getOrderArticles() item="oOrderArticle"}]
+                [{assign var="sArticleName" value=$oOrderArticle->oxorderarticles__oxtitle->value|cat:' '|cat:$oOrderArticle->oxorderarticles__oxselvariant->value}]
+                [{assign var="sCategoryName" value=""}]
+                [{assign var="oOrderArticlePrice" value=$oOrderArticle->getPrice()}]
+                [{assign var="oArticle" value=$oOrderArticle->getArticle()}]
+                [{if $oArticle}]
+                    [{assign var="oMainCategory" value=$oArticle->getCategory()}]
+                    [{if $oMainCategory}]
+                        [{assign var="sCategoryName" value=$oMainCategory->oxcategories__oxtitle->value}]
+                    [{/if}]
+                [{/if}]
+                ga( 'ecommerce:addItem', {
+                    'id': '[{$oOrder->oxorder__oxordernr->value}]',                     // Transaction ID. Required.
+                    'name': '[{$sArticleName|trim}]',                                   // Product name. Required.
+                    'sku': '[{$oOrderArticle->oxorderarticles__oxartnum->value}]',      // SKU/code.
+                    'category': '[{$sCategoryName}]',                                   // Category or variation.
+                    'price': '[{$oOrderArticlePrice->getBruttoPrice()}]',               // Unit price.
+                    'quantity': '[{$oOrderArticle->oxorderarticles__oxamount->value}]', // Quantity.
+                    'currency': '[{$oOrder->oxorder__oxcurrency->value}]'               // local currency code.
+                });
+            [{/foreach}]
+
+            ga('ecommerce:send' );
+        </script>
+    [{/if}]
+[{/if}]
+
+[{* Google zertifizierte Händler *}]
+[{if $oViewConf->getViewThemeParam('blUseGoogleTS')}]
+    [{assign var="sGoogleVendorId" value=$oViewConf->getViewThemeParam('sGoogleVendorId')}]
+    [{assign var="sGoogleShoppingAccountId" value=$oViewConf->getViewThemeParam('sGoogleShoppingAccountId')}]
+    [{assign var="sPageLanguage" value=$oViewConf->getViewThemeParam('sPageLanguage')}]
+    [{assign var="sShoppingCountry" value=$oViewConf->getViewThemeParam('sShoppingCountry')}]
+    [{assign var="sShoppingLanguage" value=$oViewConf->getViewThemeParam('sShoppingLanguage')}]
+
+    [{if $oViewConf->getTopActiveClassName() == 'details'}]
+        [{assign var="oArticle" value=$oView->getProduct()}]
+        [{assign var="sGoogleShoppingProductId" value=$oArticle->oxarticles__oxartnum->value}]
+    [{/if}]
+
+    [{if $sGoogleVendorId && $sPageLanguage}]
+        [{* Händler-Gütesiegelcode *}]
+        <script type="text/javascript">
+            var gts = gts || [];
+
+            gts.push(["id", "[{$sGoogleVendorId}]"]);
+            gts.push(["badge_position","BOTTOM_RIGHT"]);
+            gts.push(["locale", "[{$sPageLanguage|default:'de_DE'}]"]);
+            [{if $sGoogleShoppingAccountId}]
+                gts.push(["google_base_subaccount_id", "[{$sGoogleShoppingAccountId}]"]);
+                gts.push(["google_base_offer_id", "[{$sGoogleShoppingProductId}]"]);
+                [{if $sShoppingCountry}]
+                    gts.push(["google_base_country", "[{$sShoppingCountry|default:'DE'}]"]);
+                [{/if}]
+                [{if $sShoppingLanguage}]
+                    gts.push(["google_base_language", "[{$sShoppingLanguage|default:'de'}]"]);
+                [{/if}]
+            [{/if}]
+
+            (function() {
+                var gts = document.createElement("script");
+                gts.type = "text/javascript";
+                gts.async = true;
+                gts.src = "https://www.googlecommerce.com/trustedstores/api/js";
+                var s = document.getElementsByTagName("script")[0];
+                s.parentNode.insertBefore(gts, s);
+            })();
+        </script>
+
+        [{* Bestellbestätigungs-Modul *}]
+        [{if $oViewConf->getTopActiveClassName() == 'thankyou'}]
+            [{assign var="sShippingDaysOnStock"    value=$oViewConf->getViewThemeParam('sShippingDaysOnStock')}]
+            [{assign var="sShippingDaysNotOnStock" value=$oViewConf->getViewThemeParam('sShippingDaysNotOnStock')}]
+            [{assign var="sDeliveryDaysOnStock"    value=$oViewConf->getViewThemeParam('sDeliveryDaysOnStock')}]
+            [{assign var="sDeliveryDaysNotOnStock" value=$oViewConf->getViewThemeParam('sDeliveryDaysNotOnStock')}]
+
+            [{if $sShippingDaysOnStock && $sShippingDaysNotOnStock && $sDeliveryDaysOnStock && $sDeliveryDaysNotOnStock}]
+                [{if !$oOrder}]
+                    [{assign var="oOrder" value=$oView->getOrder()}]
+                [{/if}]
+
+                [{assign var="sShopURL"      value=$oConfig->getConfigParam('sShopURL')}]
+                [{assign var="aShopDomain"   value=$sShopURL|@parse_url}]
+                [{assign var="blHasPreOrder" value=false}]
+                [{assign var="oBasket"       value=$oView->getBasket()}]
+                [{assign var="oCountry"      value="oxCountry"|@oxNew}]
+                [{if $oCountry->load($oOrder->oxorder__oxbillcountryid->value)}]
+                    [{assign var="sCustomerCountry" value=$oCountry->oxcountry__oxisoalpha2->value}]
+                [{/if}]
+
+                <!-- START Google Zertifizierte Händler Order -->
+                <div id="gts-order" style="display:none;" translate="no">
+                    [{* Zuerst die Artikel der Bestellung iterieren um Informationen für die Bestelldaten zu sammeln *}]
+                    [{capture name="sGtsItems"}]
+                        [{foreach from=$oOrder->getOrderArticles() item="oOrderArticle"}]
+                            [{assign var="oArticle"           value=$oOrderArticle->getArticle()}]
+                            [{assign var="oOrderArticlePrice" value=$oOrderArticle->getPrice()}]
+                            [{assign var="sArticleName"       value=$oOrderArticle->oxorderarticles__oxtitle->value|cat:' '|cat:$oOrderArticle->oxorderarticles__oxselvariant->value}]
+                            [{if !$blHasPreOrder && $oArticle->getStockStatus() == -1}]
+                                [{assign var="blHasPreOrder" value=true}]
+                            [{/if}]
+
+                            <span class="gts-item">
+                                <span class="gts-i-name">[{$sArticleName|trim}]</span>
+                                <span class="gts-i-price">[{$oOrderArticlePrice->getBruttoPrice()}]</span>
+                                <span class="gts-i-quantity">[{$oOrderArticle->oxorderarticles__oxamount->value}]</span>
+                                <span class="gts-i-prodsearch-id">[{$oOrderArticle->oxorderarticles__oxartnum->value}]</span>
+                                [{if $sGoogleShoppingAccountId}]
+                                    <span class="gts-i-prodsearch-store-id">[{$sGoogleShoppingAccountId}]</span>
+                                    [{if $sShoppingCountry}]
+                                        <span class="gts-i-prodsearch-country">[{$sShoppingCountry|default:'DE'}]</span>
+                                    [{/if}]
+                                    [{if $sShoppingLanguage}]
+                                        <span class="gts-i-prodsearch-language">[{$sShoppingLanguage|default:'de'}]</span>
+                                    [{/if}]
+                                [{/if}]
+                            </span>
+                        [{/foreach}]
+                    [{/capture}]
+
+                    [{* voraussichtliches Versanddatum berechnen *}]
+                    [{if $blHasPreOrder}]
+                        [{assign var="sShipDate" value="`$sShippingDaysNotOnStock` weekdays"|strtotime}]
+                    [{else}]
+                        [{assign var="sShipDate" value="`$sShippingDaysOnStock` weekdays"|strtotime}]
+                    [{/if}]
+
+                    [{* voraussichtliches Lieferdatum berechnen *}]
+                    [{if $blHasPreOrder}]
+                        [{assign var="sDeliveryDate" value="`$sDeliveryDaysNotOnStock` weekdays"|strtotime}]
+                    [{else}]
+                        [{assign var="sDeliveryDate" value="`$sDeliveryDaysOnStock` weekdays"|strtotime}]
+                    [{/if}]
+
+                    <span id="gts-o-id">[{$oOrder->oxorder__oxordernr->value}]</span>
+                    <span id="gts-o-domain">[{$aShopDomain.host}]</span>
+                    <span id="gts-o-email">[{$oOrder->oxorder__oxbillemail->value}]</span>
+                    <span id="gts-o-country">[{$sCustomerCountry}]</span>
+                    <span id="gts-o-currency">[{$oOrder->oxorder__oxcurrency->value}]</span>
+                    <span id="gts-o-total">[{$oOrder->oxorder__oxtotalordersum->value}]</span>
+                    <span id="gts-o-discounts">[{if $oOrder->oxorder__oxdiscount->value > 0}]-[{/if}][{$oOrder->oxorder__oxdiscount->value}]</span>
+                    <span id="gts-o-shipping-total">[{$oOrder->oxorder__oxdelcost->value}]</span>
+                    <span id="gts-o-tax-total">[{math equation="x+y" x=$oOrder->oxorder__oxartvatprice1->value y=$oOrder->oxorder__oxartvatprice2->value}]</span>
+                    <span id="gts-o-est-ship-date">[{$sShipDate|date_format:"%Y-%m-%d"}]</span>
+                    <span id="gts-o-est-delivery-date">[{$sDeliveryDate|date_format:"%Y-%m-%d"}]</span>
+                    <span id="gts-o-has-preorder">[{if $blHasPreOrder}]Y[{else}]N[{/if}]</span>
+                    <span id="gts-o-has-digital">[{if $oBasket->hasDownloadableProducts()}]Y[{else}]N[{/if}]</span>
+
+                    [{if $smarty.capture.sGtsItems}]
+                        [{$smarty.capture.sGtsItems}]
+                    [{/if}]
+                </div>
+            [{/if}]
+            <!-- END Google Zertifizierte Händler Order -->
+        [{/if}]
+    [{/if}]
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/footer/categorylist.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/footer/categorylist.tpl
@@ -0,0 +1,18 @@
+[{if $oxcmp_categories}]
+    [{assign var="categories" value=$oxcmp_categories}]
+    [{block name="footer_categories"}]
+        <ul class="categories list-unstyled">
+            [{foreach from=$categories item=_cat}]
+                [{if $_cat->getIsVisible()}]
+                    [{if $_cat->getContentCats()}]
+                        [{foreach from=$_cat->getContentCats() item=_oCont}]
+                        <li><a href="[{$_oCont->getLink()}]"><i></i>[{$_oCont->oxcontents__oxtitle->value}]</a></li>
+                        [{/foreach}]
+                    [{/if}]
+                    <li><a href="[{$_cat->getLink()}]" [{if $_cat->expanded}]class="exp"[{/if}]>[{$_cat->oxcategories__oxtitle->value}] [{if $oView->showCategoryArticlesCount() && ( $_cat->getNrOfArticles() > 0 )}] ([{$_cat->getNrOfArticles()}])[{/if}]</a></li>
+                [{/if}]
+            [{/foreach}]
+        </ul>
+    [{/block}]
+[{/if}]
+
--- a/shop/source/Application/views/flow/tpl/widget/footer/info.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/footer/info.tpl
@@ -0,0 +1,31 @@
+[{block name="footer_information"}]
+    <ul class="information list-unstyled">
+        [{oxifcontent ident="oximpressum" object="_cont"}]
+            <li><a href="[{$_cont->getLink()}]">[{$_cont->oxcontents__oxtitle->value}]</a></li>
+        [{/oxifcontent}]
+        [{oxifcontent ident="oxagb" object="_cont"}]
+            <li><a href="[{$_cont->getLink()}]">[{$_cont->oxcontents__oxtitle->value}]</a></li>
+        [{/oxifcontent}]
+        [{oxifcontent ident="oxsecurityinfo" object="oCont"}]
+            <li><a href="[{$oCont->getLink()}]">[{$oCont->oxcontents__oxtitle->value}]</a></li>
+        [{/oxifcontent}]
+        [{oxifcontent ident="oxdeliveryinfo" object="oCont"}]
+            <li><a href="[{$oCont->getLink()}]">[{$oCont->oxcontents__oxtitle->value}]</a></li>
+        [{/oxifcontent}]
+        [{oxifcontent ident="oxrightofwithdrawal" object="oCont"}]
+            <li><a href="[{$oCont->getLink()}]">[{$oCont->oxcontents__oxtitle->value}]</a></li>
+        [{/oxifcontent}]
+        [{oxifcontent ident="oxorderinfo" object="oCont"}]
+            <li><a href="[{$oCont->getLink()}]">[{$oCont->oxcontents__oxtitle->value}]</a></li>
+        [{/oxifcontent}]
+        [{oxifcontent ident="oxcredits" object="oCont"}]
+            <li><a href="[{$oCont->getLink()}]">[{$oCont->oxcontents__oxtitle->value}]</a></li>
+        [{/oxifcontent}]
+        [{if $oViewConf->getViewThemeParam('blFooterShowNewsletter')}]
+            <li><a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=newsletter"}]">[{oxmultilang ident="NEWSLETTER"}]</a></li>
+        [{/if}]
+        [{if $oViewConf->getViewThemeParam('blFooterShowNews')}]
+            <li><a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=news"}]">[{oxmultilang ident="NEWS"}]</a></li>
+        [{/if}]
+    </ul>
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/footer/manufacturerlist.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/footer/manufacturerlist.tpl
@@ -0,0 +1,19 @@
+[{assign var="iManufacturerLimit" value="20"}]
+[{assign var="manufacturers" value=$oView->getManufacturerlist()}]
+[{if $manufacturers}]
+[{if $manufacturers|count}]
+    [{block name="footer_manufacturers"}]
+        <ul class="manufacturers list-unstyled">
+            [{assign var="rootManufacturer" value=$oView->getRootManufacturer()}]
+            <li><a href="[{$rootManufacturer->getLink()}]">[{oxmultilang ident="ALL_BRANDS"}]</a></li>
+            [{foreach from=$manufacturers item=_mnf name=manufacturers}]
+                [{if $smarty.foreach.manufacturers.index < $iManufacturerLimit}]
+                    <li><a href="[{$_mnf->getLink()}]" [{if $_mnf->expanded}]class="exp"[{/if}]>[{$_mnf->oxmanufacturers__oxtitle->value}]</a></li>
+                [{elseif $smarty.foreach.manufacturers.index == $iManufacturerLimit}]
+                    <li><a href="[{$rootManufacturer->getLink()}]">[{oxmultilang ident="MORE"}]</a></li>
+                [{/if}]
+            [{/foreach}]
+        </ul>
+    [{/block}]
+[{/if}]
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/footer/newsletter.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/footer/newsletter.tpl
@@ -0,0 +1,21 @@
+[{block name="dd_footer_newsletter_form"}]
+    <form class="form-inline" role="form" action="[{$oViewConf->getSslSelfLink()}]" method="post">
+        [{block name="dd_footer_newsletter_form_inner"}]
+            <div class="hidden">
+                [{$oViewConf->getHiddenSid()}]
+                <input type="hidden" name="fnc" value="fill">
+                <input type="hidden" name="cl" value="newsletter">
+                [{if $oView->getProduct()}]
+                    [{assign var="product" value=$oView->getProduct()}]
+                    <input type="hidden" name="anid" value="[{$product->oxarticles__oxnid->value}]">
+                [{/if}]
+            </div>
+
+            [{block name="dd_footer_newsletter_form_inner_group"}]
+                <label class="sr-only" for="footer_newsletter_oxusername">[{oxmultilang ident="NEWSLETTER"}]</label>
+                <input class="form-control" type="email" name="editval[oxuser__oxusername]" id="footer_newsletter_oxusername" value="" placeholder="[{oxmultilang ident="EMAIL"}]">
+                <button class="btn btn-primary" type="submit">[{oxmultilang ident="SUBSCRIBE"}]</button>
+            [{/block}]
+        [{/block}]
+    </form>
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/footer/services.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/footer/services.tpl
@@ -0,0 +1,49 @@
+[{block name="footer_services"}]
+    <ul class="services list-unstyled">
+        [{block name="footer_services_items"}]
+            <li><a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=contact"}]">[{oxmultilang ident="CONTACT"}]</a></li>
+            [{if $oViewConf->getViewThemeParam('blFooterShowHelp')}]
+                <li><a href="[{$oViewConf->getHelpPageLink()}]">[{oxmultilang ident="HELP"}]</a></li>
+            [{/if}]
+            [{if $oViewConf->getViewThemeParam('blFooterShowLinks')}]
+                <li><a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=links"}]">[{oxmultilang ident="LINKS"}]</a></li>
+            [{/if}]
+            [{if $oView->isActive('Invitations')}]
+                <li><a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=invite"}]">[{oxmultilang ident="INVITE_YOUR_FRIENDS"}]</a></li>
+            [{/if}]
+            [{oxhasrights ident="TOBASKET"}]
+            [{block name="footer_services_cart"}]
+                <li>
+                    <a href="[{oxgetseourl ident=$oViewConf->getBasketLink()}]">
+                        [{oxmultilang ident="CART"}]
+                    </a>
+                    [{if $oxcmp_basket && $oxcmp_basket->getItemsCount() > 0}] <span class="badge">[{$oxcmp_basket->getItemsCount()}]</span>[{/if}]
+                </li>
+            [{/block}]
+            [{/oxhasrights}]
+            <li><a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account"}]">[{oxmultilang ident="ACCOUNT"}]</a></li>
+            <li>
+                <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account_noticelist"}]">
+                    [{oxmultilang ident="WISH_LIST"}]
+                </a>
+                [{if $oxcmp_user && $oxcmp_user->getNoticeListArtCnt()}] <span class="badge">[{$oxcmp_user->getNoticeListArtCnt()}]</span>[{/if}]
+            </li>
+            [{if $oViewConf->getShowWishlist()}]
+                <li>
+                    <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account_wishlist"}]">
+                        [{oxmultilang ident="MY_GIFT_REGISTRY"}]
+                    </a>
+                    [{if $oxcmp_user && $oxcmp_user->getWishListArtCnt()}] <span class="badge">[{$oxcmp_user->getWishListArtCnt()}]</span>[{/if}]
+                </li>
+                <li>
+                    <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=wishlist" params="wishid="|cat:$oView->getWishlistUserId()}]">
+                        [{oxmultilang ident="PUBLIC_GIFT_REGISTRIES"}]
+                    </a>
+                </li>
+            [{/if}]
+            [{if $oView->isEnabledDownloadableFiles()}]
+                <li><a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account_downloads"}]">[{oxmultilang ident="MY_DOWNLOADS"}]</a></li>
+            [{/if}]
+        [{/block}]
+    </ul>
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/footer/vendorlist.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/footer/vendorlist.tpl
@@ -0,0 +1,10 @@
+[{assign var="vendors" value=$oView->getVendorlist()}]
+[{if $vendors->count()}]
+    [{block name="footer_vendors"}]
+        <ul class="vendors list-unstyled">
+          [{foreach from=$vendors item=_vnd}]
+          <li><a href="[{$_vnd->getLink()}]" [{if $_vnd->expanded}]class="exp"[{/if}]>[{$_vnd->oxvendor__oxtitle->value}]</a></li>
+          [{/foreach}]
+        </ul>
+    [{/block}]
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/header/betanote.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/betanote.tpl
@@ -0,0 +1,16 @@
+[{if ($oView->isRCVersion())}]
+    [{assign var='release_name' value='RC' }]
+[{else}]
+    [{assign var='release_name' value='BETA' }]
+[{/if}]
+<div id="betaNote">
+    <div class="notify">
+        [{oxmultilang ident='BETA_NOTE'}]
+        [{oxmultilang ident=BETA_NOTE_RELEASE_$release_name}]
+        [{$oxcmp_shop->getShopVersion()|regex_replace:"/[0-9]+\.[0-9]+\.[0-9]+([_a-zA-Z]+)?/":""}]
+        [{oxmultilang ident='BETA_NOTE_MIDDLE'}]
+        [{$oxcmp_shop->getShopVersion()|regex_replace:"/[_a-zA-Z]+[0-9]+/":""}]
+        [{oxmultilang ident='BETA_NOTE_FAQ'}]
+        <span class="dismiss"><a href="#" title="[{oxmultilang ident='BETA_NOTE_CLOSE'}]">x</a></span>
+    </div>
+</div>
--- a/shop/source/Application/views/flow/tpl/widget/header/categorylist.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/categorylist.tpl
@@ -0,0 +1,98 @@
+[{block name="dd_widget_header_categorylist"}]
+    [{if $oxcmp_categories}]
+        [{assign var="homeSelected" value="false"}]
+        [{if $oViewConf->getTopActionClassName() == 'start'}]
+            [{assign var="homeSelected" value="true"}]
+        [{/if}]
+        [{assign var="oxcmp_categories" value=$oxcmp_categories}]
+        [{assign var="blFullwidth" value=$oViewConf->getViewThemeParam('blFullwidthLayout')}]
+
+        <nav id="mainnav" class="navbar navbar-default [{if $blFullwidth}]fullviewlayout[{/if}]" role="navigation">
+            <div class="[{if $blFullwidth}]container[{else}]container-fluid[{/if}]">
+
+                [{block name="dd_widget_header_categorylist_navbar"}]
+                    <div class="navbar-header">
+                        [{block name="dd_widget_header_categorylist_navbar_header"}]
+                            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+                                <span class="sr-only">Toggle navigation</span>
+                                <span class="icon-bar"></span>
+                                <span class="icon-bar"></span>
+                                <span class="icon-bar"></span>
+                            </button><span class="visible-xs-inline">[{oxmultilang ident="DD_ROLES_BEMAIN_UIROOTHEADER"}]</span>
+                        [{/block}]
+                    </div>
+                    <div class="collapse navbar-collapse navbar-ex1-collapse">
+                        <ul id="navigation" class="nav navbar-nav">
+                            [{block name="dd_widget_header_categorylist_navbar_list"}]
+                                <li [{if $homeSelected == 'true'}]class="active"[{/if}]>
+                                    <a href="[{$oViewConf->getHomeLink()}]">[{oxmultilang ident="HOME"}]</a>
+                                </li>
+
+                                [{foreach from=$oxcmp_categories item="ocat" key="catkey" name="root"}]
+                                    [{if $ocat->getIsVisible()}]
+                                        [{foreach from=$ocat->getContentCats() item="oTopCont" name="MoreTopCms"}]
+                                            <li[{if $oContent->oxcontents__oxloadid->value === $oTopCont->oxcontents__oxloadid->value}] class="active"[{/if}]>
+                                                <a href="[{$oTopCont->getLink()}]">[{$oTopCont->oxcontents__oxtitle->value}]</a>
+                                            </li>
+                                        [{/foreach}]
+
+                                        <li class="[{if $homeSelected == 'false' && $ocat->expanded}]active[{/if}][{if $ocat->getSubCats()}] dropdown[{/if}]">
+                                            <a href="[{$ocat->getLink()}]"[{if $ocat->getSubCats()}] class="dropdown-toggle" data-toggle="dropdown"[{/if}]>
+                                                [{$ocat->oxcategories__oxtitle->value}][{if $ocat->getSubCats()}] <i class="fa fa-angle-down"></i>[{/if}]
+                                            </a>
+
+                                            [{if $ocat->getSubCats()}]
+                                                <ul class="dropdown-menu">
+                                                    [{foreach from=$ocat->getSubCats() item="osubcat" key="subcatkey" name="SubCat"}]
+                                                        [{if $osubcat->getIsVisible()}]
+                                                            [{foreach from=$osubcat->getContentCats() item=ocont name=MoreCms}]
+                                                                <li[{if $oViewConf->getContentId() == $ocont->getId()}] class="active"[{/if}]>
+                                                                    <a [{if $oViewConf->getContentId() == $ocont->getId()}]class="current" [{/if}]href="[{$ocont->getLink()}]">[{$ocont->oxcontents__oxtitle->value}]</a>
+                                                                </li>
+                                                            [{/foreach}]
+
+                                                            [{if $osubcat->getIsVisible()}]
+                                                                <li [{if $homeSelected == 'false' && $osubcat->expanded}]class="active"[{/if}]>
+                                                                    <a [{if $homeSelected == 'false' && $osubcat->expanded}]class="current"[{/if}] href="[{$osubcat->getLink()}]">[{$osubcat->oxcategories__oxtitle->value}]</a>
+                                                                </li>
+                                                            [{/if}]
+                                                        [{/if}]
+                                                    [{/foreach}]
+                                                </ul>
+                                            [{/if}]
+                                        </li>
+                                    [{/if}]
+                                [{/foreach}]
+                            [{/block}]
+                        </ul>
+
+                        <ul class="nav navbar-nav navbar-right fixed-header-actions">
+
+                            [{block name="categorylist_navbar_minibasket"}]
+                                [{include file="widget/header/menubasket.tpl"}]
+                            [{/block}]
+
+                            <li>
+                                <a href="javascript:void(null)" class="search-toggle" rel="nofollow">
+                                    <i class="fa fa-search"></i>
+                                </a>
+                            </li>
+
+                        </ul>
+
+                        [{if $oView->isDemoShop()}]
+
+                            <a href="[{$oViewConf->getBaseDir()}]admin/" class="btn btn-sm btn-danger navbar-btn navbar-right visible-lg">
+                                [{oxmultilang ident="DD_DEMO_ADMIN_TOOL"}]
+                                <i class="fa fa-external-link" style="font-size: 80%;"></i>
+                            </a>
+
+                        [{/if}]
+
+                    </div>
+                [{/block}]
+
+            </div>
+        </nav>
+    [{/if}]
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/header/compareitemscounter.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/compareitemscounter.tpl
@@ -0,0 +1,3 @@
+[{if $oView->getCompareItemsCnt()}]
+    <span class="badge">[{$oView->getCompareItemsCnt()}]</span>
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/header/cookienote.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/cookienote.tpl
@@ -0,0 +1,16 @@
+[{if $oView->isEnabled() && $smarty.cookies.displayedCookiesNotification != '1'}]
+    [{oxscript include="js/libs/jquery.cookie.min.js"}]
+    [{oxscript add="$.cookie('testing', 'yes'); if(!$.cookie('testing')) $('#cookieNote').hide(); else{ $('#cookieNote').show(); $.cookie('testing', null, -1);}"}]
+    [{oxscript include="js/widgets/oxcookienote.min.js"}]
+    <div id="cookieNote">
+        <div class="alert alert-info" style="margin: 0;">
+            <button type="button" class="close" data-dismiss="alert">
+                <span aria-hidden="true">&times;</span><span class="sr-only">[{oxmultilang ident='COOKIE_NOTE_CLOSE'}]</span>
+            </button>
+            [{oxmultilang ident='COOKIE_NOTE'}]
+            <span class="cancelCookie"><a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=clearcookies"}]" title="[{oxmultilang ident='COOKIE_NOTE_DISAGREE'}]">[{oxmultilang ident='COOKIE_NOTE_DISAGREE'}]</a></span>
+        </div>
+    </div>
+    [{oxscript add="$('#cookieNote').oxCookieNote();"}]
+[{/if}]
+[{oxscript widget=$oView->getClassName()}]
--- a/shop/source/Application/views/flow/tpl/widget/header/currencies.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/currencies.tpl
@@ -0,0 +1,23 @@
+[{if $oView->loadCurrency()}]
+    [{assign var="currency" value=$oView->getActCurrency()}]
+    <div class="btn-group currencies-menu">
+        <button type="button" class="btn dropdown-toggle" data-toggle="dropdown">
+            [{block name="dd_layout_page_header_icon_menu_currencies_button"}]
+                [{$currency->name}] <i class="fa fa-angle-down"></i>
+            [{/block}]
+        </button>
+        <ul class="dropdown-menu dropdown-menu-right" role="menu">
+            [{block name="dd_layout_page_header_icon_menu_currencies_list"}]
+                [{foreach from=$oxcmp_cur item=_cur}]
+                    [{if $_cur->selected}]
+                        [{assign var="selectedCurrency" value=$_cur->name}]
+                        [{capture name="currencySelected"}]
+                            <a href="[{$_cur->link|oxaddparams:$oView->getDynUrlParams()}]" title="[{$_cur->name}]"><span>[{$_cur->name}]</span></a>
+                        [{/capture}]
+                    [{/if}]
+                    <li[{if $_cur->selected}] class="active"[{/if}]><a href="[{$_cur->link|oxaddparams:$oView->getDynUrlParams()}]" title="[{$_cur->name}]">[{$_cur->name}]</a></li>
+                [{/foreach}]
+            [{/block}]
+        </ul>
+    </div>
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/header/languages.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/languages.tpl
@@ -0,0 +1,27 @@
+[{if $oView->isLanguageLoaded()}]
+    <div class="btn-group languages-menu">
+        <button type="button" class="btn dropdown-toggle" data-toggle="dropdown">
+            [{assign var="sLangImg" value="lang/"|cat:$oViewConf->getActLanguageAbbr()|cat:".png"}]
+            [{block name="dd_layout_page_header_icon_menu_languages_button"}]
+                <img src="[{$oViewConf->getImageUrl($sLangImg)}]" alt=""/> <i class="fa fa-angle-down"></i>
+            [{/block}]
+        </button>
+        <ul class="dropdown-menu dropdown-menu-right" role="menu">
+            [{block name="dd_layout_page_header_icon_menu_languages_list"}]
+                [{foreach from=$oxcmp_lang item=_lng}]
+                    [{assign var="sLangImg" value="lang/"|cat:$_lng->abbr|cat:".png"}]
+                    [{if $_lng->selected}]
+                        [{capture name="languageSelected"}]
+                            <a class="flag [{$_lng->abbr}]" title="[{$_lng->name}]" href="[{$_lng->link|oxaddparams:$oView->getDynUrlParams()}]" hreflang="[{$_lng->abbr}]"><span style="background-image:url('[{$oViewConf->getImageUrl($sLangImg)}]')" >[{$_lng->name}]</span></a>
+                        [{/capture}]
+                    [{/if}]
+                    <li[{if $_lng->selected}] class="active"[{/if}]>
+                        <a class="flag [{$_lng->abbr}]" title="[{$_lng->name}]" href="[{$_lng->link|oxaddparams:$oView->getDynUrlParams()}]" hreflang="[{$_lng->abbr}]">
+                            <img src="[{$oViewConf->getImageUrl($sLangImg)}]" alt=""/> [{$_lng->name}]
+                        </a>
+                    </li>
+                [{/foreach}]
+            [{/block}]
+        </ul>
+    </div>
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/header/loginbox.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/loginbox.tpl
@@ -0,0 +1,57 @@
+[{assign var="bIsError" value=0}]
+[{capture name="loginErrors"}]
+    [{foreach from=$Errors.loginBoxErrors item=oEr key=key}]
+        <p id="errorBadLogin" class="alert alert-danger">[{$oEr->getOxMessage()}]</p>
+        [{assign var="bIsError" value=1}]
+    [{/foreach}]
+[{/capture}]
+[{if !$oxcmp_user->oxuser__oxpassword->value}]
+    <form class="form" id="login" name="login" action="[{$oViewConf->getSslSelfLink()}]" method="post">
+        <div id="loginBox" class="loginBox" [{if $bIsError}]style="display: block;"[{/if}]>
+            [{$oViewConf->getHiddenSid()}]
+            [{$oViewConf->getNavFormParams()}]
+            <input type="hidden" name="fnc" value="login_noredirect">
+            <input type="hidden" name="cl" value="[{$oViewConf->getTopActiveClassName()}]">
+            [{if $oViewConf->getTopActiveClassName() eq "content"}]
+                <input type="hidden" name="oxcid" value="[{$oViewConf->getContentId()}]">
+            [{/if}]
+            <input type="hidden" name="pgNr" value="[{$oView->getActPage()}]">
+            <input type="hidden" name="CustomError" value="loginBoxErrors">
+            [{if $oViewConf->getActArticleId()}]
+                <input type="hidden" name="anid" value="[{$oViewConf->getActArticleId()}]">
+            [{/if}]
+
+            <span class="lead">[{oxmultilang ident="LOGIN"}]</span>
+
+            <div class="form-group">
+                <input id="loginEmail" type="email" name="lgn_usr" value="" class="form-control" placeholder="[{oxmultilang ident="EMAIL_ADDRESS"}]">
+            </div>
+
+            <div class="form-group">
+                <div class="input-group">
+                    <input id="loginPasword" type="password" name="lgn_pwd" class="form-control" value="" placeholder="[{oxmultilang ident="PASSWORD"}]">
+                    <span class="input-group-btn">
+                        <a class="forgotPasswordOpener btn btn-default" href="[{oxgetseourl ident=$oViewConf->getSslSelfLink()|cat:"cl=forgotpwd"}]" title="[{oxmultilang ident="FORGOT_PASSWORD"}]">?</a>
+                    </span>
+                </div>
+            </div>
+
+            [{if $oViewConf->isFunctionalityEnabled( "blShowRememberMe" )}]
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" class="checkbox" value="1" name="lgn_cook" id="remember"> [{oxmultilang ident="REMEMBER_ME"}]
+                    </label>
+                </div>
+            [{/if}]
+
+            <button type="submit" class="btn btn-primary">[{oxmultilang ident="LOGIN"}]</button>
+
+            [{if !$oxcmp_user}]
+                <a class="btn" id="registerLink" role="button" href="[{oxgetseourl ident=$oViewConf->getSslSelfLink()|cat:"cl=register"}]" title="[{oxmultilang ident="REGISTER"}]">[{oxmultilang ident="REGISTER"}]</a>
+            [{/if}]
+
+            [{block name="thirdparty_login"}][{/block}]
+
+        </div>
+    </form>
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/header/menubasket.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/menubasket.tpl
@@ -0,0 +1,10 @@
+<li>
+    <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=basket"}]" rel="nofollow">
+        <i class="fa fa-shopping-cart"></i>
+        [{if isset($oxcmp_basket) && $oxcmp_basket->getItemsCount() > 0}]
+            <span class="badge">
+                [{ $oxcmp_basket->getItemsCount() }]
+            </span>
+        [{/if}]
+    </a>
+</li>
--- a/shop/source/Application/views/flow/tpl/widget/header/minibasket.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/minibasket.tpl
@@ -0,0 +1,25 @@
+<div class="btn-group minibasket-menu">
+    <button type="button" class="btn dropdown-toggle" data-toggle="dropdown" data-href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=basket"}]">
+        [{block name="dd_layout_page_header_icon_menu_minibasket_button"}]
+            <i class="fa fa-shopping-cart fa-2x" aria-hidden="true"></i>
+            [{if $oxcmp_basket->getItemsCount() > 0}]
+                <span class="badge">
+                    [{ $oxcmp_basket->getItemsCount() }]
+                </span>
+            [{/if}]
+        [{/block}]
+    </button>
+    <ul class="dropdown-menu dropdown-menu-right pull-right" role="menu">
+        [{block name="dd_layout_page_header_icon_menu_minibasket_list"}]
+            <li>
+                <div class="row">
+                    <div class="col-xs-12 pull-right">
+                        <div class="minibasket-menu-box">
+                            [{oxid_include_dynamic file="widget/minibasket/minibasket.tpl"}]
+                        </div>
+                    </div>
+                </div>
+            </li>
+        [{/block}]
+    </ul>
+</div>
--- a/shop/source/Application/views/flow/tpl/widget/header/notificationscounter.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/notificationscounter.tpl
@@ -0,0 +1,14 @@
+[{if $oxcmp_user}]
+    [{assign var="noticeListCount" value=$oxcmp_user->getNoticeListArtCnt()}]
+    [{assign var="wishListCount" value=$oxcmp_user->getWishListArtCnt()}]
+    [{assign var="recommListCount" value=$oxcmp_user->getRecommListsCount()}]
+[{else}]
+    [{assign var="noticeListCount" value="0"}]
+    [{assign var="wishListCount" value="0"}]
+    [{assign var="recommListCount" value="0"}]
+[{/if}]
+[{math equation="a+b+c+d" a=$oView->getCompareItemsCnt() b=$noticeListCount c=$wishListCount d=$recommListCount assign="notificationsCounter"}]
+
+[{if $notificationsCounter > 0}]
+    <span class="badge">[{$notificationsCounter}]</span>
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/header/search.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/search.tpl
@@ -0,0 +1,24 @@
+[{block name="widget_header_search_form"}]
+    [{if $oView->showSearch()}]
+        <form class="form search" role="form" action="[{$oViewConf->getSelfActionLink()}]" method="get" name="search">
+            [{$oViewConf->getHiddenSid()}]
+            <input type="hidden" name="cl" value="search">
+
+            [{block name="dd_widget_header_search_form_inner"}]
+                <div class="input-group">
+                    [{block name="header_search_field"}]
+                        <input class="form-control" type="text" id="searchParam" name="searchparam" value="[{$oView->getSearchParamForHtml()}]" placeholder="[{oxmultilang ident="SEARCH"}]">
+                    [{/block}]
+
+                    [{block name="dd_header_search_button"}]
+                        <span class="input-group-btn">
+                            <button type="submit" class="btn btn-primary" title="[{oxmultilang ident="SEARCH_SUBMIT"}]">
+                                <i class="fa fa-search"></i>
+                            </button>
+                        </span>
+                    [{/block}]
+                </div>
+            [{/block}]
+        </form>
+    [{/if}]
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/header/servicebox.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/servicebox.tpl
@@ -0,0 +1,41 @@
+<div class="topPopList">
+    [{block name="widget_header_servicebox_flyoutbox"}]
+        <span class="lead">[{oxmultilang ident="ACCOUNT"}]</span>
+        <div class="flyoutBox">
+            <ul id="services" class="list-unstyled">
+                [{block name="widget_header_servicebox_items"}]
+                    <li>
+                        <a href="[{oxgetseourl ident=$oViewConf->getSslSelfLink()|cat:"cl=account"}]">[{oxmultilang ident="MY_ACCOUNT"}]</a>
+                    </li>
+                    [{if $oViewConf->getShowCompareList()}]
+                        <li>
+                            <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=compare"}]">[{oxmultilang ident="MY_PRODUCT_COMPARISON"}]</a>
+                            [{oxid_include_dynamic file="widget/header/compareitemscounter.tpl"}]
+                        </li>
+                    [{/if}]
+                    <li>
+                        <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account_noticelist"}]"><span>[{oxmultilang ident="MY_WISH_LIST"}]</span></a>
+                        [{if $oxcmp_user && $oxcmp_user->getNoticeListArtCnt()}] <span class="badge">[{$oxcmp_user->getNoticeListArtCnt()}]</span>[{/if}]
+                    </li>
+                    [{if $oViewConf->getShowWishlist()}]
+                        <li>
+                            <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account_wishlist"}]"><span>[{oxmultilang ident="MY_GIFT_REGISTRY"}]</span></a>
+                            [{if $oxcmp_user && $oxcmp_user->getWishListArtCnt()}] <span class="badge">[{$oxcmp_user->getWishListArtCnt()}]</span>[{/if}]
+                        </li>
+                    [{/if}]
+                    [{if $oViewConf->getShowListmania()}]
+                        <li>
+                            <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account_recommlist"}]"><span>[{oxmultilang ident="MY_LISTMANIA"}]</span></a>
+                            [{if $oxcmp_user && $oxcmp_user->getRecommListsCount()}] <span class="badge">[{$oxcmp_user->getRecommListsCount()}]</span>[{/if}]
+                        </li>
+                    [{/if}]
+                    [{if $oViewConf->isFunctionalityEnabled( "blEnableDownloads" )}]
+                        <li>
+                            <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account_downloads"}]"><span>[{oxmultilang ident="MY_DOWNLOADS"}]</span></a>
+                        </li>
+                    [{/if}]
+                [{/block}]
+            </ul>
+        </div>
+    [{/block}]
+</div>
--- a/shop/source/Application/views/flow/tpl/widget/header/servicemenu.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/header/servicemenu.tpl
@@ -0,0 +1,41 @@
+<div class="btn-group service-menu [{if !$oxcmp_user}]showLogin[{/if}]">
+    <button type="button" class="btn dropdown-toggle" data-toggle="dropdown" data-href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account"}]">
+        [{block name="dd_layout_page_header_icon_menu_account_button"}]
+            [{if !$oxcmp_user}]
+                [{oxmultilang ident="LOGIN"}]
+            [{else}]
+                [{oxmultilang ident="MY_ACCOUNT"}]
+            [{/if}]
+            [{oxid_include_dynamic file="widget/header/notificationscounter.tpl"}]
+            <i class="fa fa-angle-down hidden-xs"></i>
+        [{/block}]
+    </button>
+    <ul class="dropdown-menu dropdown-menu-right pull-right" role="menu">
+        [{block name="dd_layout_page_header_icon_menu_account_list"}]
+            <li>
+                <div class="row">
+                    <div class="[{if !$oxcmp_user}]col-xs-12 col-sm-5[{else}]col-xs-12[{/if}] pull-right">
+                        <div class="service-menu-box clearfix">
+                            [{include file="widget/header/servicebox.tpl"}]
+                            [{if $oxcmp_user}]
+                                <div class="divider"></div>
+                                <div class="text-right">
+                                    <a class="btn btn-danger" role="button" href="[{$oViewConf->getLogoutLink()}]" title="[{oxmultilang ident="LOGOUT"}]">
+                                        <i class="fa fa-power-off"></i> [{oxmultilang ident="LOGOUT"}]
+                                    </a>
+                                </div>
+                            [{/if}]
+                        </div>
+                    </div>
+                    [{if !$oxcmp_user}]
+                        <div class="col-xs-12 col-sm-7">
+                            <div class="service-menu-box clearfix">
+                                [{include file="widget/header/loginbox.tpl"}]
+                            </div>
+                        </div>
+                    [{/if}]
+                </div>
+            </li>
+        [{/block}]
+    </ul>
+</div>
--- a/shop/source/Application/views/flow/tpl/widget/locator/attributes.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/locator/attributes.tpl
@@ -0,0 +1,60 @@
+[{block name="widget_locator_attributes"}]
+	[{if $attributes}]
+	<div class="row">
+		<div class="col-xs-12">
+			<div class="list-filter clearfix">
+				<form method="get" action="[{$oViewConf->getSelfActionLink()}]" name="_filterlist" id="filterList" class="pull-left">
+					<div class="hidden">
+						[{$oViewConf->getHiddenSid()}]
+						[{$oViewConf->getNavFormParams()}]
+						<input type="hidden" name="cl" value="[{$oViewConf->getActiveClassName()}]">
+						<input type="hidden" name="tpl" value="[{$oViewConf->getActTplName()}]">
+						<input type="hidden" name="oxloadid" value="[{$oViewConf->getActContentLoadId()}]">
+						<input type="hidden" name="fnc" value="executefilter">
+						<input type="hidden" name="fname" value="">
+					</div>
+
+					[{if $oView->getClassName() == 'alist'}]
+						<strong>[{oxmultilang ident="DD_LISTLOCATOR_FILTER_ATTRIBUTES"}]</strong>
+					[{/if}]
+					[{foreach from=$attributes item=oFilterAttr key=sAttrID name=attr}]
+						[{assign var="sActiveValue" value=$oFilterAttr->getActiveValue()}]
+						<div class="btn-group">
+							<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
+								<strong>[{$oFilterAttr->getTitle()}]:</strong>
+								[{if $sActiveValue}]
+								[{$sActiveValue}]
+								[{else}]
+								[{oxmultilang ident="PLEASE_CHOOSE"}]
+								[{/if}]
+								<span class="caret"></span>
+							</button>
+							<input type="hidden" name="attrfilter[[{$sAttrID}]]" value="[{$sActiveValue}]">
+							<ul class="dropdown-menu" role="menu">
+								[{if $sActiveValue}]
+								<li><a data-selection-id="" href="#">[{oxmultilang ident="PLEASE_CHOOSE"}]</a></li>
+								[{/if}]
+								[{foreach from=$oFilterAttr->getValues() item=sValue}]
+								<li><a data-selection-id="[{$sValue}]" href="#" [{if $sActiveValue == $sValue}]class="selected"[{/if}] >[{$sValue}]</a></li>
+								[{/foreach}]
+							</ul>
+						</div>
+						[{if $sActiveValue}][{assign var="hasActiveValue" value=$sActiveValue}][{/if}]
+					[{/foreach}]
+				</form>
+
+				[{if $hasActiveValue}]
+					<form method="get" action="[{$oViewConf->getSelfActionLink()}]" name="_resetFilter" id="resetFilter" class="pull-left">
+						[{$oViewConf->getHiddenSid()}]
+						[{$oViewConf->getNavFormParams()}]
+						<input type="hidden" name="cl" value="[{$oViewConf->getActiveClassName()}]">
+						<input type="hidden" name="fnc" value="resetFilter">
+
+						<button type="submit" class="btn btn-default btn-sm ml-2">[{oxmultilang ident="DD_CATEGORY_RESET_BUTTON"}]</button>
+					</form>
+				[{/if}]
+			</div>
+		</div>
+	</div>
+	[{/if}]
+	[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/locator/itemsperpage.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/locator/itemsperpage.tpl
@@ -0,0 +1,21 @@
+[{assign var="_additionalParams" value=$oView->getAdditionalParams()}]
+[{assign var="listType" value=$oView->getListDisplayType()}]
+
+<div class="btn-group">
+    <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
+        <strong>[{oxmultilang ident="PRODUCTS_PER_PAGE"}]</strong>
+        [{if $oViewConf->getArtPerPageCount()}]
+            [{$oViewConf->getArtPerPageCount()}]
+        [{else}]
+            [{oxmultilang ident="CHOOSE"}]
+        [{/if}]
+        <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu" role="menu">
+        [{foreach from=$oViewConf->getNrOfCatArticles() item=iItemsPerPage}]
+            <li>
+                <a href="[{$oView->getLink()|oxaddparams:"ldtype=$listType&amp;_artperpage=$iItemsPerPage&amp;pgNr=0&amp;$_additionalParams"}]" [{if $oViewConf->getArtPerPageCount() == $iItemsPerPage}] class="selected"[{/if}]>[{$iItemsPerPage}]</a>
+            </li>
+        [{/foreach}]
+    </ul>
+</div>
--- a/shop/source/Application/views/flow/tpl/widget/locator/listdisplaytype.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/locator/listdisplaytype.tpl
@@ -0,0 +1,16 @@
+[{assign var="listType" value=$oView->getListDisplayType()}]
+[{assign var="_additionalParams" value=$oView->getAdditionalParams()}]
+[{assign var="_artPerPage" value=$oViewConf->getArtPerPageCount()}]
+
+[{if $oView->canSelectDisplayType()}]
+    <div class="btn-group hidden-xs">
+        <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
+            <strong>[{oxmultilang ident="LIST_DISPLAY_TYPE"}]</strong> [{oxmultilang ident=$listType}] <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu" role="menu">
+            <li><a href="[{$oView->getLink()|oxaddparams:"ldtype=infogrid&amp;_artperpage=$_artPerPage&amp;pgNr=0&amp;$_additionalParams"}]" [{if $listType eq 'infogrid'}]class="selected" [{/if}]>[{oxmultilang ident="infogrid"}]</a></li>
+            <li><a href="[{$oView->getLink()|oxaddparams:"ldtype=grid&amp;_artperpage=$_artPerPage&amp;pgNr=0&amp;$_additionalParams"}]" [{if $listType eq 'grid'}]class="selected" [{/if}]>[{oxmultilang ident="grid"}]</a></li>
+            <li><a href="[{$oView->getLink()|oxaddparams:"ldtype=line&amp;_artperpage=$_artPerPage&amp;pgNr=0&amp;$_additionalParams"}]" [{if $listType eq 'line'}]class="selected" [{/if}]>[{oxmultilang ident="line"}]</a></li>
+        </ul>
+    </div>
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/locator/listlocator.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/locator/listlocator.tpl
@@ -0,0 +1,34 @@
+<div class="refineParams row clear[{if $place == "bottom"}] bottomParams[{/if}]">
+    <div class="col-xs-12 pagination-options">
+        [{if $locator}]
+            [{if $place != "bottom"}]
+                <div class="pull-left">
+            [{/if}]
+                [{include file="widget/locator/paging.tpl" pages=$locator place=$place}]
+            [{if $place != "bottom"}]
+                </div>
+            [{/if}]
+        [{/if}]
+
+        [{if $listDisplayType || $sort || $itemsPerPage}]
+            <div class="pull-right options">
+                    [{if $listDisplayType}]
+                        [{include file="widget/locator/listdisplaytype.tpl"}]
+                    [{/if}]
+
+                    [{if $sort}]
+                        [{include file="widget/locator/sort.tpl"}]
+                    [{/if}]
+
+                    [{if $itemsPerPage}]
+                        [{include file="widget/locator/itemsperpage.tpl"}]
+                    [{/if}]
+            </div>
+        [{/if}]
+        <div class="clearfix"></div>
+    </div>
+</div>
+
+[{if $place != "bottom"}]
+    [{include file="widget/locator/attributes.tpl"}]
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/locator/paging.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/locator/paging.tpl
@@ -0,0 +1,47 @@
+[{block name="widget_locator_paging"}]
+    [{if $pages->changePage}]
+        <ol class="pagination pagination-sm[{if $place eq "bottom"}] lineBox[{/if}]" id="itemsPager[{$place}]">
+            <li class="prev[{if !$pages->previousPage}] disabled[{/if}]">
+                [{if $pages->previousPage}]
+                    <a href="[{$pages->previousPage}]">&larr; [{oxmultilang ident="PREVIOUS"}]</a>
+                [{else}]
+                    <span>&larr; [{oxmultilang ident="PREVIOUS"}]</span>
+                [{/if}]
+            </li>
+
+            [{assign var="i" value=1}]
+            [{foreach key=iPage from=$pages->changePage item=page}]
+                [{if $iPage == $i}]
+                    <li[{if $iPage == $pages->actPage}] class="active"[{/if}]>
+                        <a href="[{$page->url}]">[{$iPage}]</a>
+                    </li>
+                   [{assign var="i" value=$i+1}]
+                [{elseif $iPage > $i}]
+                    <li class="disabled">
+                        <span>...</span>
+                    </li>
+                    <li[{if $iPage == $pages->actPage}] class="active"[{/if}]>
+                        <a href="[{$page->url}]">[{$iPage}]</a>
+                    </li>
+                    [{assign var="i" value=$iPage+1}]
+                [{elseif $iPage < $i}]
+                    <li[{if $iPage == $pages->actPage}] class="active"[{/if}]>
+                        <a href="[{$page->url}]">[{$iPage}]</a>
+                    </li>
+                    <li class="disabled">
+                        <span>...</span>
+                    </li>
+                   [{assign var="i" value=$iPage+1}]
+                [{/if}]
+            [{/foreach}]
+
+            <li class="next[{if !$pages->nextPage}] disabled[{/if}]">
+                [{if $pages->nextPage}]
+                    <a href="[{$pages->nextPage}]">[{oxmultilang ident="NEXT"}] &rarr;</a>
+                [{else}]
+                    <span>[{oxmultilang ident="NEXT"}] &rarr;</span>
+                [{/if}]
+            </li>
+         </ol>
+    [{/if}]
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/locator/sort.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/locator/sort.tpl
@@ -0,0 +1,35 @@
+[{block name="widget_locator_sort"}]
+    [{if $oView->showSorting()}]
+        [{assign var="_listType" value=$oView->getListDisplayType()}]
+        [{assign var="_additionalParams" value=$oView->getAdditionalParams()}]
+        [{assign var="_artPerPage" value=$oViewConf->getArtPerPageCount()}]
+        [{assign var="_sortColumnVarName" value=$oView->getSortOrderByParameterName()}]
+        [{assign var="_sortDirectionVarName" value=$oView->getSortOrderParameterName()}]
+
+        <div class="btn-group">
+            <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
+                <strong>[{oxmultilang ident="SORT_BY"}]:</strong>
+                [{if $oView->getListOrderBy()}]
+                    [{oxmultilang ident=$oView->getListOrderBy()|upper }]
+                [{else}]
+                    [{oxmultilang ident="CHOOSE"}]
+                [{/if}]
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu" role="menu">
+                [{foreach from=$oView->getSortColumns() item=sColumnName}]
+                    <li class="desc[{if $oView->getListOrderDirection() == 'desc' && $sColumnName == $oView->getListOrderBy()}] active[{/if}]">
+                        <a href="[{$oView->getLink()|oxaddparams:"ldtype=$_listType&amp;_artperpage=$_artPerPage&amp;$_sortColumnVarName=$sColumnName&amp;$_sortDirectionVarName=desc&amp;pgNr=0&amp;$_additionalParams"}]" title="[{oxmultilang ident=$sColumnName|upper}] [{oxmultilang ident="DD_SORT_DESC"}]">
+                            <i class="fa fa-caret-down"></i> [{oxmultilang ident=$sColumnName|upper}]
+                        </a>
+                    </li>
+                    <li class="asc[{if $oView->getListOrderDirection() == 'asc' && $sColumnName == $oView->getListOrderBy()}] active[{/if}]">
+                        <a href="[{$oView->getLink()|oxaddparams:"ldtype=$_listType&amp;_artperpage=$_artPerPage&amp;$_sortColumnVarName=$sColumnName&amp;$_sortDirectionVarName=asc&amp;pgNr=0&amp;$_additionalParams"}]" title="[{oxmultilang ident=$sColumnName|upper}] [{oxmultilang ident="DD_SORT_ASC"}]">
+                            <i class="fa fa-caret-up"></i> [{oxmultilang ident=$sColumnName|upper}]
+                        </a>
+                    </li>
+                [{/foreach}]
+            </ul>
+        </div>
+    [{/if}]
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/manufacturersslider.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/manufacturersslider.tpl
@@ -0,0 +1,25 @@
+[{oxscript include="js/libs/jquery.flexslider.min.js" priority=2}]
+[{oxstyle include="css/libs/jquery.flexslider.min.css"}]
+
+<div class="row">
+    <div id="manufacturerSlider" class="boxwrapper">
+        <div class="page-header">
+            <h3>[{oxmultilang ident="OUR_BRANDS"}]</h3>
+            <span class="subhead">[{oxmultilang ident="MANUFACTURERSLIDER_SUBHEAD"}]</span>
+        </div>
+
+        <div class="flexslider">
+            <ul class="slides">
+                [{foreach from=$oView->getManufacturerForSlider() item=oManufacturer}]
+                    [{if $oManufacturer->oxmanufacturers__oxicon->value}]
+                        <li>
+                            <a href="[{$oManufacturer->getLink()}]" title="[{oxmultilang ident="VIEW_ALL_PRODUCTS"}]">
+                                <img src="[{$oViewConf->getImageUrl('spinner.gif')}]" data-src="[{$oManufacturer->getIconUrl()}]" alt="[{$oManufacturer->oxmanufacturers__oxtitle->value}]">
+                            </a>
+                        </li>
+                    [{/if}]
+                [{/foreach}]
+            </ul>
+        </div>
+    </div>
+</div>
--- a/shop/source/Application/views/flow/tpl/widget/minibasket/countdown.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/minibasket/countdown.tpl
@@ -0,0 +1,10 @@
+[{if $oViewConf->getShowBasketTimeout()}]
+    <p class="totals">
+        <span class="item">
+            [{oxmultilang ident="EXPIRES_IN"}]
+            [{counter name="mini_basket_countdown_nr" assign="countdown_nr"}]
+        </span>
+        <strong class="price" id="countdown">[{$oViewConf->getBasketTimeLeft()|oxformattime}]</strong>
+    </p>
+    <hr>
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/minibasket/minibasket.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/minibasket/minibasket.tpl
@@ -0,0 +1,161 @@
+[{if $oxcmp_basket->getProductsCount() gte 5}]
+    [{assign var="blScrollable" value=true}]
+[{/if}]
+
+[{block name="widget_minibasket"}]
+    [{if $oxcmp_basket->getProductsCount()}]
+        [{oxhasrights ident="TOBASKET"}]
+            [{assign var="currency" value=$oView->getActCurrency()}]
+
+            [{if $_prefix == 'modal'}]
+                <div class="modal fade basketFlyout" id="basketModal" tabindex="-1" role="dialog" aria-labelledby="basketModalLabel" aria-hidden="true">
+                    <div class="modal-dialog">
+                        <div class="modal-content">
+                            [{block name="widget_minibasket_modal_header"}]
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal">
+                                    <span aria-hidden="true">&times;</span>
+                                    <span class="sr-only">[{oxmultilang ident="CLOSE"}]</span>
+                                </button>
+                                <h4 class="modal-title" id="basketModalLabel">[{$oxcmp_basket->getItemsCount()}] [{oxmultilang ident="ITEMS_IN_BASKET"}]</h4>
+                            </div>
+                            [{/block}]
+                            [{block name="widget_minibasket_modal_content"}]
+                            <div class="modal-body">
+                                [{if $oxcmp_basket->getProductsCount()}]
+                                    [{oxhasrights ident="TOBASKET"}]
+                                        <div id="[{$_prefix}]basketFlyout" class="basketFlyout">
+                                            <div class="">
+                                                <table class="table table-striped">
+                                                    <thead>
+                                                        <tr>
+                                                            <th>[{oxmultilang ident="DD_MINIBASKET_MODAL_TABLE_TITLE"}]</th>
+                                                            <th class="text-right">[{oxmultilang ident="DD_MINIBASKET_MODAL_TABLE_PRICE"}]</th>
+                                                        </tr>
+                                                    </thead>
+                                                    <tbody>
+                                                        [{foreach from=$oxcmp_basket->getContents() name=miniBasketList item=_product}]
+                                                            [{block name="widget_minibasket_product"}]
+                                                                [{assign var="minibasketItemTitle" value=$_product->getTitle()}]
+                                                                <tr>
+                                                                    <td>
+                                                                        <a href="[{$_product->getLink()}]" title="[{$minibasketItemTitle|strip_tags}]">
+                                                                            <span class="item">
+                                                                                [{if $_product->getAmount() > 1}]
+                                                                                    [{$_product->getAmount()}] &times;
+                                                                                [{/if}]
+                                                                                [{$minibasketItemTitle|strip_tags}]
+                                                                            </span>
+                                                                        </a>
+                                                                    </td>
+                                                                    <td class="text-right">
+                                                                        <strong class="price">[{oxprice price=$_product->getPrice() currency=$currency}] *</strong>
+                                                                    </td>
+                                                                </tr>
+                                                            [{/block}]
+                                                        [{/foreach}]
+                                                    </tbody>
+                                                    <tfoot>
+                                                        <tr>
+                                                            [{block name="widget_minibasket_total"}]
+                                                                <td><strong>[{oxmultilang ident="TOTAL"}]</strong></td>
+                                                                <td class="text-right">
+                                                                    <strong class="price">
+                                                                        [{if $oxcmp_basket->isPriceViewModeNetto()}]
+                                                                            [{oxprice price=$oxcmp_basket->getNettoSum() currency=$currency}]
+                                                                        [{else}]
+                                                                            [{oxprice price=$oxcmp_basket->getBruttoSum() currency=$currency}] *
+                                                                        [{/if}]
+                                                                    </strong>
+                                                                </td>
+                                                            [{/block}]
+                                                        </tr>
+                                                    </tfoot>
+                                                </table>
+                                            </div>
+                                            [{include file="widget/minibasket/countdown.tpl"}]
+                                        </div>
+                                    [{/oxhasrights}]
+                                [{/if}]
+                            </div>
+                            [{/block}]
+                            [{block name="widget_minibasket_modal_footer"}]
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-default" data-dismiss="modal">[{oxmultilang ident="DD_MINIBASKET_CONTINUE_SHOPPING"}]</button>
+                                <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=basket"}]" class="btn btn-primary" data-toggle="tooltip" data-placement="top" title="[{oxmultilang ident="DISPLAY_BASKET"}]">
+                                    <i class="fa fa-shopping-cart"></i>
+                                </a>
+                            </div>
+                            [{/block}]
+                        </div>
+                    </div>
+                </div>
+                [{oxscript add="$('#basketModal').modal('show');"}]
+            [{else}]
+                [{block name="dd_layout_page_header_icon_menu_minibasket_title"}]
+                    <p class="title">
+                        <strong>[{$oxcmp_basket->getItemsCount()}] [{oxmultilang ident="ITEMS_IN_BASKET"}]</strong>
+                    </p>
+                [{/block}]
+
+                <div id="[{$_prefix}]basketFlyout" class="basketFlyout[{if $blScrollable}] scrollable[{/if}]">
+                    [{block name="dd_layout_page_header_icon_menu_minibasket_table"}]
+                        <table class="table table-bordered table-striped">
+                            [{foreach from=$oxcmp_basket->getContents() name=miniBasketList item=_product}]
+                                [{block name="widget_minibasket_product"}]
+                                    [{assign var="minibasketItemTitle" value=$_product->getTitle()}]
+                                    <tr>
+                                        <td class="picture text-center">
+                                            <span class="badge">[{$_product->getAmount()}]</span>
+                                            <a href="[{$_product->getLink()}]" title="[{$minibasketItemTitle|strip_tags}]">
+                                                <img src="[{$_product->getIconUrl()}]" alt="[{$minibasketItemTitle|strip_tags}]"/>
+                                            </a>
+                                        </td>
+                                        <td class="title">
+                                            <a href="[{$_product->getLink()}]" title="[{$minibasketItemTitle|strip_tags}]">[{$minibasketItemTitle|strip_tags}]</a>
+                                        </td>
+                                        <td class="price text-right">[{oxprice price=$_product->getPrice() currency=$currency}]</td>
+                                    </tr>
+                                [{/block}]
+                            [{/foreach}]
+                            <tr>
+                                <td class="total_label" colspan="2">
+                                    <strong>[{oxmultilang ident="TOTAL"}]</strong>
+                                </td>
+                                <td class="total_price text-right">
+                                    <strong>
+                                        [{if $oxcmp_basket->isPriceViewModeNetto()}]
+                                            [{oxprice price=$oxcmp_basket->getNettoSum() currency=$currency}]
+                                        [{else}]
+                                            [{oxprice price=$oxcmp_basket->getBruttoSum() currency=$currency}]
+                                        [{/if}]
+                                    </strong>
+                                </td>
+                            </tr>
+                        </table>
+                        <div class="clearfix">
+                            [{block name="widget_minibasket_total"}][{/block}]
+                        </div>
+                    [{/block}]
+                </div>
+
+                [{include file="widget/minibasket/countdown.tpl"}]
+
+                [{block name="dd_layout_page_header_icon_menu_minibasket_functions"}]
+                    <p class="functions clear text-right">
+                        [{if $oxcmp_user}]
+                            <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=payment"}]" class="btn btn-primary">[{oxmultilang ident="CHECKOUT"}]</a>
+                        [{else}]
+                            <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=user"}]" class="btn btn-primary">[{oxmultilang ident="CHECKOUT"}]</a>
+                        [{/if}]
+                        <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=basket"}]" class="btn btn-default">[{oxmultilang ident="DISPLAY_BASKET"}]</a>
+                    </p>
+                [{/block}]
+            [{/if}]
+        [{/oxhasrights}]
+    [{else}]
+        [{block name="dd_layout_page_header_icon_menu_minibasket_alert_empty"}]
+            <div class="alert alert-info">[{oxmultilang ident="BASKET_EMPTY"}]</div>
+        [{/block}]
+    [{/if}]
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/minibasket/minibasketmodal.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/minibasket/minibasketmodal.tpl
@@ -0,0 +1,3 @@
+[{if $oxcmp_basket->isNewItemAdded() && $oView->getNewBasketItemMsgType() == 2}]
+    [{include file="widget/minibasket/minibasket.tpl" _prefix="modal"}]
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/minibasket/newbasketitemmsg.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/minibasket/newbasketitemmsg.tpl
@@ -0,0 +1,22 @@
+[{if $oxcmp_basket->getProductsCount() && $_newitem}]
+    [{assign var="blFullwidth" value=$oViewConf->getViewThemeParam('blFullwidthLayout')}]
+
+    [{oxhasrights ident="TOBASKET"}]
+        [{if $blFullwidth}]
+            <div class="container">
+        [{/if}]
+                <div class="alert alert-success" id="newItemMsg">
+                    [{block name="dd_widget_minibasket_new_item_msg"}]
+                        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                        <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=basket"}]" class="btn btn-default btn-xs pull-right" style="margin-right:15px;">
+                            <i class="fa fa-shopping-cart"></i> [{oxmultilang ident="DISPLAY_BASKET"}]
+                        </a>
+
+                        [{oxmultilang ident="NEW_BASKET_ITEM_MSG"}]
+                    [{/block}]
+                </div>
+        [{if $blFullwidth}]
+            </div>
+        [{/if}]
+    [{/oxhasrights}]
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/product/action.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/product/action.tpl
@@ -0,0 +1,4 @@
+[{ assign var="oActionProducts" value=$oView->getAction() }]
+[{ if $oActionProducts }]
+    [{include file="widget/product/list.tpl" type=$oView->getListType() head=$oView->getActionName() listId="articles" products=$oActionProducts showMainLink=true }]
+[{ /if }]
--- a/shop/source/Application/views/flow/tpl/widget/product/details.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/product/details.tpl
@@ -0,0 +1,6 @@
+[{include file="page/details/details.tpl" blWorkaroundInclude=true}]
+
+[{assign var="oDetailsProduct" value=$oView->getProduct()}]
+
+[{insert name="oxid_tracker" title="PRODUCT_DETAILS"|oxmultilangassign product=$oDetailsProduct cpath=$oView->getCatTreePath() }]
+[{oxscript widget=$oView->getClassName()}]
--- a/shop/source/Application/views/flow/tpl/widget/product/list.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/product/list.tpl
@@ -0,0 +1,82 @@
+[{if !$type}]
+    [{assign var="type" value="infogrid"}]
+[{/if}]
+
+[{if !$iProductsPerLine}]
+    [{assign var="iProductsPerLine" value=4}]
+[{/if}]
+
+[{if $type == 'infogrid'}]
+    [{assign var="iProductsPerLine" value=2}]
+[{elseif $type == 'grid'}]
+    [{assign var="iProductsPerLine" value=4}]
+[{elseif $type == 'line'}]
+    [{assign var="iProductsPerLine" value=1}]
+[{/if}]
+
+[{if !$testid }]
+    [{assign var=testid value=$oView->getViewParameter('testid')}]
+[{/if}]
+[{if !$listId }]
+    [{assign var=listId value=$oView->getViewParameter('listId')}]
+[{/if}]
+
+<div class="boxwrapper" id="boxwrapper_[{$listId}]">
+    [{if $head}]
+        [{if $header == "light"}]
+            <div class="page-header">
+                <span class="h3">[{$head}]</span>
+
+                [{if $subhead}]
+                    <small class="subhead">[{$subhead}]</small>
+                [{/if}]
+            </div>
+        [{else}]
+            <div class="page-header">
+                <h2>
+                    [{$head}]
+                    [{if $rsslink}]
+                        <a class="rss" id="[{$rssId}]" href="[{$rsslink.link}]" target="_blank">
+                            <i class="fa fa-rss"></i>
+                        </a>
+                    [{/if}]
+                </h2>
+
+                [{if $subhead}]
+                    <small class="subhead">[{$subhead}]</small>
+                [{/if}]
+            </div>
+        [{/if}]
+    [{/if}]
+
+    [{if $products && !empty($products)}]
+        [{assign var="productsCount" value=$products|@count}]
+        [{math equation="x / y" x=12 y=$iProductsPerLine assign="iColIdent"}]
+
+        <div class="list-container" id="[{$listId}]">
+            [{foreach from=$products item="_product" name="productlist"}]
+                [{counter print=false assign="productlistCounter"}]
+                [{assign var="testid" value=$listId|cat:"_"|cat:$smarty.foreach.productlist.iteration}]
+
+                [{if $productlistCounter == 1}]
+                    <div class="row [{$type}]View newItems">
+                [{/if}]
+
+                <div class="productData col-xs-12[{if $type != 'line'}] col-sm-6 col-md-[{$iColIdent}][{/if}] productBox">
+                    [{oxid_include_widget cl="oxwArticleBox" _parent=$oView->getClassName() nocookie=1 _navurlparams=$oViewConf->getNavUrlParams() iLinkType=$_product->getLinkType() _object=$_product anid=$_product->getId() sWidgetType=product sListType=listitem_$type iIndex=$testid blDisableToCart=$blDisableToCart isVatIncluded=$oView->isVatIncluded() showMainLink=$showMainLink recommid=$recommid owishid=$owishid toBasketFunction=$toBasketFunction removeFunction=$removeFunction altproduct=$altproduct inlist=$_product->isInList() skipESIforUser=1 testid=$testid}]
+                </div>
+
+                [{if $productlistCounter%$iProductsPerLine == 0 || $productsCount == $productlistCounter}]
+                    </div>
+                [{/if}]
+
+                [{if $productlistCounter%$iProductsPerLine == 0 && $productsCount > $productlistCounter}]
+                    <div class="row [{$type}]View newItems">
+                [{/if}]
+            [{/foreach}]
+
+            [{* Counter resetten *}]
+            [{counter print=false assign="productlistCounter" start=0}]
+        </div>
+    [{/if}]
+</div>
--- a/shop/source/Application/views/flow/tpl/widget/product/listitem_grid.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/product/listitem_grid.tpl
@@ -0,0 +1,146 @@
+[{block name="widget_product_listitem_grid"}]
+    [{assign var="product"         value=$oView->getProduct()}]
+    [{assign var="blDisableToCart" value=$oView->getDisableToCart()}]
+    [{assign var="iIndex"          value=$oView->getIndex()}]
+    [{assign var="showMainLink"    value=$oView->getShowMainLink()}]
+
+    [{assign var="currency" value=$oView->getActCurrency()}]
+    [{if $showMainLink}]
+        [{assign var='_productLink' value=$product->getMainLink()}]
+    [{else}]
+        [{assign var='_productLink' value=$product->getLink()}]
+    [{/if}]
+    [{assign var="aVariantSelections" value=$product->getVariantSelections(null,null,1)}]
+    [{assign var="blShowToBasket" value=true}] [{* tobasket or more info ? *}]
+    [{if $blDisableToCart || $product->isNotBuyable() || ($aVariantSelections&&$aVariantSelections.selections) || $product->hasMdVariants() || ($oViewConf->showSelectListsInList() && $product->getSelections(1)) || $product->getVariants()}]
+        [{assign var="blShowToBasket" value=false}]
+    [{/if}]
+
+    [{if !$testid }]
+        [{assign var=testid value=$oView->getViewParameter('testid')}]
+    [{/if}]
+    [{if !$listId }]
+        [{assign var=listId value=$oView->getViewParameter('listId')}]
+    [{/if}]
+
+    <form name="tobasket[{$testid}]" [{if $blShowToBasket}]action="[{$oViewConf->getSelfActionLink()}]" method="post"[{else}]action="[{$_productLink}]" method="get"[{/if}]>
+        <div class="hidden">
+            [{$oViewConf->getNavFormParams()}]
+            [{$oViewConf->getHiddenSid()}]
+            <input type="hidden" name="pgNr" value="[{$oView->getActPage()}]">
+            [{if $recommid}]
+                <input type="hidden" name="recommid" value="[{$recommid}]">
+            [{/if}]
+            [{if $blShowToBasket}]
+            [{oxhasrights ident="TOBASKET"}]
+                <input type="hidden" name="cl" value="[{$oViewConf->getTopActiveClassName()}]">
+                [{if $owishid}]
+                    <input type="hidden" name="owishid" value="[{$owishid}]">
+                [{/if}]
+                [{if $toBasketFunction}]
+                    <input type="hidden" name="fnc" value="[{$toBasketFunction}]">
+                [{else}]
+                    <input type="hidden" name="fnc" value="tobasket">
+                [{/if}]
+                <input type="hidden" name="aid" value="[{$product->oxarticles__oxid->value}]">
+                [{if $altproduct}]
+                    <input type="hidden" name="anid" value="[{$altproduct}]">
+                [{else}]
+                    <input type="hidden" name="anid" value="[{$product->oxarticles__oxnid->value}]">
+                [{/if}]
+                <input type="hidden" name="am" value="1">
+            [{/oxhasrights}]
+            [{else}]
+                <input type="hidden" name="cl" value="details">
+                <input type="hidden" name="anid" value="[{$product->oxarticles__oxnid->value}]">
+            [{/if}]
+        </div>
+
+        [{block name="widget_product_listitem_infogrid_gridpicture"}]
+        <div class="picture text-center">
+            <a href="[{$_productLink}]" title="[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]">
+                <img src="[{$oViewConf->getImageUrl('spinner.gif')}]" data-src="[{$product->getThumbnailUrl()}]" alt="[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]" class="img-responsive">
+            </a>
+        </div>
+        [{/block}]
+
+        <div class="listDetails text-center">
+            [{block name="widget_product_listitem_infogrid_titlebox"}]
+                <div class="title">
+                    <a id="[{$testid}]" href="[{$_productLink}]" class="title" title="[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]">
+                        <span>[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]</span>
+                    </a>
+                </div>
+            [{/block}]
+
+            <div class="price text-center">
+                <div class="content">
+                    [{block name="widget_product_listitem_grid_price"}]
+                        [{oxhasrights ident="SHOWARTICLEPRICE"}]
+                            [{assign var="oUnitPrice" value=$product->getUnitPrice()}]
+                            [{assign var="tprice"     value=$product->getTPrice()}]
+                            [{assign var="price"      value=$product->getPrice()}]
+
+                            [{if $tprice && $tprice->getBruttoPrice() > $price->getBruttoPrice()}]
+                                <span class="oldPrice text-muted">
+                                    <del>[{$product->getFTPrice()}] [{$currency->sign}]</del>
+                                </span>
+                            [{/if}]
+
+                            [{block name="widget_product_listitem_grid_price_value"}]
+                                [{if $product->getFPrice()}]
+                                    <span class="lead text-nowrap">
+                                        [{if $product->isRangePrice()}]
+                                            [{oxmultilang ident="PRICE_FROM"}]
+                                            [{if !$product->isParentNotBuyable()}]
+                                                [{$product->getFMinPrice()}]
+                                            [{else}]
+                                                [{$product->getFVarMinPrice()}]
+                                            [{/if}]
+                                        [{else}]
+                                            [{if !$product->isParentNotBuyable()}]
+                                                [{$product->getFPrice()}]
+                                            [{else}]
+                                                [{$product->getFVarMinPrice()}]
+                                            [{/if}]
+                                        [{/if}]
+                                        [{$currency->sign}]
+                                        [{if $oView->isVatIncluded()}]
+                                             [{if !($product->hasMdVariants() || ($oViewConf->showSelectListsInList() && $product->getSelections(1)) || $product->getVariants())}]*[{/if}]
+                                        [{/if}]
+                                    </span>
+                                [{/if}]
+                            [{/block}]
+                            [{if $oUnitPrice}]
+                                <span id="productPricePerUnit_[{$testid}]" class="pricePerUnit">
+                                    [{$product->oxarticles__oxunitquantity->value}] [{$product->getUnitName()}] | [{oxprice price=$oUnitPrice currency=$currency}]/[{$product->getUnitName()}]
+                                </span>
+                            [{elseif $product->oxarticles__oxweight->value }]
+                                <span id="productPricePerUnit_[{$testid}]" class="pricePerUnit">
+                                    <span title="weight">[{oxmultilang ident="WEIGHT"}]</span>
+                                    <span class="value">[{$product->oxarticles__oxweight->value}] [{oxmultilang ident="KG"}]</span>
+                                </span>
+                            [{/if}]
+                        [{/oxhasrights}]
+                    [{/block}]
+                </div>
+            </div>
+            [{block name="widget_product_listitem_grid_tobasket"}]
+                <div class="actions text-center">
+                    <div class="btn-group">
+                        [{if $blShowToBasket}]
+                            [{oxhasrights ident="TOBASKET"}]
+                                <button type="submit" class="btn btn-default hasTooltip" data-placement="bottom" title="[{oxmultilang ident="TO_CART"}]" data-container="body">
+                                    <i class="fa fa-shopping-cart"></i>
+                                </button>
+                            [{/oxhasrights}]
+                            <a class="btn btn-primary" href="[{$_productLink}]" >[{oxmultilang ident="MORE_INFO"}]</a>
+                        [{else}]
+                            <a class="btn btn-primary" href="[{$_productLink}]" >[{oxmultilang ident="MORE_INFO"}]</a>
+                        [{/if}]
+                    </div>
+                </div>
+            [{/block}]
+        </div>
+    </form>
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/product/listitem_infogrid.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/product/listitem_infogrid.tpl
@@ -0,0 +1,176 @@
+[{block name="widget_product_listitem_infogrid"}]
+    [{assign var="product"         value=$oView->getProduct()}]
+    [{assign var="blDisableToCart" value=$oView->getDisableToCart()}]
+    [{assign var="iIndex"          value=$oView->getIndex()}]
+    [{assign var="showMainLink"    value=$oView->getShowMainLink()}]
+
+    [{assign var="currency" value=$oView->getActCurrency()}]
+    [{if $showMainLink}]
+        [{assign var='_productLink' value=$product->getMainLink()}]
+    [{else}]
+        [{assign var='_productLink' value=$product->getLink()}]
+    [{/if}]
+    [{assign var="aVariantSelections" value=$product->getVariantSelections(null,null,1)}]
+    [{assign var="blShowToBasket" value=true}] [{* tobasket or more info ? *}]
+    [{if $blDisableToCart || $product->isNotBuyable() || ($aVariantSelections&&$aVariantSelections.selections) || $product->hasMdVariants() || ($oViewConf->showSelectListsInList() && $product->getSelections(1)) || $product->getVariants()}]
+        [{assign var="blShowToBasket" value=false}]
+    [{/if}]
+
+    [{if !$testid }]
+       [{assign var=testid value=$oView->getViewParameter('testid')}]
+    [{/if}]
+    [{if !$listId }]
+        [{assign var=listId value=$oView->getViewParameter('listId')}]
+    [{/if}]
+
+    <form name="tobasket[{$testid}]" [{if $blShowToBasket}]action="[{$oViewConf->getSelfActionLink()}]" method="post"[{else}]action="[{$_productLink}]" method="get"[{/if}]>
+        <div class="hidden">
+            [{$oViewConf->getNavFormParams()}]
+            [{$oViewConf->getHiddenSid()}]
+            <input type="hidden" name="pgNr" value="[{$oView->getActPage()}]">
+            [{if $recommid}]
+                <input type="hidden" name="recommid" value="[{$recommid}]">
+            [{/if}]
+            [{if $blShowToBasket}]
+                [{oxhasrights ident="TOBASKET"}]
+                    <input type="hidden" name="cl" value="[{$oViewConf->getTopActiveClassName()}]">
+                [{if $owishid}]
+                    <input type="hidden" name="owishid" value="[{$owishid}]">
+                [{/if}]
+                [{if $toBasketFunction}]
+                    <input type="hidden" name="fnc" value="[{$toBasketFunction}]">
+                [{else}]
+                    <input type="hidden" name="fnc" value="tobasket">
+                [{/if}]
+                    <input type="hidden" name="aid" value="[{$product->oxarticles__oxid->value}]">
+                [{if $altproduct}]
+                    <input type="hidden" name="anid" value="[{$altproduct}]">
+                [{else}]
+                    <input type="hidden" name="anid" value="[{$product->oxarticles__oxnid->value}]">
+                [{/if}]
+                    <input type="hidden" name="am" value="1">
+                [{/oxhasrights}]
+            [{else}]
+                <input type="hidden" name="cl" value="details">
+                <input type="hidden" name="anid" value="[{$product->oxarticles__oxnid->value}]">
+            [{/if}]
+        </div>
+
+        <div class="row">
+            <div class="col-xs-12 col-md-5">
+                [{block name="widget_product_listitem_infogrid_gridpicture"}]
+                    <div class="picture text-center">
+                        <a href="[{$_productLink}]" title="[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]">
+                            <img src="[{$oViewConf->getImageUrl('spinner.gif')}]" data-src="[{$product->getThumbnailUrl()}]" alt="[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]" class="img-responsive">
+                        </a>
+                    </div>
+                [{/block}]
+            </div>
+            <div class="col-xs-12 col-md-7">
+                <div class="listDetails">
+                    [{block name="widget_product_listitem_infogrid_titlebox"}]
+                        <div class="title">
+                            <a id="[{$testid}]" href="[{$_productLink}]" class="title" title="[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]">
+                                <span>[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]</span>
+                            </a>
+                        </div>
+                    [{/block}]
+
+                    [{block name="widget_product_listitem_infogrid_shortdesc"}]
+                        <div class="shortdesc">
+                            [{$product->oxarticles__oxshortdesc->rawValue}]
+                        </div>
+                    [{/block}]
+
+                    [{block name="widget_product_listitem_infogrid_selections"}]
+                        [{if $aVariantSelections && $aVariantSelections.selections }]
+                            <div id="variantselector_[{$iIndex}]" class="selectorsBox js-fnSubmit clear">
+                                [{foreach from=$aVariantSelections.selections item=oSelectionList key=iKey}]
+                                    [{include file="widget/product/selectbox.tpl" oSelectionList=$oSelectionList sJsAction="js-fnSubmit" blHideLabel=true}]
+                                [{/foreach}]
+                            </div>
+                        [{elseif $oViewConf->showSelectListsInList()}]
+                            [{assign var="oSelections" value=$product->getSelections(1)}]
+                            [{if $oSelections}]
+                                <div id="selectlistsselector_[{$iIndex}]" class="selectorsBox js-fnSubmit clear">
+                                    [{foreach from=$oSelections item=oList name=selections}]
+                                        [{include file="widget/product/selectbox.tpl" oSelectionList=$oList sFieldName="sel" iKey=$smarty.foreach.selections.index blHideDefault=true sSelType="seldrop" sJsAction="js-fnSubmit" blHideLabel=true}]
+                                    [{/foreach}]
+                                </div>
+                            [{/if}]
+                        [{/if}]
+                    [{/block}]
+
+                    <div class="price">
+                        <div class="content">
+                            [{block name="widget_product_listitem_infogrid_price"}]
+                                [{oxhasrights ident="SHOWARTICLEPRICE"}]
+                                    [{assign var="oUnitPrice" value=$product->getUnitPrice()}]
+                                    [{assign var="tprice"     value=$product->getTPrice()}]
+                                    [{assign var="price"      value=$product->getPrice()}]
+
+                                    [{if $tprice && $tprice->getBruttoPrice() > $price->getBruttoPrice()}]
+                                        <span class="oldPrice text-muted">
+                                            <del>[{$product->getFTPrice()}] [{$currency->sign}]</del>
+                                        </span>
+                                    [{/if}]
+
+                                    [{block name="widget_product_listitem_infogrid_price_value"}]
+                                        [{if $product->getFPrice()}]
+                                            <span class="lead text-nowrap">
+                                            [{if $product->isRangePrice()}]
+                                                [{oxmultilang ident="PRICE_FROM"}]
+                                                [{if !$product->isParentNotBuyable()}]
+                                                    [{$product->getFMinPrice()}]
+                                                [{else}]
+                                                    [{$product->getFVarMinPrice()}]
+                                                [{/if}]
+                                            [{else}]
+                                                [{if !$product->isParentNotBuyable()}]
+                                                    [{$product->getFPrice()}]
+                                                [{else}]
+                                                    [{$product->getFVarMinPrice()}]
+                                                [{/if}]
+                                            [{/if}]
+                                            [{$currency->sign}]
+                                            [{if $oView->isVatIncluded()}]
+                                                [{if !($product->hasMdVariants() || ($oViewConf->showSelectListsInList() && $product->getSelections(1)) || $product->getVariants())}]*[{/if}]
+                                            [{/if}]
+                                        </span>
+                                        [{/if}]
+                                    [{/block}]
+                                    [{if $oUnitPrice}]
+                                        <span id="productPricePerUnit_[{$testid}]" class="pricePerUnit">
+                                            [{$product->oxarticles__oxunitquantity->value}] [{$product->getUnitName()}] | [{oxprice price=$oUnitPrice currency=$currency}]/[{$product->getUnitName()}]
+                                        </span>
+                                    [{elseif $product->oxarticles__oxweight->value }]
+                                        <span id="productPricePerUnit_[{$testid}]" class="pricePerUnit">
+                                            <span title="weight">[{oxmultilang ident="WEIGHT"}]</span>
+                                            <span class="value">[{$product->oxarticles__oxweight->value}] [{oxmultilang ident="KG"}]</span>
+                                        </span>
+                                    [{/if}]
+                                [{/oxhasrights}]
+                            [{/block}]
+                        </div>
+                    </div>
+                    [{block name="widget_product_listitem_infogrid_tobasket"}]
+                        <div class="actions">
+                            <div class="btn-group">
+                                [{if $blShowToBasket}]
+                                    [{oxhasrights ident="TOBASKET"}]
+                                        <button type="submit" class="btn btn-default hasTooltip" data-placement="bottom" title="[{oxmultilang ident="TO_CART"}]" data-container="body">
+                                            <i class="fa fa-shopping-cart"></i>
+                                        </button>
+                                    [{/oxhasrights}]
+                                    <a class="btn btn-primary" href="[{$_productLink}]" >[{oxmultilang ident="MORE_INFO"}]</a>
+                                [{else}]
+                                    <a class="btn btn-primary" href="[{$_productLink}]" >[{oxmultilang ident="MORE_INFO"}]</a>
+                                [{/if}]
+                            </div>
+                        </div>
+                    [{/block}]
+                </div>
+            </div>
+        </div>
+    </form>
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/product/listitem_line.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/product/listitem_line.tpl
@@ -0,0 +1,232 @@
+[{block name="widget_product_listitem_line"}]
+    [{assign var="product"         value=$oView->getProduct()}]
+    [{assign var="blDisableToCart" value=$oView->getDisableToCart()}]
+    [{assign var="iIndex"          value=$oView->getIndex()}]
+    [{assign var="showMainLink"    value=$oView->getShowMainLink()}]
+
+    [{assign var="currency" value=$oView->getActCurrency()}]
+    [{if $showMainLink}]
+        [{assign var='_productLink' value=$product->getMainLink()}]
+    [{else}]
+        [{assign var='_productLink' value=$product->getLink()}]
+    [{/if}]
+    [{assign var="aVariantSelections" value=$product->getVariantSelections(null,null,1)}]
+    [{assign var="blShowToBasket" value=true}] [{* tobasket or more info ? *}]
+    [{if $blDisableToCart || $product->isNotBuyable()||($aVariantSelections&&$aVariantSelections.selections)||$product->getVariants()||($oViewConf->showSelectListsInList()&&$product->getSelections(1))}]
+        [{assign var="blShowToBasket" value=false}]
+    [{/if}]
+
+    [{if !$testid }]
+        [{assign var=testid value=$oView->getViewParameter('testid')}]
+    [{/if}]
+    [{if !$listId }]
+         [{assign var=listId value=$oView->getViewParameter('listId')}]
+    [{/if}]
+
+    [{oxscript include="js/widgets/oxlistremovebutton.min.js" priority=10}]
+    [{oxscript add="$('button.removeButton').oxListRemoveButton();"}]
+
+    <form name="tobasket.[{$testid}]" [{if $blShowToBasket}]action="[{$oViewConf->getSelfActionLink()}]" method="post"[{else}]action="[{$_productLink}]" method="get"[{/if}]  class="js-oxProductForm">
+        <div class="hidden">
+            [{$oViewConf->getNavFormParams()}]
+            [{$oViewConf->getHiddenSid()}]
+            <input type="hidden" name="pgNr" value="[{$oView->getActPage()}]">
+            [{if $recommid}]
+                <input type="hidden" name="recommid" value="[{$recommid}]">
+            [{/if}]
+            [{if $blShowToBasket}]
+                [{oxhasrights ident="TOBASKET"}]
+                    <input type="hidden" name="cl" value="[{$oViewConf->getTopActiveClassName()}]">
+                    [{if $owishid}]
+                        <input type="hidden" name="owishid" value="[{$owishid}]">
+                    [{/if}]
+                    [{if $toBasketFunction}]
+                        <input type="hidden" name="fnc" value="[{$toBasketFunction}]">
+                    [{else}]
+                        <input type="hidden" name="fnc" value="tobasket">
+                    [{/if}]
+                    <input type="hidden" name="aid" value="[{$product->oxarticles__oxid->value}]">
+                    [{if $altproduct}]
+                        <input type="hidden" name="anid" value="[{$altproduct}]">
+                    [{else}]
+                        <input type="hidden" name="anid" value="[{$product->oxarticles__oxnid->value}]">
+                    [{/if}]
+                    <input id="am_[{$testid}]" type="hidden" name="am" value="1">
+                [{/oxhasrights}]
+            [{else}]
+                <input type="hidden" name="cl" value="details">
+                <input type="hidden" name="anid" value="[{$product->oxarticles__oxnid->value}]">
+            [{/if}]
+        </div>
+
+        <div class="row listDetails">
+            <div class="col-xs-12 col-sm-2">
+                <div class="picture">
+                    [{block name="widget_product_listitem_line_picturebox"}]
+                        <a id="[{$testid}]" href="[{$_productLink}]" title="[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]">
+                            <img src="[{$oViewConf->getImageUrl('spinner.gif')}]" data-src="[{$product->getThumbnailUrl()}]" alt="[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]" class="img-responsive">
+                        </a>
+                    [{/block}]
+                </div>
+            </div>
+            <div class="col-xs-6 col-sm-4">
+                [{block name="widget_product_listitem_line_titlebox"}]
+                    <div class="title">
+                        <a id="[{$testid}]" href="[{$_productLink}]" title="[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]">[{$product->oxarticles__oxtitle->value}] [{$product->oxarticles__oxvarselect->value}]</a>
+                    </div>
+                [{/block}]
+
+                [{block name="widget_product_listitem_line_description"}]
+                    <div class="description">
+                        [{if $recommid}]
+                            <p>[{$product->text}]</p>
+                        [{else}]
+                            [{oxhasrights ident="SHOWSHORTDESCRIPTION"}]
+                                [{$product->oxarticles__oxshortdesc->rawValue}]
+                            [{/oxhasrights}]
+                        [{/if}]
+                    </div>
+                [{/block}]
+            </div>
+            <div class="col-xs-3 hidden-xs">
+                [{block name="widget_product_listitem_line_attributes"}]
+                    <div class="attributes">
+                        [{assign var="oAttributes" value=$product->getAttributes()}]
+                        [{if $oAttributes|@count}]
+                            <strong>[{oxmultilang ident="SPECIFICATION"}]</strong>
+                            <ul class="list-unstyled attributes small">
+                                [{foreach from=$oAttributes item="oAttr" name="attribute"}]
+                                    <li>
+                                        <strong>[{$oAttr->oxattribute__oxtitle->value}][{oxmultilang ident="COLON"}]</strong>
+                                        <span>[{$oAttr->oxattribute__oxvalue->value}]</span>
+                                    </li>
+                                [{/foreach}]
+                            </ul>
+                        [{/if}]
+                    </div>
+                [{/block}]
+            </div>
+            <div class="col-xs-4 col-sm-3">
+                <div class="functions text-right">
+                    [{block name="widget_product_listitem_line_price"}]
+                        [{oxhasrights ident="SHOWARTICLEPRICE"}]
+                        [{assign var="oUnitPrice" value=$product->getUnitPrice()}]
+                        [{assign var="tprice"     value=$product->getTPrice()}]
+                        [{assign var="price"      value=$product->getPrice()}]
+
+                        [{if $tprice && $tprice->getBruttoPrice() > $price->getBruttoPrice()}]
+                            <span class="oldPrice text-muted">
+                                <del>[{$product->getFTPrice()}] [{$currency->sign}]</del>
+                            </span>
+                            <br/>
+                        [{/if}]
+
+                        [{block name="widget_product_listitem_line_price_value"}]
+                            <span id="productPrice_[{$testid}]" class="lead price text-nowrap">
+                                [{if $product->isRangePrice()}]
+                                    [{oxmultilang ident="PRICE_FROM"}]
+                                    [{if !$product->isParentNotBuyable()}]
+                                        [{$product->getFMinPrice()}]
+                                    [{else}]
+                                        [{$product->getFVarMinPrice()}]
+                                    [{/if}]
+                                [{else}]
+                                    [{if !$product->isParentNotBuyable()}]
+                                        [{$product->getFPrice()}]
+                                    [{else}]
+                                        [{$product->getFVarMinPrice()}]
+                                    [{/if}]
+                                [{/if}]
+                                [{$currency->sign}]
+                                [{if $oView->isVatIncluded()}]
+                                    [{if !($product->hasMdVariants() || ($oViewConf->showSelectListsInList() && $product->getSelections(1)) || $product->getVariants())}]*[{/if}]
+                                [{/if}]
+                            </span><br/>
+                        [{/block}]
+
+                        [{if $oUnitPrice}]
+                            <span id="productPricePerUnit_[{$testid}]" class="pricePerUnit text-nowrap">[{$product->oxarticles__oxunitquantity->value}] [{$product->getUnitName()}] | [{oxprice price=$oUnitPrice currency=$currency}]/[{$product->getUnitName()}]</span>
+                        [{elseif $product->oxarticles__oxweight->value }]
+                            <span id="productPricePerUnit_[{$testid}]" class="pricePerUnit text-nowrap">
+                                <span title="weight">[{oxmultilang ident="WEIGHT"}]</span>
+                                <span class="value">[{$product->oxarticles__oxweight->value}] [{oxmultilang ident="KG"}]</span>
+                            </span>
+                        [{/if}]
+                        [{/oxhasrights}]
+                    [{/block}]
+
+                    [{if $product->loadAmountPriceInfo()}]
+                        <div class="form-group">
+                            [{include file="page/details/inc/priceinfo.tpl" oDetailsProduct=$product}]
+                        </div>
+                    [{/if}]
+
+                    [{block name="widget_product_listitem_line_selections"}]
+                        [{if $aVariantSelections && $aVariantSelections.selections }]
+                            <div id="variantselector_[{$iIndex}]" class="selectorsBox js-fnSubmit clear">
+                                [{foreach from=$aVariantSelections.selections item=oSelectionList key=iKey}]
+                                    [{include file="widget/product/selectbox.tpl" oSelectionList=$oSelectionList sJsAction="js-fnSubmit" blHideLabel=true}]
+                                [{/foreach}]
+                            </div>
+                        [{elseif $oViewConf->showSelectListsInList()}]
+                            [{assign var="oSelections" value=$product->getSelections(1)}]
+                            [{if $oSelections}]
+                                <div id="selectlistsselector_[{$iIndex}]" class="selectorsBox js-fnSubmit clear">
+                                    [{foreach from=$oSelections item=oList name=selections}]
+                                        [{include file="widget/product/selectbox.tpl" oSelectionList=$oList sFieldName="sel" iKey=$smarty.foreach.selections.index blHideDefault=true sSelType="seldrop" sJsAction="js-fnSubmit" blHideLabel=true}]
+                                    [{/foreach}]
+                                </div>
+                            [{/if}]
+                        [{/if}]
+                    [{/block}]
+
+                    [{block name="widget_product_listitem_line_tobasket"}]
+                        [{if $blShowToBasket}]
+                            [{oxhasrights ident="TOBASKET"}]
+                                <div class="form-group">
+                                    <div class="input-group">
+                                        <input id="amountToBasket_[{$testid}]" type="text" name="am" value="1" size="3" autocomplete="off" class="form-control amount">
+                                        <span class="input-group-btn">
+                                            <button id="toBasket_[{$testid}]" type="submit" class="btn btn-primary hasTooltip" title="[{oxmultilang ident="TO_CART"}]" data-container="body">
+                                                <i class="fa fa-shopping-cart"></i>
+                                            </button>
+                                            [{if $removeFunction && (($owishid && ($owishid==$oxcmp_user->oxuser__oxid->value)) || (($wishid==$oxcmp_user->oxuser__oxid->value)) || $recommid)}]
+                                                <button triggerForm="remove_[{$removeFunction}][{$testid}]" type="submit" class="btn btn-danger removeButton hasTooltip" title="[{oxmultilang ident="REMOVE"}]">
+                                                    <i class="fa fa-times"></i>
+                                                </button>
+                                            [{/if}]
+                                        </span>
+                                    </div>
+                                </div>
+                            [{/oxhasrights}]
+                        [{else}]
+                            <a class="btn btn-primary" href="[{$_productLink}]" >[{oxmultilang ident="MORE_INFO"}]</a>
+
+                            [{if $removeFunction && (($owishid && ($owishid==$oxcmp_user->oxuser__oxid->value)) || (($wishid==$oxcmp_user->oxuser__oxid->value)) || $recommid)}]
+                                <button triggerForm="remove_[{$removeFunction}][{$testid}]" type="submit" class="btn btn-danger btn-block removeButton">
+                                    <i class="fa fa-times"></i> [{oxmultilang ident="REMOVE"}]
+                                </button>
+                            [{/if}]
+                        [{/if}]
+                    [{/block}]
+                </div>
+            </div>
+        </div>
+    </form>
+
+    [{if $removeFunction && (($owishid && ($owishid==$oxcmp_user->oxuser__oxid->value)) || (($wishid==$oxcmp_user->oxuser__oxid->value)) || $recommid)}]
+        <form action="[{$oViewConf->getSelfActionLink()}]" method="post" id="remove_[{$removeFunction}][{$testid}]" class="hidden">
+            <div>
+                [{$oViewConf->getHiddenSid()}]
+                <input type="hidden" name="cl" value="[{$oViewConf->getTopActiveClassName()}]">
+                <input type="hidden" name="fnc" value="[{$removeFunction}]">
+                <input type="hidden" name="aid" value="[{$product->oxarticles__oxid->value}]">
+                <input type="hidden" name="am" value="0">
+                <input type="hidden" name="itmid" value="[{$product->getItemKey()}]">
+                [{if $recommid}]
+                    <input type="hidden" name="recommid" value="[{$recommid}]">
+                [{/if}]
+            </div>
+        </form>
+    [{/if}]
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/product/selectbox.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/product/selectbox.tpl
@@ -0,0 +1,48 @@
+[{assign var="oSelections" value=$oSelectionList->getSelections()}]
+
+[{if $oSelections}]
+    <div class="selectbox dropDown">
+        [{if !$blHideLabel}]
+            <p class="variant-label"><strong>[{$oSelectionList->getLabel()}][{oxmultilang ident="COLON"}]</strong></p>
+        [{/if}]
+        <div class="dropdown-wrapper">
+            <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
+                [{assign var="oActiveSelection" value=$oSelectionList->getActiveSelection()}]
+                [{if $oActiveSelection}]
+                    <span class="pull-left">[{$oActiveSelection->getName()}]</span>
+                [{elseif !$blHideDefault}]
+                    <span class="pull-left">
+                        [{if $sFieldName == "sel"}]
+                            [{oxmultilang ident="PLEASE_CHOOSE"}]
+                        [{else}]
+                            [{$oSelectionList->getLabel()}] [{oxmultilang ident="CHOOSE_VARIANT"}]
+                        [{/if}]
+                    </span>
+                [{/if}]
+
+                <i class="fa fa-angle-down pull-right"></i>
+            </button>
+            [{if $editable !== false}]
+                <input type="hidden" name="[{$sFieldName|default:"varselid"}][[{$iKey}]]" value="[{if $oActiveSelection}][{$oActiveSelection->getValue()}][{/if}]">
+                <ul class="dropdown-menu [{$sJsAction}][{if $sFieldName != "sel"}] vardrop[{/if}]" role="menu">
+                    [{if $oActiveSelection && !$blHideDefault}]
+                        <li>
+                            <a href="#" rel="">
+                                [{if $sFieldName == "sel"}]
+                                    [{oxmultilang ident="PLEASE_CHOOSE"}]
+                                [{else}]
+                                    [{oxmultilang ident="CHOOSE_VARIANT"}]
+                                [{/if}]
+                            </a>
+                        </li>
+                    [{/if}]
+                    [{foreach from=$oSelections item=oSelection}]
+                        <li class="[{if $oSelection->isDisabled()}]disabled js-disabled[{/if}]">
+                            <a href="[{$oSelection->getLink()}]" data-selection-id="[{$oSelection->getValue()}]" class="[{if $oSelection->isActive()}]active[{/if}]">[{$oSelection->getName()}]</a>
+                        </li>
+                    [{/foreach}]
+                </ul>
+            [{/if}]
+        </div>
+    </div>
+[{/if}]
--- a/shop/source/Application/views/flow/tpl/widget/promoslider.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/promoslider.tpl
@@ -0,0 +1,54 @@
+[{block name="dd_widget_promoslider"}]
+    [{assign var="oBanners" value=$oView->getBanners()}]
+    [{assign var="currency" value=$oView->getActCurrency()}]
+    [{assign var="blFullwidth" value=$oViewConf->getViewThemeParam('blFullwidthLayout')}]
+
+    [{if $oBanners|@count}]
+        [{oxscript include="js/libs/jquery.flexslider.min.js" priority=2}]
+        [{oxstyle include="css/libs/jquery.flexslider.min.css"}]
+
+        [{if $blFullwidth}]
+            <div class="col-xs-12">
+        [{/if}]
+
+        <div id="promo-carousel" class="flexslider">
+            <ul class="slides">
+                [{block name="dd_widget_promoslider_list"}]
+                    [{foreach from=$oBanners key="iPicNr" item="oBanner" name="promoslider"}]
+                        [{assign var="oArticle" value=$oBanner->getBannerArticle()}]
+                        [{assign var="sBannerPictureUrl" value=$oBanner->getBannerPictureUrl()}]
+                        [{if $sBannerPictureUrl}]
+                            <li class="item">
+                                [{assign var="sBannerLink" value=$oBanner->getBannerLink()}]
+                                [{if $sBannerLink}]
+                                    <a href="[{$sBannerLink}]" title="[{$oBanner->oxactions__oxtitle->value}]">
+                                [{/if}]
+
+                                <img src="[{$sBannerPictureUrl}]" alt="[{$oBanner->oxactions__oxtitle->value}]" title="[{$oBanner->oxactions__oxtitle->value}]">
+
+                                [{if $sBannerLink}]
+                                    </a>
+                                [{/if}]
+                                [{if $oViewConf->getViewThemeParam('blSliderShowImageCaption') && $oArticle}]
+                                    <p class="flex-caption">
+                                        [{if $sBannerLink}]
+                                            <a href="[{$sBannerLink}]" title="[{$oBanner->oxactions__oxtitle->value}]">
+                                        [{/if}]
+                                        <span class="title">[{$oArticle->oxarticles__oxtitle->value}]</span>[{if $oArticle->oxarticles__oxshortdesc->value|trim}]<br/><span class="shortdesc">[{$oArticle->oxarticles__oxshortdesc->value|trim}]</span>[{/if}]
+                                        [{if $sBannerLink}]
+                                            </a>
+                                        [{/if}]
+                                    </p>
+                                [{/if}]
+                            </li>
+                        [{/if}]
+                    [{/foreach}]
+                [{/block}]
+            </ul>
+        </div>
+
+        [{if $blFullwidth}]
+            </div>
+        [{/if}]
+    [{/if}]
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/reviews/rating.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/reviews/rating.tpl
@@ -0,0 +1,57 @@
+<div>
+    [{assign var="iRatingValue" value=$oView->getRatingValue()}]
+
+    [{if $iRatingValue}][{strip}]
+    <div class="hidden" itemtype="http://schema.org/AggregateRating" itemscope="" itemprop="aggregateRating">
+        <span itemprop="worstRating">1</span>
+        <span itemprop="bestRating ">5</span>
+        <span itemprop="ratingValue">[{$iRatingValue}]</span>
+        <span itemprop="reviewCount">[{$oView->getRatingCount()}]</span>
+    </div>
+    [{/strip}][{/if}]
+
+    [{if !$oxcmp_user}]
+        [{assign var="_star_title" value="MESSAGE_LOGIN_TO_RATE"|oxmultilangassign}]
+    [{elseif !$oView->canRate()}]
+        [{assign var="_star_title" value="MESSAGE_ALREADY_RATED"|oxmultilangassign}]
+    [{else}]
+        [{assign var="_star_title" value="MESSAGE_RATE_THIS_ARTICLE"|oxmultilangassign}]
+    [{/if}]
+
+
+    [{section name="starRatings" start=0 loop=5}]
+        [{if $iRatingValue == 0}]
+            <i class="fa fa-star rating-star-empty"></i>
+        [{else}]
+            [{if $iRatingValue > 1}]
+                <i class="fa fa-star rating-star-filled"></i>
+                [{assign var="iRatingValue" value=$iRatingValue-1}]
+            [{else}]
+                [{if $iRatingValue < 0.5}]
+                    [{if $iRatingValue < 0.3}]
+                        <i class="fa fa-star rating-star-empty"></i>
+                    [{else}]
+                        <i class="fa fa-star-half-o rating-star-filled"></i>
+                    [{/if}]
+                    [{assign var="iRatingValue" value=0}]
+                [{elseif $iRatingValue > 0.8}]
+                    <i class="fa fa-star rating-star-filled"></i>
+                    [{assign var="iRatingValue" value=0}]
+                [{else}]
+                    <i class="fa fa-star-half-o rating-star-filled"></i>
+                    [{assign var="iRatingValue" value=0}]
+                [{/if}]
+            [{/if}]
+        [{/if}]
+    [{/section}]
+
+    <a class="[{if $oView->canRate()}]ox-write-review[{/if}]"
+        [{if !$oxcmp_user}]
+            href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account" params="anid=`$oDetailsProduct->oxarticles__oxnid->value`"|cat:"&amp;sourcecl="|cat:$oViewConf->getTopActiveClassName()|cat:$oViewConf->getNavUrlParams()}]"
+        [{elseif $oView->canRate()}]
+            href="#review" data-toggle="collapse" data-target="#review_form"
+        [{/if}]
+       title="[{$_star_title}]">
+        <small>([{$oView->getRatingCount()}] [{oxmultilang ident="DD_RATING_CUSTOMERRATINGS"}])</small>
+    </a>
+</div>
--- a/shop/source/Application/views/flow/tpl/widget/reviews/reviews.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/reviews/reviews.tpl
@@ -0,0 +1,133 @@
+[{oxscript include="js/libs/jqBootstrapValidation.min.js" priority=10}]
+[{oxscript add="$('input,select,textarea').not('[type=submit]').jqBootstrapValidation();"}]
+<div id="review">
+    <div class="panel-group" id="review_form_accordion">
+        <div class="panel panel-default">
+            <div class="panel-heading toggle-accordion">
+                <div class="h4 panel-title">
+                    [{if $oxcmp_user}]
+                        <i class="fa fa-pencil"></i> <a id="writeNewReview" data-toggle="collapse" data-parent="#review_form_accordion" href="#review_form">[{oxmultilang ident="WRITE_REVIEW"}]</a>
+                    [{else}]
+                        <i class="fa fa-user"></i> <a id="reviewsLogin" rel="nofollow" href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=account" params="anid=`$oDetailsProduct->oxarticles__oxnid->value`"|cat:"&amp;sourcecl=details"|cat:$oViewConf->getNavUrlParams()}]">[{oxmultilang ident="MESSAGE_LOGIN_TO_WRITE_REVIEW"}]</a>
+                    [{/if}]
+                </div>
+            </div>
+
+            [{if $oxcmp_user}]
+                <div id="review_form" class="panel-collapse collapse">
+                    <div class="panel-body">
+                        [{block name="widget_reviews_form"}]
+                            <form action="[{$oViewConf->getSelfActionLink()}]" method="post" id="rating" class="form-horizontal" novalidate="novalidate">
+                                <div id="writeReview">
+                                    <div class="hidden">
+                                        [{if $oView->canRate()}]
+                                            <input id="productRating" type="hidden" name="artrating" value="0">
+                                            <input id="recommListRating" type="hidden" name="recommlistrating" value="0">
+                                        [{/if}]
+                                        [{$oViewConf->getHiddenSid()}]
+                                        [{$oViewConf->getNavFormParams()}]
+                                        [{oxid_include_dynamic file="form/formparams.tpl"}]
+                                        <input type="hidden" name="fnc" value="savereview">
+                                        <input type="hidden" name="cl" value="[{$oViewConf->getTopActiveClassName()}]">
+                                        [{if $oDetailsProduct}]
+                                            <input type="hidden" name="anid" value="[{$oDetailsProduct->oxarticles__oxid->value}]">
+                                        [{else}]
+                                            [{assign var="_actvrecommlist" value=$oView->getActiveRecommList()}]
+                                            <input type="hidden" name="recommid" value="[{$_actvrecommlist->oxrecommlists__oxid->value}]">
+                                        [{/if}]
+
+                                        [{if $sReviewUserHash}]
+                                            <input type="hidden" name="reviewuserhash" value="[{$sReviewUserHash}]">
+                                        [{/if}]
+                                    </div>
+
+                                    [{block name="widget_reviews_form_rating"}]
+                                        [{if $oView->canRate()}]
+                                            <ul id="reviewRating" class="rating list-inline">
+                                                [{section name=star start=1 loop=6}]
+                                                    <li class="s[{$smarty.section.star.index}]" data-rate-value="[{$smarty.section.star.index}]">
+                                                        <a class="ox-write-review ox-rateindex-[{$smarty.section.star.index}] text-warning" title="[{$smarty.section.star.index}] [{if $smarty.section.star.index==1}][{oxmultilang ident="STAR"}][{else}][{oxmultilang ident="STARS"}][{/if}]">
+                                                            <i class="fa fa-star-o"></i>
+                                                        </a>
+                                                    </li>
+                                                [{/section}]
+                                            </ul>
+                                        [{/if}]
+                                    [{/block}]
+
+                                    [{block name="widget_reviews_form_fields"}]
+                                        <div class="form-group">
+                                            <div class="col-xs-12">
+                                                <textarea  rows="15" name="rvw_txt" class="form-control"></textarea>
+                                            </div>
+                                        </div>
+                                    [{/block}]
+
+                                    [{block name="widget_reviews_form_buttons"}]
+                                        <div class="form-group">
+                                            <div class="col-xs-12">
+                                                <button id="reviewSave" type="submit" class="submitButton btn btn-primary">[{oxmultilang ident="SAVE_RATING_AND_REVIEW"}]</button>
+                                            </div>
+                                        </div>
+                                    [{/block}]
+                                </div>
+                            </form>
+                        [{/block}]
+                    </div>
+                </div>
+            [{/if}]
+        </div>
+    </div>
+
+    [{if $oView->getReviews()}]
+        <div class="spacer"></div>
+        <div class="reviews-landscape">
+            [{foreach from=$oView->getReviews() item=review name=ReviewsCounter}]
+                <div class="panel panel-default" id="reviewName_[{$smarty.foreach.ReviewsCounter.iteration}]" itemprop="review" itemscope itemtype="http://schema.org/Review">
+                    [{* Bloofusion Google-Produkt-Markup für Google *}]
+                    <div class="hidden">
+                        <span itemprop="itemreviewed">[{$oDetailsProduct->oxarticles__oxtitle->value}] [{$oDetailsProduct->oxarticles__oxvarselect->value}]</span>
+                        <span itemprop="name">[{$review->oxreviews__oxtext->value|truncate:100}]</span>
+                    </div>
+                    [{block name="widget_reviews_record"}]
+                        <div class="panel-heading">
+                            <div class="row">
+                                <div class="col-md-6 writer">
+                                    <span itemprop="author">[{$review->oxuser__oxfname->value}]</span> [{oxmultilang ident="WRITES"}]
+                                    <span>
+                                        <time itemprop="datePublished" datetime="[{$review->oxreviews__oxcreate->value|date_format:"%Y-%m-%d"}]">[{$review->oxreviews__oxcreate->value|date_format:"%d.%m.%Y"}]</time>
+                                    </span>
+                                </div>
+                                <div class="col-md-6 rating">
+                                    [{if $review->oxreviews__oxrating->value}]
+                                        <div class="pull-right text-warning" itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating">
+                                            [{section name="starRatings" start=0 loop=5}]
+                                                [{if $review->oxreviews__oxrating->value >= $smarty.section.starRatings.iteration}]
+                                                    <i class="fa fa-star"></i>
+                                                [{else}]
+                                                    <i class="fa fa-star-o"></i>
+                                                [{/if}]
+                                            [{/section}]
+                                            <div class="hidden">
+                                                <span itemprop="worstRating">1</span>
+                                                <span itemprop="ratingValue">[{$review->oxreviews__oxrating->value|default:'0'}]</span>
+                                                <span itemprop="bestRating">5</span>
+                                            </div>
+                                        </div>
+                                    [{/if}]
+                                    <div class="clearfix"></div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="panel-body" id="reviewText_[{$smarty.foreach.ReviewsCounter.iteration}]" itemprop="description">[{$review->oxreviews__oxtext->value}]</div>
+                    [{/block}]
+                </div>
+            [{/foreach}]
+        </div>
+    [{else}]
+        <div class="alert alert-info">
+            [{oxmultilang ident="NO_REVIEW_AVAILABLE"}]
+        </div>
+    [{/if}]
+
+</div>
--- a/shop/source/Application/views/flow/tpl/widget/rss.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/rss.tpl
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="[{$oView->getCharSet()}]" ?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+        [{assign var="channel" value=$oView->getChannel()}]
+        <title>[{$channel.title}]</title>
+        <link>[{$channel.link}]</link>
+        <description>[{$channel.description}]</description>
+        <language>[{$channel.language}]</language>
+        <copyright>[{$channel.copyright}]</copyright>
+        <lastBuildDate>[{$channel.lastBuildDate}]</lastBuildDate>
+        <generator>[{$channel.generator}]</generator>
+        [{if $channel.managingEditor}]
+            <managingEditor>[{$channel.managingEditor}]</managingEditor>
+        [{/if}]
+        [{*<!-- webMaster>[{$channel.link}]</webMaster -->
+        <!-- ttl>[{$channel.link}]</ttl -->*}]
+        <image>
+            <url>[{$channel.image.url}]</url>
+            <title>[{$channel.image.title}]</title>
+            <link>[{$channel.image.link}]</link>
+        </image>
+        [{*<!-- pubDate>[{$channel.link}]</pubDate -->*}]
+
+        <atom:link href="[{$channel.selflink}]" rel="self" type="application/rss+xml" />
+        [{foreach from=$channel.items item='item'}]
+            <item>
+                <title>[{$item->title}]</title>
+                <link>[{$item->link}]</link>
+                <pubDate>[{$item->date}]</pubDate>
+                <description>[{$item->description}]</description>
+                <guid isPermaLink="[{if $item->isGuidPermalink}]true[{else}]false[{/if}]">[{$item->guid}]</guid>
+                [{*<!-- category></category -->*}]
+            </item>
+        [{/foreach}]
+</channel>
+</rss>
--- a/shop/source/Application/views/flow/tpl/widget/shoplupe/ratings.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/shoplupe/ratings.tpl
@@ -0,0 +1,16 @@
+[{block name="dd_widget_sidebar_shoplupe_ratings"}]
+    <div class="box well well-sm">
+        <section>
+            <div class="page-header h3">[{oxmultilang ident="SHOPLUPE"}]</div>
+            [{block name="dd_widget_sidebar_shoplupe_ratings_inner"}]
+                <div class="content">
+                    <p class="shoplupe">
+                        <a href="http://www.shoplupe.com" target="_blank" title="[{oxmultilang ident="SHOPLUPE"}]">
+                            <img src="[{$oViewConf->getImageUrl('shoplupe.jpg')}]" alt="[{oxmultilang ident="SHOPLUPE"}]" width="119" height="133">
+                        </a>
+                    </p>
+                </div>
+            [{/block}]
+        </section>
+    </div>
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/sidebar/adminbanner.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/sidebar/adminbanner.tpl
@@ -0,0 +1,4 @@
+<div class="text-center">
+    <a id="adminBanner" href="[{$oViewConf->getBaseDir()}]admin/"><img src="[{$oViewConf->getImageUrl('admin-banner.jpg')}]"></a>
+</div>
+<div class="spacer"></div>
--- a/shop/source/Application/views/flow/tpl/widget/sidebar/categorytree.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/sidebar/categorytree.tpl
@@ -0,0 +1,44 @@
+[{block name="dd_widget_sidebar_categorytree"}]
+    [{if $oxcmp_categories}]
+        [{assign var="categories" value=$oxcmp_categories->getClickRoot()}]
+        [{assign var="act" value=$oxcmp_categories->getClickCat()}]
+        [{if $categories}]
+            [{assign var="deepLevel" value=$oView->getDeepLevel()}]
+            <div class="categoryBox hidden-xs hidden-sm">
+                [{block name="dd_widget_sidebar_categorytree_inner"}]
+                    <ol class="nav nav-pills nav-stacked cat-tree">
+                        [{block name="dd_widget_sidebar_categorytree_list"}]
+                            [{defun name="tree" categories=$categories}]
+                                [{assign var="deepLevel" value=$deepLevel+1}]
+                                [{assign var="oContentCat" value=$oView->getContentCategory()}]
+                                [{foreach from=$categories item="_cat"}]
+                                    [{if $_cat->getIsVisible()}]
+                                        [{* CMS category *}]
+                                        [{if $_cat->getContentCats() && $deepLevel > 1}]
+                                            [{foreach from=$_cat->getContentCats() item="_oCont"}]
+                                                <li class="[{if $oContentCat && $oContentCat->getId()==$_oCont->getId()}] active [{else}] end [{/if}]" >
+                                                    <a href="[{$_oCont->getLink()}]" title="[{$_oCont->oxcontents__oxtitle->value}]"><i></i>[{$_oCont->oxcontents__oxtitle->value}]</a>
+                                                </li>
+                                            [{/foreach}]
+                                        [{/if}]
+
+                                        [{* subcategories *}]
+                                        [{assign var="oSubCats" value=$_cat->getSubCats()}]
+                                        <li class="[{if !$oContentCat && $act && $act->getId()==$_cat->getId()}]active[{elseif $_cat->expanded}]exp[{/if}][{if !$_cat->hasVisibleSubCats}] end[{/if}]">
+                                            <a href="[{$_cat->getLink()}]" title="[{$_cat->oxcategories__oxtitle->value}]">
+                                                <i class="fa fa-caret-[{if $_cat->expanded && $oSubCats}]down[{else}]right[{/if}]"></i> [{$_cat->oxcategories__oxtitle->value}] [{if $oView->showCategoryArticlesCount() && ($_cat->getNrOfArticles() > 0)}] ([{$_cat->getNrOfArticles()}])[{/if}]
+                                            </a>
+                                            [{if $oSubCats && $_cat->expanded}]
+                                                <ul class="nav nav-pills nav-stacked">[{fun name="tree" categories=$oSubCats}]</ul>
+                                            [{/if}]
+                                        </li>
+                                    [{/if}]
+                                [{/foreach}]
+                            [{/defun}]
+                        [{/block}]
+                    </ol>
+                [{/block}]
+            </div>
+        [{/if}]
+    [{/if}]
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/sidebar/news.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/sidebar/news.tpl
@@ -0,0 +1,19 @@
+[{block name="dd_widget_sidebar_news"}]
+    <div id="newsBox" class="box well well-sm">
+        <section>
+            <div class="page-header h3">[{oxmultilang ident="NEWS"}]</div>
+            [{block name="dd_widget_sidebar_news_inner"}]
+                <ul class="content">
+                    [{block name="dd_widget_sidebar_news_list"}]
+                        [{foreach from=$oNews item="_oNewsItem" name="_sNewsList"}]
+                            <li>
+                                [{$_oNewsItem->getLongDesc()|strip_tags|oxtruncate:100}]<br>
+                                <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=news"}]#[{$_oNewsItem->oxnews__oxid->value}]" class="readMore">[{oxmultilang ident="NEXT"}]</a>
+                            </li>
+                        [{/foreach}]
+                    [{/block}]
+                </ul>
+            [{/block}]
+        </section>
+    </div>
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/sidebar/partners.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/sidebar/partners.tpl
@@ -0,0 +1,11 @@
+[{block name="dd_widget_sidebar_partners"}]
+    <div class="box well well-sm">
+        <section>
+            <div class="page-header h3"></div>
+            <div class="content">
+                [{block name="partner_logos"}]
+                [{/block}]
+            </div>
+        </section>
+    </div>
+[{/block}]
--- a/shop/source/Application/views/flow/tpl/widget/sidebar/recommendation.tpl
+++ b/shop/source/Application/views/flow/tpl/widget/sidebar/recommendation.tpl
@@ -0,0 +1,55 @@
+[{assign var="_oRecommendationList" value=$oView->getSimilarRecommLists()}]
+[{assign var="oRecommList" value=$oView->getRecommList()}]
+
+[{if $_oRecommendationList || $oRecommList->getRecommSearch()}]
+    <div class="box well well-sm hidden-sm hidden-xs" id="recommendationsBox">
+        <section>
+            <div class="page-header h3">[{oxmultilang ident="LISTMANIA"}]</div>
+            <div>
+                [{if $_oRecommendationList}]
+                    [{$_oRecommendationList->rewind()}]
+
+                    [{if $_oRecommendationList->current()}]
+                        [{assign var="_oFirstRecommendationList" value=$_oRecommendationList->current()}]
+                        [{assign var="_oBoxTopProduct" value=$_oFirstRecommendationList->getFirstArticle()}]
+                        [{assign var="_sTitle" value="`$_oBoxTopProduct->oxarticles__oxtitle->value` `$_oBoxTopProduct->oxarticles__oxvarselect->value`"|strip_tags}]
+                        <div class="text-center">
+                            <a href="[{$_oBoxTopProduct->getMainLink()}]" class="featured img-thumbnail" title="[{$_sTitle}]">
+                                <img src="[{$_oBoxTopProduct->getIconUrl()}]" alt="[{$_sTitle}]">
+                            </a>
+                        </div>
+                    [{/if}]
+                [{/if}]
+                <ul class="featuredList list-unstyled">
+                    [{if $_oRecommendationList}]
+                        [{foreach from=$_oRecommendationList item=_oListItem name="testRecommendationsList"}]
+                            <li>
+                                <a href="[{$_oListItem->getLink()}]"><b>[{$_oListItem->oxrecommlists__oxtitle->value|strip_tags}]</b></a>
+                                <div class="desc">[{oxmultilang ident="LIST_BY"}]: [{$_oListItem->oxrecommlists__oxauthor->value|strip_tags}]</div>
+                            </li>
+                        [{/foreach}]
+                    [{/if}]
+                    [{if $_oRecommendationList || $oRecommList->getRecommSearch()}]
+                    <li>
+                        <form name="basket" class="recommendationsSearchForm" action="[{$oViewConf->getSelfActionLink()}]" method="post">
+                            <div>
+                                <input type="hidden" name="cl" value="recommlist">
+                                [{$oViewConf->getHiddenSid()}]
+                            </div>
+                            <label>[{oxmultilang ident="SEARCH_FOR_LISTS"}]</label>
+                            <div class="input-group">
+                                <input type="text" name="searchrecomm" id="searchRecomm" value="[{$oRecommList->getRecommSearch()}]" class="searchInput form-control">
+                                <span class="input-group-btn">
+                                    <button class="submitButton largeButton btn btn-default" type="submit">
+                                        <i class="fa fa-search"></i>
+                                    </button>
+                                </span>
+                            </div>
+                        </form>
+                    </li>
+                    [{/if}]
+                </ul>
+            </div>
+        </section>
+    </div>
+[{/if}]