update auf 2.1

core/includes/footer-widgets.tpl

@@ -64,9 +64,7 @@
 					{/foreach}
 				</div>
 			</div>
-			{*
 			<div class="col-lg-3{if $themesettings.footersetting.footermenuposition} order-lg-1{/if}">
-
 				{if $themesettings.footersetting.nowidget == ""}
 				<div class="contacts_box{if $themesettings.footersetting.columnstyle} p-3 border rounded{/if}">	
 					{if !empty($socialAccounts)}
@@ -100,14 +98,12 @@
 					{/if}
 				</div>
 				{/if}
-
 				
 				{if $themesettings.footersetting.wcCode}
 					{$themesettings.footersetting.wcCode|unescape:"html"}
 				{/if}
 						
 			</div>
-				*}
 		</div>
 				
 		{else}

core/includes/mega-menu.tpl

@@ -5,7 +5,18 @@
  **********************************************************
 *}
 
-<!-- ******************************** mega-menu.tpl ******************************** -->
+{if $loggedin}
+	<li class="home-item">
+		<a class="nav-link" href="{if $loggedin}{$WEB_ROOT}/clientarea.php{else}{if $themesettings.headersetting.CustomLogoLink}{$themesettings.headersetting.CustomLogoLink}{else}{$WEB_ROOT}/{/if}{/if}"><i class="fas fa-home"></i> <span>{$LANG.clientareanavhome}</span></a>					
+	</li>
+{else}
+	{if $themesettings.headersetting.disablehomeicon neq "1"}
+		<li class="home-item">
+			<a class="nav-link" href="{if $loggedin}{$WEB_ROOT}/clientarea.php{else}{if $themesettings.headersetting.CustomLogoLink}{$themesettings.headersetting.CustomLogoLink}{else}{$WEB_ROOT}/{/if}{/if}"><i class="fas fa-home"></i> <span>{$LANG.clientareanavhome}</span></a>					
+		</li>
+	{/if}
+{/if}
+
 {foreach $navbar as $item}
 {assign var='extras' value=$item->getExtras()}			
 <li data-menuItemName="{$item->getName()}"{if $item->hasChildren()} class="dropdown {$extras['parentclass']}"{elseif $item->getClass()} class="{$item->getClass()}"{/if} {if $item->getName() eq 'Home'} style="display: none;"{/if}>
@@ -13,7 +24,6 @@
 
 	{if $item->getName() == "Home"}<i class="fas fa-home"></i>{else}{if $item->hasIcon()}<i class="{$item->getIcon()}"></i>&nbsp;{/if}{/if}
 
-	<!-- mega-menu.tpl -->
 	<span>{$item->getLabel()}</span>
 
 	{if $item->hasBadge()} <span class="badge">{$item->getBadge()}</span>{/if}
@@ -70,11 +80,10 @@
 			<ul class="menu-list">
 				{foreach $item->getChildren() as $childItem}
 				{assign var='extras' value=$childItem->getExtras()}
-					<!-- mega-menu.tpl -->					
 					<li data-menuItemName="{$childItem->getName()}"{if $childItem->getClass() || $extras['parentclass']} class="{$childItem->getClass()} {$extras['parentclass']}"{/if}>
 						<a class="nav-link" href="{$childItem->getUri()}"{if $childItem->getAttribute('target')} target="{$childItem->getAttribute('target')}"{/if}>
 							{if $childItem->hasIcon()}<i class="{$childItem->getIcon()}"></i> {/if}
-							<span class="item">{$childItem->getLabel()|unescape:"html"}</span>
+							<span class="item">{$childItem->getLabel()}</span>
 							{if $childItem->hasBadge()} 
 								<span class="badge">
 									{$childItem->getBadge()}

core/includes/pre-header.tpl

@@ -8,16 +8,6 @@
 <div class="pre-header{if $themesettings.headersetting.preheaderbg == "1"} primary{elseif $themesettings.headersetting.preheaderbg == "2"} light{else}{/if}">
 	<div class="container">
 		<div class="d-flex align-items-center space-between mx-0 mx-lg-3">
