t1meshift
/
expressCart
mirror of https://github.com/t1meshift/expressCart.git
1
0
Fork 0
Code Issues Releases Wiki Activity

UI fixes

master
Mark Moffat 2020-01-01 19:50:57 +10:30
parent eafb690445
commit d6e6fa0636
16 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
views/layouts/layout.hbs
View File

@ -32,7 +32,7 @@
<link rel="stylesheet" href="/stylesheets/admin{{config.env}}.css">
{{/if}}
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/esm/popper.min.js" integrity="sha256-g491Yv8nsEVSfQ6aonhVVFXoX5vF2uJQIU0hVNRg4JQ=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js" integrity="sha256-x3YZWtRjM8bJqf48dFAv/qmgL68SI4jqNWeSLMZaMGA=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha256-WqU1JavFxSAMcLP2WIOI+GB2zWmShMI82mTpLDcqFUg=" crossorigin="anonymous"></script>
{{#if admin}}
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.20.2/codemirror.min.js" integrity="sha256-K1exjHe1X4MP24jRizgBaSbUDUrNhFDRSwGoEYGmtJE=" crossorigin="anonymous"></script>
@ -140,8 +140,8 @@
<div class="row">
{{#if @root.session.cart}}
<div class="col-sm-12">
<button class="btn btn-outline-danger pull-left" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
<a href="/checkout/information" class="btn btn-outline-primary pull-right">Checkout</a>
<button class="btn btn-outline-danger float-left" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
<a href="/checkout/information" class="btn btn-outline-primary float-right">Checkout</a>
</div>
{{/if}}
</div>

44
views/order.hbs
View File

@ -6,14 +6,14 @@
<div class="order-layout col-md-12">
<div class="row">
<div class="col-md-12 bottom-pad-20">
<button id="orderStatusUpdate" class="btn btn-outline-success pull-left">{{ @root.__ "Update status" }}</button>
<a href="/admin/orders" class="btn btn-outline-info pull-right">{{ @root.__ "Go Back" }}</a>
<button id="orderStatusUpdate" class="btn btn-outline-success float-left">{{ @root.__ "Update status" }}</button>
<a href="/admin/orders" class="btn btn-outline-info float-right">{{ @root.__ "Go Back" }}</a>
</div>
</div>
<ul class="list-group">
<li class="list-group-item list-group-input-pad">
<strong> Order status: </strong><span class="text-{{getStatusColor result.orderStatus}} pull-right">{{result.orderStatus}}</span>
<div class="pull-right col-md-2">
<strong> Order status: </strong><span class="text-{{getStatusColor result.orderStatus}} float-right">{{result.orderStatus}}</span>
<div class="float-right col-md-2">
<select class="form-control" id="orderStatus">
<option>{{ @root.__ "Completed" }}</option>
<option>{{ @root.__ "Paid" }}</option>
@ -24,25 +24,25 @@
</select>
</div>
</li>
<li class="list-group-item"><strong> {{ @root.__ "Order date" }}: </strong><span class="pull-right">{{formatDate result.orderDate "DD/MM/YYYY hh:mmA"}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Order ID" }}: </strong><span class="pull-right">{{result._id}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Payment Gateway ref" }}: </strong><span class="pull-right">{{result.orderPaymentId}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Payment Gateway" }}: </strong><span class="pull-right">{{result.orderPaymentGateway}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Order date" }}: </strong><span class="float-right">{{formatDate result.orderDate "DD/MM/YYYY hh:mmA"}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Order ID" }}: </strong><span class="float-right">{{result._id}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Payment Gateway ref" }}: </strong><span class="float-right">{{result.orderPaymentId}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Payment Gateway" }}: </strong><span class="float-right">{{result.orderPaymentGateway}}</span></li>
{{#if result.orderPaymentMessage}}
<li class="list-group-item"><strong> {{ @root.__ "Payment Message" }}: </strong><span class="pull-right">{{result.orderPaymentMessage}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Payment Message" }}: </strong><span class="float-right">{{result.orderPaymentMessage}}</span></li>
{{/if}}
<li class="list-group-item"><strong> {{ @root.__ "Order total amount" }}: </strong><span class="pull-right">{{currencySymbol config.currencySymbol}}{{formatAmount result.orderTotal}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Email address" }}: </strong><span class="pull-right">{{result.orderEmail}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "First name" }}: </strong><span class="pull-right">{{result.orderFirstname}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Last name" }}: </strong><span class="pull-right">{{result.orderLastname}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Address 1" }}: </strong><span class="pull-right">{{result.orderAddr1}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Address 2" }}: </strong><span class="pull-right">{{result.orderAddr2}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Country" }}: </strong><span class="pull-right">{{result.orderCountry}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "State" }}: </strong><span class="pull-right">{{result.orderState}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Postcode" }}: </strong><span class="pull-right">{{result.orderPostcode}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Phone number" }}: </strong><span class="pull-right">{{result.orderPhoneNumber}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Order type" }}: </strong><span class="pull-right">{{result.orderType}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Order comment" }}: </strong><span class="pull-right">{{result.orderComment}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Order total amount" }}: </strong><span class="float-right">{{currencySymbol config.currencySymbol}}{{formatAmount result.orderTotal}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Email address" }}: </strong><span class="float-right">{{result.orderEmail}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "First name" }}: </strong><span class="float-right">{{result.orderFirstname}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Last name" }}: </strong><span class="float-right">{{result.orderLastname}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Address 1" }}: </strong><span class="float-right">{{result.orderAddr1}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Address 2" }}: </strong><span class="float-right">{{result.orderAddr2}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Country" }}: </strong><span class="float-right">{{result.orderCountry}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "State" }}: </strong><span class="float-right">{{result.orderState}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Postcode" }}: </strong><span class="float-right">{{result.orderPostcode}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Phone number" }}: </strong><span class="float-right">{{result.orderPhoneNumber}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Order type" }}: </strong><span class="float-right">{{result.orderType}}</span></li>
<li class="list-group-item"><strong> {{ @root.__ "Order comment" }}: </strong><span class="float-right">{{result.orderComment}}</span></li>
<li class="list-group-item">&nbsp;</li>
<li class="list-group-item"><strong class="text-info">{{ @root.__ "Products ordered" }}</strong></li>
@ -62,7 +62,7 @@
{{/each}}
)
{{/if}}
<div class="pull-right">{{currencySymbol @root.config.currencySymbol}}{{formatAmount this.totalItemPrice}}</div>
<div class="float-right">{{currencySymbol @root.config.currencySymbol}}{{formatAmount this.totalItemPrice}}</div>
{{#if productComment}}
<h4><span class="text-danger">Comment:</span> {{this.productComment}}</h4>
{{/if}}

2
views/orders.hbs
View File

@ -44,7 +44,7 @@
{{#if orders}}
{{#each orders}}
<li class="list-group-item">
<div class="pull-right top-pad-5">
<div class="float-right top-pad-5">
{{ @root.__ "Status" }}: <span class="text-{{getStatusColor this.orderStatus}}">{{this.orderStatus}}</span>
<a class="text-danger" href="/admin/order/delete/{{this._id}}" onclick="return confirm('Are you sure you want to delete this order?');"> <i class="fa fa-trash-o"></i></a>
</div>

2
views/product_edit.hbs
View File

@ -3,7 +3,7 @@
<form class="form-horizontal" id="productEditForm" data-toggle="validator">
<div class="col-sm-12">
<div class="page-header">
<div class="pull-right">
<div class="float-right">
<button type="button" class="btn btn-outline-info" data-toggle="modal" data-target="#myModal">{{ @root.__ "Upload image" }}</button>
<button id="productUpdate" class="btn btn-outline-success">{{ @root.__ "Save product" }} <i class="fa fa-floppy-o"></i></button>
</div>

2
views/product_new.hbs
View File

@ -2,7 +2,7 @@
<form class="form-horizontal" id="productNewForm" data-toggle="validator">
<div class="col-sm-12">
<div class="page-header">
<div class="pull-right">
<div class="float-right">
<button id="frm_edit_product_save" class="btn btn-outline-success" type="submit">Add product <i class="fa fa-plus"></i></button>
</div>
<h2>{{ @root.__ "New product" }}</h2>

6
views/products.hbs
View File

@ -16,7 +16,7 @@
<div class="col-sm-12">
<ul class="list-group">
<li class="list-group-item">
<span class="pull-right"><strong>{{ @root.__ "Published" }}</strong></span>
<span class="float-right"><strong>{{ @root.__ "Published" }}</strong></span>
{{#ifCond resultType '==' 'filtered'}}
<strong>{{ @root.__ "Products" }} - <span class="text-danger">{{ @root.__ "Filtered term" }}: {{searchTerm}} </span></strong>
{{else}}
@ -25,8 +25,8 @@
</li>
{{#each results}}
<li class="list-group-item">
<button class="pull-right btn text-danger btn-delete-product" data-id="{{this._id}}"> <i class="fa fa-trash-o"></i></button>
<h4 class="pull-right"><input id="{{this._id}}" class="published_state" type="checkbox" {{checkedState this.productPublished}}></h4>
<button class="float-right btn text-danger btn-delete-product" data-id="{{this._id}}"> <i class="fa fa-trash-o"></i></button>
<h4 class="float-right"><input id="{{this._id}}" class="published_state" type="checkbox" {{checkedState this.productPublished}}></h4>
<div class="top-pad-8"><a href="/admin/product/edit/{{this._id}}">{{this.productTitle}}</a></div>
</li>
{{/each}}

2
views/settings.hbs
View File

@ -4,7 +4,7 @@
<div class="col-md-10">
<form id="settingsForm" data-toggle="validator">
<h2 class="clearfix">{{ @root.__ "General settings" }}
<div class="pull-right">
<div class="float-right">
<button type="submit" id="btnSettingsUpdate" class="btn btn-outline-success">{{ @root.__ "Update" }}</button>
</h2>
<div class="form-group">

2
views/settings_page.hbs
View File

@ -3,7 +3,7 @@
<div class="row">
<div class="col-md-12">
<form id="settingsPageEditor">
<h2 class="clearfix">{{ @root.__ "Static page" }} <div class="pull-right"><button type="submit" id="btnPageUpdate" class="btn btn-outline-success">{{button_text}}</button></div></h2>
<h2 class="clearfix">{{ @root.__ "Static page" }} <div class="float-right"><button type="submit" id="btnPageUpdate" class="btn btn-outline-success">{{button_text}}</button></div></h2>
<input type="hidden" id="pageId" value="{{page._id}}">
<div class="form-group">
<label>{{ @root.__ "Page name" }} *</label>

2
views/settings_pages.hbs
View File

@ -2,7 +2,7 @@
<div class="col-sm-9">
<div class="row">
<div class="col-md-10">
<h2 class="clearfix">{{ @root.__ "Static pages" }} <div class="pull-right"><a href="/admin/settings/pages/new" class="btn btn-outline-success">{{ @root.__ "New page" }}</a></div></h2>
<h2 class="clearfix">{{ @root.__ "Static pages" }} <div class="float-right"><a href="/admin/settings/pages/new" class="btn btn-outline-success">{{ @root.__ "New page" }}</a></div></h2>
<p class="text-muted">
{{ @root.__ "Static_Pages_Info" }}
</p>

4
views/themes/Cloth/checkout-cart.hbs
View File

@ -5,8 +5,8 @@
<div class="row">
{{#if @root.session.cart}}
<div class="col-sm-12">
<button class="btn btn-outline-danger pull-left" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
<a href="/checkout/information" class="btn btn-outline-danger pull-right">Checkout</a>
<button class="btn btn-outline-danger float-left" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
<a href="/checkout/information" class="btn btn-outline-danger float-right">Checkout</a>
</div>
{{/if}}
</div>

8
views/themes/Cloth/checkout-information.hbs
View File

@ -49,7 +49,7 @@
<div class="row bottom-marg-15">
<div class="col-sm-12">
<button id="customerLogout"
class="btn btn-outline-primary pull-right">{{ @root.__ "Change customer" }}</button>
class="btn btn-outline-primary float-right">{{ @root.__ "Change customer" }}</button>
</div>
</div>
{{/if}}
@ -76,8 +76,8 @@
</div>
{{/unless}}
<div class="col-sm-12">
<a href="/checkout/cart" class="btn btn-outline-primary pull-left">Return to cart</a>
<a href="/checkout/shipping" id="checkoutInformation" class="btn btn-outline-primary pull-right">Continue to shipping</a>
<a href="/checkout/cart" class="btn btn-outline-primary float-left">Return to cart</a>
<a href="/checkout/shipping" id="checkoutInformation" class="btn btn-outline-primary float-right">Continue to shipping</a>
</div>
</div>
</form>
@ -89,7 +89,7 @@
{{#if @root.session.cart}}
<div class="row">
<div class="col-sm-12">
<button class="btn btn-outline-danger pull-right" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
<button class="btn btn-outline-danger float-right" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
</div>
{{/if}}
</div>

6
views/themes/Cloth/checkout-payment.hbs
View File

@ -19,7 +19,7 @@
<li class="list-group-item">
{{@root.session.customerFirstname}} {{@root.session.customerLastname}} -
{{@root.session.customerEmail}}
<span class="pull-right"><a href="/checkout/information">Change</a></span>
<span class="float-right"><a href="/checkout/information">Change</a></span>
</li>
</ul>
<ul class="list-group bottom-pad-15">
@ -31,12 +31,12 @@
</div>
<div class="col-md-6">
<span><strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong></span>
<span class="pull-right"><a href="/checkout/shipping">Change</a></span>
<span class="float-right"><a href="/checkout/shipping">Change</a></span>
</div>
</div>
</li>
{{else}}
<li class="list-group-item">FREE shipping <span class="pull-right"><a href="/checkout/shipping">Change</a></span></li>
<li class="list-group-item">FREE shipping <span class="float-right"><a href="/checkout/shipping">Change</a></span></li>
{{/if}}
</ul>
<form id="shipping-form" class="shipping-form" action="/{{config.paymentGateway}}/checkout_action{{@root.paymentType}}" method="post" role="form" data-toggle="validator" novalidate="false">

10
views/themes/Cloth/checkout-shipping.hbs
View File

@ -15,23 +15,23 @@
{{#unless @root.session.shippingOptions}}
<ul class="list-group">
{{#if @root.session.shippingCostApplied}}
<li class="list-group-item">Standard shipping <span class="pull-right"><strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong></span></li>
<li class="list-group-item">Standard shipping <span class="float-right"><strong>{{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}</strong></span></li>
{{else}}
<li class="list-group-item">FREE shipping <span class="pull-right"></li>
<li class="list-group-item">FREE shipping <span class="float-right"></li>
{{/if}}
</ul>
{{/unless}}
</div>
</div>
<a href="/checkout/information" class="btn btn-outline-primary pull-left">{{ @root.__ "Return to information" }}</a>
<a href="/checkout/payment" class="btn btn-outline-primary pull-right">{{ @root.__ "Proceed to payment" }}</a>
<a href="/checkout/information" class="btn btn-outline-primary float-left">{{ @root.__ "Return to information" }}</a>
<a href="/checkout/payment" class="btn btn-outline-primary float-right">{{ @root.__ "Proceed to payment" }}</a>
</div>
<div id="cart" class="col-md-7 d-none d-sm-block">
{{> (getTheme 'cart')}}
<div class="row">
{{#if @root.session.cart}}
<div class="col-sm-12">
<button class="btn btn-outline-danger pull-right" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
<button class="btn btn-outline-danger float-right" id="empty-cart" type="button">{{ @root.__ "Empty cart" }}</button>
</div>
{{/if}}
</div>

2
views/user_edit.hbs
View File

@ -40,7 +40,7 @@
</div>
</div><br/>
<div class="form-group">
<div class="pull-right">
<div class="float-right">
<button type="submit" class="btn btn-outline-success">{{ @root.__ "Update" }}</button>
</div>
</div>

2
views/user_new.hbs
View File

@ -21,7 +21,7 @@
<input type="password" data-match="#userPassword" class="form-control" required>
</div>
<div class="form-group">
<div class="pull-right">
<div class="float-right">
<button type="submit" class="btn btn-outline-success">{{ @root.__ "Create" }}</button>
</div>
</div>

4
views/users.hbs
View File

@ -2,12 +2,12 @@
<div class="col-sm-9">
<div class="row">
<div class="col-md-8">
<h2>Users <span class="pull-right"><a href="/admin/user/new" class="btn btn-outline-success">{{ @root.__ "New user" }}</a></span></h2>
<h2>Users <span class="float-right"><a href="/admin/user/new" class="btn btn-outline-success">{{ @root.__ "New user" }}</a></span></h2>
<ul class="list-group">
{{#each users}}
<li class="list-group-item">
<strong>{{ @root.__ "User" }}:</strong> {{this.usersName}} - ({{this.userEmail}})
<span class="pull-right">
<span class="float-right">
<strong>{{ @root.__ "Role" }}: </strong>
{{#isAnAdmin this.isAdmin}}
<span>Admin</span>