Theme fixes

master
Mark Moffat 2019-11-03 20:04:20 +10:30
parent c97313d9cf
commit de1f6fdeaa
4 changed files with 24 additions and 24 deletions

View File

@ -90,14 +90,14 @@
{{#if admin}}
<a class="navbar-brand navbar-brand-image" href="/admin"><img class="img-responsive" src="/images/logo-admin.png"></a>
{{else}}
{{#isNull config.cartLogo}}
{{#isNull config.cartTitle}}
{{#isNull @root.config.cartLogo}}
{{#isNull @root.config.cartTitle}}
<a class="navbar-brand" href="/">expressCart</a>
{{else}}
<a class="navbar-brand" href="/">{{config.cartTitle}}</a>
<a class="navbar-brand" href="/">{{@root.config.cartTitle}}</a>
{{/isNull}}
{{else}}
<a class="navbar-brand navbar-brand-image" href="/"><img class="img-responsive" src="{{config.cartLogo}}"></a>
<a class="navbar-brand navbar-brand-image" href="/"><img class="img-responsive" src="{{@root.config.cartLogo}}"></a>
{{/isNull}}
{{/if}}
</div>
@ -106,15 +106,15 @@
{{#unless admin}}
{{#ifCond page '!=' 'checkout'}}
{{#ifCond page '!=' 'pay'}}
{{#if session.cart}}
<li><a href="/cart" class="menu-btn"><i class="fa fa-shopping-cart" aria-hidden="true"></i> Cart <span class="badge" id="cart-count">{{session.cartTotalItems}}</span></a></li>
{{#if @root.session.cart}}
<li><a href="/cart" class="menu-btn"><i class="fa fa-shopping-cart" aria-hidden="true"></i> Cart <span class="badge" id="cart-count">{{@root.session.cartTotalItems}}</span></a></li>
{{else}}
<li><a href="/cart" class="menu-btn"><i class="fa fa-shopping-cart" aria-hidden="true"></i> Cart <span class="badge" id="cart-count">0</span></a></li>
{{/if}}
{{/ifCond}}
{{/ifCond}}
{{/unless}}
{{#if session.user}}
{{#if @root.session.user}}
<li><a href="/admin/logout"><i class="fa fa-sign-out" aria-hidden="true"> </i>Logout</a></li>
{{/if}}
</ul>
@ -145,7 +145,7 @@
<input type="hidden" id="input_notify_message" value="{{message}}">
<input type="hidden" id="input_notify_messageType" value="{{messageType}}">
<input type="hidden" id="cartCheckout" value="{{checkout}}">
<input type="hidden" id="cartTheme" value="{{config.theme}}">
<input type="hidden" id="cartTheme" value="{{@root.config.theme}}">
<div id="notify_message"></div>
{{#if showFooter}}
<footer class="footer">

View File

@ -11,7 +11,7 @@
<div class="panel-heading">Cart contents</div>
<div class="panel-body cart-body">
<div class="container-fluid">
{{#each session.cart}}
{{#each @root.session.cart}}
<div class="row cart-row">
<div class="col-xs-4 col-md-2 col s4 m2">
{{#if productImage}}
@ -59,13 +59,13 @@
{{/each}}
</div>
<div class="container-fluid">
{{#if session.cart}}
{{#if @root.session.cart}}
<div class="row">
<div class="cart-contents-shipping col-md-12 col m12 no-pad-right">
{{#ifCond session.shippingCostApplied '===' true}}
{{#ifCond @root.session.shippingCostApplied '===' true}}
<div class="text-right">
Shipping:
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
<strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
</div>
{{else}}
<div class="text-right">
@ -75,7 +75,7 @@
{{/ifCond}}
<div class="text-right">
Total:
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount session.totalCartAmount}}</strong>
<strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.session.totalCartAmount}}</strong>
</div>
</div>
</div>
@ -90,7 +90,7 @@
</div>
</div>
<div class="row">
{{#if session.cart}}
{{#if @root.session.cart}}
<div class="col-xs-6 col s6 text-left align-right">
<button class="btn btn-danger" id="empty-cart" type="button">Empty cart</button>
</div>

View File

@ -10,7 +10,7 @@
<div class="card">
<div class="card-content">
<span class="card-title">Cart contents</span>
{{#each session.cart}}
{{#each @root.session.cart}}
<div class="row cart-row">
<div class="col s4 m2">
{{#if productImage}}
@ -53,10 +53,10 @@
</div>
</div>
{{/each}}
{{#if session.cart}}
{{#if @root.session.cart}}
<div class="row">
<div class="cart-contents-shipping col s12 no-pad-right">
{{#ifCond session.shippingCostApplied '===' true}}
{{#ifCond @root.session.shippingCostApplied '===' true}}
<div class="text-right">
Shipping:
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
@ -69,7 +69,7 @@
{{/ifCond}}
<div class="text-right">
Total:
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount session.totalCartAmount}}</strong>
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.session.totalCartAmount}}</strong>
</div>
</div>
</div>
@ -83,7 +83,7 @@
</div>
</div>
<div class="row">
{{#if session.cart}}
{{#if @root.session.cart}}
<div class="col s6 align-right">
<button class="btn waves-effect waves-light red darken-3" id="empty-cart" type="button">Empty cart</button>
</div>

View File

@ -10,7 +10,7 @@
<div class="card">
<div class="card-content">
<span class="card-title">Cart contents</span>
{{#each session.cart}}
{{#each @root.session.cart}}
<div class="row cart-row">
<div class="col s4 m2">
{{#if productImage}}
@ -53,10 +53,10 @@
</div>
</div>
{{/each}}
{{#if session.cart}}
{{#if @root.session.cart}}
<div class="row">
<div class="cart-contents-shipping col s12 no-pad-right">
{{#ifCond session.shippingCostApplied '===' true}}
{{#ifCond @root.session.shippingCostApplied '===' true}}
<div class="text-right">
Shipping:
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
@ -69,7 +69,7 @@
{{/ifCond}}
<div class="text-right">
Total:
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount session.totalCartAmount}}</strong>
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.session.totalCartAmount}}</strong>
</div>
</div>
</div>
@ -83,7 +83,7 @@
</div>
</div>
<div class="row">
{{#if session.cart}}
{{#if @root.session.cart}}
<div class="col s6 align-right">
<button class="btn waves-effect waves-light red darken-3" id="empty-cart" type="button">Empty cart</button>
</div>