-			<a class="logo" style="height: 40px; display:flex;" href="/">
-				<img src="https://portal.thurdata.ch/templates/croster/assets/images/logo-bw-invert-medium.png" alt="Thurdata GmbH"> <!-- class="logo-light"> -->
-				<!-- <img src="https://portal.thurdata.ch/templates/croster/assets/images/logo-color-medium.png" alt="Thurdata GmbH"> 
-				class="logo-light"> -->
-			</a>
-			<ul class="nav navbar-nav mr-auto w-auto">
-				<li class="home-item" style="font-size: 1.8em; color: white">
-					&nbsp;&nbsp;Kundenportal&nbsp;&nbsp;
-				</li>
-			</ul>
 			<ul class="list-unstyled list-inline d-none d-md-inline-block">
 				{if $themesettings.general.whatsapp}<li class="list-inline-item"><a href="https://api.whatsapp.com/send?phone={$themesettings.general.whatsapp}" target="_blank"><i class="fab fa-whatsapp"></i></a></li>{/if}
 				{if $themesettings.general.phonenumber}<li class="list-inline-item"><a href="tel:{$themesettings.general.phonenumber}"><i class="fas fa-phone-volume"></i> {$themesettings.general.phonenumber}</a></li>{/if}
@@ -46,47 +36,36 @@
 				</li>
 				{/if}
 			</ul>
-			<ul class="list-unstyled list-inline" style="white-space:nowrap">				
-
-			{if $themesettings.orderform.orderopc != '1'}
-				{if $templatefile != 'order'}
-					<li style="border-right:none" class="list-inline-item">
-						<a href="{$WEB_ROOT}/cart.php?a=view">
-							<i class="fal fa-shopping-cart"></i> {if $cartitemcount > 0}<span class="badge up badge-primary">{$cartitemcount}</span>{/if}
-						</a>
-					</li>
-				{/if}
-			{/if}
-			
-			{if $loggedin}
+			<ul class="list-unstyled list-inline">				
+				{if $loggedin}
 				{if count($clientAlerts) > 0}
-					<li style="border-right:none" class="list-inline-item dropdown nocaret">
-						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-							<i class="fal fa-bell"></i>  <span class="badge up badge-primary">{$clientAlerts|count}</span>
-						</a>
-						<ul class="dropdown-menu dropdown-menu-right dropdown-scroll dropdown-tasks auto">
-							<li class="dropdown-header">
-								<i class="fal fa-info-circle"></i> ({$clientAlerts|count}) {$LANG.notifications}
-							</li>
-							<li id="taskScroll">
-								<ul class="list-unstyled">
-									{foreach $clientAlerts as $alert}
-									<li>
-										<a href="{$alert->getLink()}"><i class="fas fa-fw fa-{if $alert->getSeverity() == 'danger'}exclamation-circle{elseif $alert->getSeverity() == 'warning'}exclamation-triangle{elseif $alert->getSeverity() == 'info'}info-circle{else}check-circle{/if} text-{$alert->getSeverity()}"></i> {$alert->getMessage()} {if $alert->getLinkText()}<button href="{$alert->getLink()}" class="btn btn-xs btn-{$alert->getSeverity()}">{$alert->getLinkText()}</button>{/if}</a>
-									</li>
-									{foreachelse}
-									<li>
-										<a href="javascript:;">{lang key='notificationsnone'}</a>
-									</li>
-									{/foreach}
-								</ul>
-							</li>
-						</ul>
-					</li>
+				<li class="list-inline-item dropdown nocaret">
+					<a href="#" class="dropdown-toggle" data-toggle="dropdown">
+						<i class="fal fa-bell"></i>  <span class="badge up badge-primary">{$clientAlerts|count}</span>
+					</a>
+					<ul class="dropdown-menu dropdown-menu-right dropdown-scroll dropdown-tasks auto">
+						<li class="dropdown-header">
+							<i class="fal fa-info-circle"></i> ({$clientAlerts|count}) {$LANG.notifications}
+						</li>
+						<li id="taskScroll">
+							<ul class="list-unstyled">
+								{foreach $clientAlerts as $alert}
+								<li>
+									<a href="{$alert->getLink()}"><i class="fas fa-fw fa-{if $alert->getSeverity() == 'danger'}exclamation-circle{elseif $alert->getSeverity() == 'warning'}exclamation-triangle{elseif $alert->getSeverity() == 'info'}info-circle{else}check-circle{/if} text-{$alert->getSeverity()}"></i> {$alert->getMessage()} {if $alert->getLinkText()}<button href="{$alert->getLink()}" class="btn btn-xs btn-{$alert->getSeverity()}">{$alert->getLinkText()}</button>{/if}</a>
+								</li>
+								{foreachelse}
+								<li>
+									<a href="javascript:;">{lang key='notificationsnone'}</a>
+								</li>
+								{/foreach}
+							</ul>
+						</li>
+					</ul>
+				</li>
 				{/if}
 				
 				{if $languagechangeenabled && count($locales) > 1}
-					<li style="border-right:none" class="list-inline-item lang-btn">
+					<li class="list-inline-item lang-btn">
 						<button type="button" class="btn" data-toggle="modal" data-target="#modalChooseLanguage">
 							{if $languagechangeenabled && count($locales) > 1}
 							<span class="d-inline-block align-middle">
@@ -100,7 +79,7 @@
 				{else}
 				
 					{if $languagechangeenabled && count($locales) > 1 || $currencies}
-						<li style="border-right:none" class="list-inline-item lang-btn">
+						<li class="list-inline-item lang-btn">
 							<button type="button" class="btn" data-toggle="modal" data-target="#modalChooseLanguage">
 								{if $languagechangeenabled && count($locales) > 1}
 								<span class="d-inline-block align-middle">
@@ -112,13 +91,24 @@
 					{/if}
 				{/if}
 				
+				{if $themesettings.orderform.orderopc != '1'}
+					{if $templatefile != 'order'}
+						<li class="list-inline-item">
+							<a href="{$WEB_ROOT}/cart.php?a=view">
+								<i class="fal fa-shopping-cart"></i> {if $cartitemcount > 0}<span class="badge up badge-primary">{$cartitemcount}</span>{/if}
+							</a>
+						</li>
+					{/if}
+				{/if}
+				
 				{if $adminMasqueradingAsClient || $adminLoggedIn}
-					<li style="border-right:none" class="list-inline-item">
+					<li class="list-inline-item">
 						<a href="{$WEB_ROOT}/logout.php?returntoadmin=1" class="" data-toggle="tooltip" data-placement="bottom" title="{if $adminMasqueradingAsClient}{$LANG.adminmasqueradingasclient} {$LANG.logoutandreturntoadminarea}{else}{$LANG.adminloggedin} {$LANG.returntoadminarea}{/if}">
 							<i class="fal fa-sign-out-alt"></i>
 						</a>
 					</li>
 				{/if}
+
 			</ul>
 		</div>
 	</div>	

core/layouts/default/header.tpl

@@ -6,32 +6,38 @@
 *}
 
 <div class="body-container">
-	<section id="main-navbar"{if $templatefile eq "order" && $themesettings.orderform.opcnoheader} class="d-none"{/if}>
-		<nav id="nav" class="cros-navbar navbar navbar-expand-lg{if $enablemegamenu} cros-mega{/if}{if $themesettings.headersetting.navhover == "1"} menu-hover{/if}{if $themesettings.headersetting.navbarbg == "1"} primary{elseif $themesettings.headersetting.navbarbg == "2"} dark{else}{/if}{if $themesettings.headersetting.submenu == "1"} submenu1{elseif $themesettings.headersetting.submenu == "2"} submenu2{/if}">
-			{if $themesettings.headersetting.enablepreheader}
-				{include file="$template/core/includes/pre-header.tpl"}
-			{/if}
+<div id="main-navbar"{if $templatefile eq "order" && $themesettings.orderform.opcnoheader} class="d-none"{/if}>
+    <nav id="nav" class="cros-navbar navbar navbar-expand-lg{if $enablemegamenu} cros-mega{/if}{if $themesettings.headersetting.navhover == "1"} menu-hover{/if}{if $themesettings.headersetting.navbarbg == "1"} primary{elseif $themesettings.headersetting.navbarbg == "2"} dark{else}{/if}{if $themesettings.headersetting.submenu == "1"} submenu1{elseif $themesettings.headersetting.submenu == "2"} submenu2{/if}">
+		
+		{if $themesettings.headersetting.enablepreheader}
+			{include file="$template/core/includes/pre-header.tpl"}
+		{/if}
+		
+		
 			<div class="container">
 				<!-- Brand and toggle get grouped for better mobile display -->
-				<div class="navbar-header" style="max-width: 40px;">
-					<div class="logo-section" style="max-width: 40px;">
-						<button type="button" class="navbar-toggler" data-toggle="collapse" id="navbar-side-toggle">
+				<div class="navbar-header">
+					<div class="logo-section">
+						<button type="button" role="button" class="navbar-toggler" data-toggle="collapse" id="navbar-side-toggle" aria-label="Toggle navigation">
 							<span></span>
 						</button>
