Theme fixes
parent
c97313d9cf
commit
de1f6fdeaa
|
@ -90,14 +90,14 @@
|
||||||
{{#if admin}}
|
{{#if admin}}
|
||||||
<a class="navbar-brand navbar-brand-image" href="/admin"><img class="img-responsive" src="/images/logo-admin.png"></a>
|
<a class="navbar-brand navbar-brand-image" href="/admin"><img class="img-responsive" src="/images/logo-admin.png"></a>
|
||||||
{{else}}
|
{{else}}
|
||||||
{{#isNull config.cartLogo}}
|
{{#isNull @root.config.cartLogo}}
|
||||||
{{#isNull config.cartTitle}}
|
{{#isNull @root.config.cartTitle}}
|
||||||
<a class="navbar-brand" href="/">expressCart</a>
|
<a class="navbar-brand" href="/">expressCart</a>
|
||||||
{{else}}
|
{{else}}
|
||||||
<a class="navbar-brand" href="/">{{config.cartTitle}}</a>
|
<a class="navbar-brand" href="/">{{@root.config.cartTitle}}</a>
|
||||||
{{/isNull}}
|
{{/isNull}}
|
||||||
{{else}}
|
{{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}}
|
{{/isNull}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
|
@ -106,15 +106,15 @@
|
||||||
{{#unless admin}}
|
{{#unless admin}}
|
||||||
{{#ifCond page '!=' 'checkout'}}
|
{{#ifCond page '!=' 'checkout'}}
|
||||||
{{#ifCond page '!=' 'pay'}}
|
{{#ifCond page '!=' 'pay'}}
|
||||||
{{#if session.cart}}
|
{{#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">{{session.cartTotalItems}}</span></a></li>
|
<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}}
|
{{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>
|
<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}}
|
{{/if}}
|
||||||
{{/ifCond}}
|
{{/ifCond}}
|
||||||
{{/ifCond}}
|
{{/ifCond}}
|
||||||
{{/unless}}
|
{{/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>
|
<li><a href="/admin/logout"><i class="fa fa-sign-out" aria-hidden="true"> </i>Logout</a></li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -145,7 +145,7 @@
|
||||||
<input type="hidden" id="input_notify_message" value="{{message}}">
|
<input type="hidden" id="input_notify_message" value="{{message}}">
|
||||||
<input type="hidden" id="input_notify_messageType" value="{{messageType}}">
|
<input type="hidden" id="input_notify_messageType" value="{{messageType}}">
|
||||||
<input type="hidden" id="cartCheckout" value="{{checkout}}">
|
<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>
|
<div id="notify_message"></div>
|
||||||
{{#if showFooter}}
|
{{#if showFooter}}
|
||||||
<footer class="footer">
|
<footer class="footer">
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<div class="panel-heading">Cart contents</div>
|
<div class="panel-heading">Cart contents</div>
|
||||||
<div class="panel-body cart-body">
|
<div class="panel-body cart-body">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
{{#each session.cart}}
|
{{#each @root.session.cart}}
|
||||||
<div class="row cart-row">
|
<div class="row cart-row">
|
||||||
<div class="col-xs-4 col-md-2 col s4 m2">
|
<div class="col-xs-4 col-md-2 col s4 m2">
|
||||||
{{#if productImage}}
|
{{#if productImage}}
|
||||||
|
@ -59,13 +59,13 @@
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</div>
|
</div>
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
{{#if session.cart}}
|
{{#if @root.session.cart}}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="cart-contents-shipping col-md-12 col m12 no-pad-right">
|
<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">
|
<div class="text-right">
|
||||||
Shipping:
|
Shipping:
|
||||||
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
|
<strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
|
||||||
</div>
|
</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
|
@ -75,7 +75,7 @@
|
||||||
{{/ifCond}}
|
{{/ifCond}}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
Total:
|
Total:
|
||||||
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount session.totalCartAmount}}</strong>
|
<strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.session.totalCartAmount}}</strong>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -90,7 +90,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{{#if session.cart}}
|
{{#if @root.session.cart}}
|
||||||
<div class="col-xs-6 col s6 text-left align-right">
|
<div class="col-xs-6 col s6 text-left align-right">
|
||||||
<button class="btn btn-danger" id="empty-cart" type="button">Empty cart</button>
|
<button class="btn btn-danger" id="empty-cart" type="button">Empty cart</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<span class="card-title">Cart contents</span>
|
<span class="card-title">Cart contents</span>
|
||||||
{{#each session.cart}}
|
{{#each @root.session.cart}}
|
||||||
<div class="row cart-row">
|
<div class="row cart-row">
|
||||||
<div class="col s4 m2">
|
<div class="col s4 m2">
|
||||||
{{#if productImage}}
|
{{#if productImage}}
|
||||||
|
@ -53,10 +53,10 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
{{#if session.cart}}
|
{{#if @root.session.cart}}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="cart-contents-shipping col s12 no-pad-right">
|
<div class="cart-contents-shipping col s12 no-pad-right">
|
||||||
{{#ifCond session.shippingCostApplied '===' true}}
|
{{#ifCond @root.session.shippingCostApplied '===' true}}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
Shipping:
|
Shipping:
|
||||||
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
|
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
{{/ifCond}}
|
{{/ifCond}}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
Total:
|
Total:
|
||||||
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount session.totalCartAmount}}</strong>
|
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.session.totalCartAmount}}</strong>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{{#if session.cart}}
|
{{#if @root.session.cart}}
|
||||||
<div class="col s6 align-right">
|
<div class="col s6 align-right">
|
||||||
<button class="btn waves-effect waves-light red darken-3" id="empty-cart" type="button">Empty cart</button>
|
<button class="btn waves-effect waves-light red darken-3" id="empty-cart" type="button">Empty cart</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<span class="card-title">Cart contents</span>
|
<span class="card-title">Cart contents</span>
|
||||||
{{#each session.cart}}
|
{{#each @root.session.cart}}
|
||||||
<div class="row cart-row">
|
<div class="row cart-row">
|
||||||
<div class="col s4 m2">
|
<div class="col s4 m2">
|
||||||
{{#if productImage}}
|
{{#if productImage}}
|
||||||
|
@ -53,10 +53,10 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
{{#if session.cart}}
|
{{#if @root.session.cart}}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="cart-contents-shipping col s12 no-pad-right">
|
<div class="cart-contents-shipping col s12 no-pad-right">
|
||||||
{{#ifCond session.shippingCostApplied '===' true}}
|
{{#ifCond @root.session.shippingCostApplied '===' true}}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
Shipping:
|
Shipping:
|
||||||
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
|
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong>
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
{{/ifCond}}
|
{{/ifCond}}
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
Total:
|
Total:
|
||||||
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount session.totalCartAmount}}</strong>
|
<strong>{{currencySymbol config.currencySymbol}}{{formatAmount @root.session.totalCartAmount}}</strong>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{{#if session.cart}}
|
{{#if @root.session.cart}}
|
||||||
<div class="col s6 align-right">
|
<div class="col s6 align-right">
|
||||||
<button class="btn waves-effect waves-light red darken-3" id="empty-cart" type="button">Empty cart</button>
|
<button class="btn waves-effect waves-light red darken-3" id="empty-cart" type="button">Empty cart</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue