Explorar o código

try to fix menu

andre hai 11 meses
pai
achega
24a75288c6
Modificáronse 1 ficheiros con 35 adicións e 34 borrados
  1. 35 34
      core/includes/pre-header.tpl

+ 35 - 34
core/includes/pre-header.tpl

@@ -47,31 +47,42 @@
 				{/if}
 			</ul>
 			<ul class="list-unstyled list-inline">				
-				{if $loggedin}
+
+			{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 $loggedin}
 				{if count($clientAlerts) > 0}
-				<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>
+					<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}
@@ -101,16 +112,6 @@
 					{/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 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}">