From d6e6fa063698c371770c9d8c64209b61ae52c0bc Mon Sep 17 00:00:00 2001 From: Mark Moffat Date: Wed, 1 Jan 2020 19:50:57 +1030 Subject: [PATCH] UI fixes --- views/layouts/layout.hbs | 6 +-- views/order.hbs | 44 ++++++++++----------- views/orders.hbs | 2 +- views/product_edit.hbs | 2 +- views/product_new.hbs | 2 +- views/products.hbs | 6 +-- views/settings.hbs | 2 +- views/settings_page.hbs | 2 +- views/settings_pages.hbs | 2 +- views/themes/Cloth/checkout-cart.hbs | 4 +- views/themes/Cloth/checkout-information.hbs | 8 ++-- views/themes/Cloth/checkout-payment.hbs | 6 +-- views/themes/Cloth/checkout-shipping.hbs | 10 ++--- views/user_edit.hbs | 2 +- views/user_new.hbs | 2 +- views/users.hbs | 4 +- 16 files changed, 52 insertions(+), 52 deletions(-) diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs index 7d59f7c..0d81cb2 100644 --- a/views/layouts/layout.hbs +++ b/views/layouts/layout.hbs @@ -32,7 +32,7 @@ {{/if}} - + {{#if admin}} @@ -140,8 +140,8 @@
{{#if @root.session.cart}}
- - Checkout + + Checkout
{{/if}}
diff --git a/views/order.hbs b/views/order.hbs index 5bfa869..9338e9f 100644 --- a/views/order.hbs +++ b/views/order.hbs @@ -6,14 +6,14 @@
- - {{ @root.__ "Go Back" }} + + {{ @root.__ "Go Back" }}
diff --git a/views/themes/Cloth/checkout-shipping.hbs b/views/themes/Cloth/checkout-shipping.hbs index 887dec7..a37bf6e 100644 --- a/views/themes/Cloth/checkout-shipping.hbs +++ b/views/themes/Cloth/checkout-shipping.hbs @@ -15,23 +15,23 @@ {{#unless @root.session.shippingOptions}}
    {{#if @root.session.shippingCostApplied}} -
  • Standard shipping {{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}
  • +
  • Standard shipping {{currencySymbol @root.config.currencySymbol}}{{formatAmount @root.config.flatShipping}}
  • {{else}} -
  • FREE shipping
  • +
  • FREE shipping
  • {{/if}}
{{/unless}}
- {{ @root.__ "Return to information" }} - {{ @root.__ "Proceed to payment" }} + {{ @root.__ "Return to information" }} + {{ @root.__ "Proceed to payment" }}
{{> (getTheme 'cart')}}
{{#if @root.session.cart}}
- +
{{/if}}
diff --git a/views/user_edit.hbs b/views/user_edit.hbs index 4be98e3..17f81c3 100644 --- a/views/user_edit.hbs +++ b/views/user_edit.hbs @@ -40,7 +40,7 @@

-
+
diff --git a/views/user_new.hbs b/views/user_new.hbs index 4a8935d..9275749 100644 --- a/views/user_new.hbs +++ b/views/user_new.hbs @@ -21,7 +21,7 @@
-
+
diff --git a/views/users.hbs b/views/users.hbs index af887a2..27605b7 100644 --- a/views/users.hbs +++ b/views/users.hbs @@ -2,12 +2,12 @@
-

Users {{ @root.__ "New user" }}

+

Users {{ @root.__ "New user" }}

    {{#each users}}
  • {{ @root.__ "User" }}: {{this.usersName}} - ({{this.userEmail}}) - + {{ @root.__ "Role" }}: {{#isAnAdmin this.isAdmin}} Admin