-						{if $loggedin}
-							<a class="nav-link collapse navbar-collapse" style="max-width: 40px;" href="{if $loggedin}{$WEB_ROOT}/clientarea.php{else}{if $themesettings.headersetting.CustomLogoLink}{$themesettings.headersetting.CustomLogoLink}{else}{$WEB_ROOT}/{/if}{/if}"><i class="fas fa-home" title="Home"></i></a>					
-						{else}
-							{if $themesettings.headersetting.disablehomeicon neq "1"}
-								<a class="nav-link collapse navbar-collapse" style="max-width: 40px;" href="{if $loggedin}{$WEB_ROOT}/clientarea.php{else}{if $themesettings.headersetting.CustomLogoLink}{$themesettings.headersetting.CustomLogoLink}{else}{$WEB_ROOT}/{/if}{/if}"><i class="fas fa-home" title="Home"></i></a>					
+						<a class="logo" href="{if $themesettings.headersetting.CustomLogoLink}{$themesettings.headersetting.CustomLogoLink}{else}{$WEB_ROOT}/{/if}">
+							{if $themesettings.general.enablelogo}
+								<img src="{$themesettings.general.logourl}" alt="{$companyname}" class="logo-light" />
+								{if $themesettings.general.darklogo}
+									<img src="{$themesettings.general.darklogo}" alt="{$companyname}" class="logo-dark" />
+								{else}
+								<span class="logo-dark">{$companyname}</span>
+								{/if}
+							{else}
+								<span class="logo-dark">{$companyname}</span>
+								<span class="logo-light">{$companyname}</span>
 							{/if}
-						{/if}
+						</a>
 					</div>
 					<div class="top">
 						<ul id="mobile-header" class="nav secondary-menu-mobile">
-							<!-- TD-NAvBar-Right -->
-							{include file="$template/core/includes/support.tpl" navbar=$secondaryNavbar}	
-{*							{include file="$template/core/includes/navbar-right.tpl" navbar=$secondaryNavbar}	*}
-							<!-- TD-NAvBar-Right -->
+							{include file="$template/core/includes/navbar-right.tpl" navbar=$secondaryNavbar}	
 						</ul>
 					</div>
 					
@@ -42,16 +48,13 @@
 					<ul class="nav navbar-nav{if $themesettings.headersetting.navright} ml-auto{else} mr-auto{/if}">
 						{if $enablemegamenu}
 							{include file="$template/core/includes/mega-menu.tpl" navbar=$primaryNavbar}
-							{else}
+						{else}
 							{include file="$template/includes/navbar.tpl" navbar=$primaryNavbar}
 						{/if}
 					</ul>
 
 					<ul id="header" class="nav navbar-nav navbar-right d-none d-md-block d-lg-block d-xl-block">
-						<!-- TD-NAvBar-Right -->
-						{include file="$template/core/includes/support.tpl" navbar=$secondaryNavbar}	
-{*							{include file="$template/core/includes/navbar-right.tpl" navbar=$secondaryNavbar}	*}
-						<!-- TD-NAvBar-Right -->
+						{include file="$template/core/includes/navbar-right.tpl" navbar=$secondaryNavbar}
 					</ul>
 				</div><!-- /.navbar-collapse -->
 			</div>
@@ -64,7 +67,7 @@
 	<nav class="navbar-side{if $themesettings.headersetting.sidebarbg eq "1"} primary{elseif $themesettings.headersetting.sidebarbg eq "2"} dark{else}{/if} d-print-none d-lg-none" id="navbar-side">					
 		{include file="$template/core/includes/side-menu.tpl"}			
 	</nav>
-</section>
+</div>
 
 
 {if $themesettings.general.enablepromo}

core/layouts/left/header.tpl

@@ -4,7 +4,7 @@
  * Website: http://www.thememetro.com
  **********************************************************
 *}
-<!-- header.tpl -->
+
 
 <div class="{if $templatefile eq "order" && $themesettings.orderform.opcnoheader}d-none {/if}navbar-side fixed{if $themesettings.headersetting.sidebarbg eq "1"} primary{elseif $themesettings.headersetting.sidebarbg eq "2"} dark{else}{/if} hidden-d-print-none" id="navbar-side">					
 	{include file="$template/core/includes/side-menu-left.tpl"}			
@@ -131,6 +131,4 @@
 			<div class="{if !$inShoppingCart && ($primarySidebar->hasChildren() || $secondarySidebar->hasChildren()) && $templatefile !== 'clientregister' || $templatefile == "affiliates"}col-xl-9{else}col-12{/if} primary-content left-layout">
 
 
-{/if}
-
-<!-- /header.tpl -->
+{/if}

order.tpl

@@ -227,9 +227,17 @@
                                     <div class="product_list border-top" id="product_body">
 									
 									   <div class="swiper-nav">
-											<div class="swiper-button-prev"></div>
+											<div class="swiper-button-prev">
+												<span class="btn_icon">
+													<i class="far fa-chevron-left"></i>
+												</span>
+											</div>
 											<div class="swiper-pagination"></div>
-											<div class="swiper-button-next"></div>
+											<div class="swiper-button-next">
+												<span class="btn_icon">
+													<i class="far fa-chevron-right"></i>
+												</span>
+											</div>
 										</div>
 										
 										<div class="plan-list-slider swiper">