diff --git a/templates/_partials/footer.tpl b/templates/_partials/footer.tpl index e25b0aad5..3367cf4c2 100644 --- a/templates/_partials/footer.tpl +++ b/templates/_partials/footer.tpl @@ -15,11 +15,13 @@ {hook h='displayFooter'} {/block} +
{block name='hook_footer_after'} {hook h='displayFooterAfter'} {/block}
+

{block name='copyright_link'} diff --git a/templates/_partials/head.tpl b/templates/_partials/head.tpl index f842e865f..b3ed7384a 100644 --- a/templates/_partials/head.tpl +++ b/templates/_partials/head.tpl @@ -5,6 +5,7 @@ {block name='head_charset'} {/block} + {block name='head_ie_compatibility'} {/block} @@ -15,17 +16,22 @@ {/block} {block name='head_seo_title'}{$page.meta.title}{/block} + {block name='hook_after_title_tag'} {hook h='displayAfterTitleTag'} {/block} + + {if $page.meta.robots !== 'index'} {/if} + {if $page.canonical} {/if} + {block name='head_hreflang'} {foreach from=$urls.alternative_langs item=pageUrl key=code} diff --git a/templates/_partials/header.tpl b/templates/_partials/header.tpl index 707996fce..e6d569725 100644 --- a/templates/_partials/header.tpl +++ b/templates/_partials/header.tpl @@ -18,6 +18,7 @@

{hook h='displayNav1'}
+
{hook h='displayNav2'}
@@ -80,5 +81,6 @@ + {hook h='displayNavFullWidth'} {/block} diff --git a/templates/_partials/microdata/product-jsonld.tpl b/templates/_partials/microdata/product-jsonld.tpl index 13a9614a0..7cf7380c2 100644 --- a/templates/_partials/microdata/product-jsonld.tpl +++ b/templates/_partials/microdata/product-jsonld.tpl @@ -3,21 +3,27 @@ * file that was distributed with this source code. *} {assign var=hasAggregateRating value=false} + {if !empty($product.productComments.averageRating) && !empty($product.productComments.nbComments)} {assign var=hasAggregateRating value=true} {assign var=ratingValue value=$product.productComments.averageRating} {assign var=ratingReviewCount value=$product.productComments.nbComments} {/if} + {if !empty($ratings.avg) && !empty($nbComments)} {assign var=hasAggregateRating value=true} {assign var=ratingValue value=$ratings.avg} {assign var=ratingReviewCount value=$nbComments} {/if} + {assign var=hasWeight value=false} + {if isset($product.weight) && ($product.weight != 0)} {assign var=hasWeight value=true} {/if} + {assign var=hasOffers value=$product.show_price} +
+

check_circle

+

check_circle diff --git a/templates/components/qty-input.tpl b/templates/components/qty-input.tpl index fb8c374ea..4ac47e6e9 100644 --- a/templates/components/qty-input.tpl +++ b/templates/components/qty-input.tpl @@ -24,6 +24,7 @@ &#x{$prepend.confirm_icon};

+ $value} {$key}="{$value}" @@ -39,6 +40,7 @@ min="1" {* End of default attributes *} /> +
{/foreach} +
{l s='Add new address' d='Shop.Theme.Actions'} @@ -26,5 +27,4 @@
- {/block} diff --git a/templates/customer/authentication.tpl b/templates/customer/authentication.tpl index db01d616e..68d39aa3e 100644 --- a/templates/customer/authentication.tpl +++ b/templates/customer/authentication.tpl @@ -27,6 +27,7 @@

{l s='No account?' d='Shop.Theme.Customeraccount'}

+
{l s='Create your account' d='Shop.Theme.Actions'} diff --git a/templates/customer/discount.tpl b/templates/customer/discount.tpl index e722d439f..c33d34272 100644 --- a/templates/customer/discount.tpl +++ b/templates/customer/discount.tpl @@ -23,6 +23,7 @@ {l s='Expiration date' d='Shop.Theme.Checkout'} + {foreach from=$cart_rules item=cart_rule} @@ -38,6 +39,7 @@
+
{foreach from=$cart_rules item=cart_rule}
@@ -46,26 +48,32 @@ {l s='Code' d='Shop.Theme.Checkout'} {$cart_rule.code} +
  • {l s='Description' d='Shop.Theme.Checkout'} {$cart_rule.name}
    • +
  • {l s='Quantity' d='Shop.Theme.Checkout'} {$cart_rule.quantity_for_user}
    • +
  • {l s='Value' d='Shop.Theme.Checkout'} {$cart_rule.value}
    • +
  • {l s='Minimum' d='Shop.Theme.Checkout'} {$cart_rule.voucher_minimal}
    • +
  • {l s='Cumulative' d='Shop.Theme.Checkout'} {$cart_rule.voucher_cumulable}
    • +
  • {l s='Expiration date' d='Shop.Theme.Checkout'} {$cart_rule.voucher_date} diff --git a/templates/customer/guest-login.tpl b/templates/customer/guest-login.tpl index d502c45f3..068de566a 100644 --- a/templates/customer/guest-login.tpl +++ b/templates/customer/guest-login.tpl @@ -17,13 +17,13 @@
    -
    +
    {l s='Email:' d='Shop.Forms.Labels'} +
    -
    diff --git a/templates/customer/history.tpl b/templates/customer/history.tpl index 95e8f2624..3f61ea753 100644 --- a/templates/customer/history.tpl +++ b/templates/customer/history.tpl @@ -25,6 +25,7 @@   + {foreach from=$orders item=order} diff --git a/templates/customer/order-detail.tpl b/templates/customer/order-detail.tpl index ec7842e7c..979ab9864 100644 --- a/templates/customer/order-detail.tpl +++ b/templates/customer/order-detail.tpl @@ -20,9 +20,11 @@ sprintf=['%reference%' => $order.details.reference, '%date%' => $order.details.order_date] }

    +

    {l s='Carrier: %carrierName%' d='Shop.Theme.Checkout' sprintf=['%carrierName%' => $order.carrier.name]}

    +

    {l s='Payment method: %paymentMethod%' d='Shop.Theme.Checkout' sprintf=['%paymentMethod%' => $order.details.payment]}

    @@ -59,6 +61,7 @@ {block name='order_history'}

    {l s='Follow your order\'s status step-by-step' d='Shop.Theme.Customeraccount'}

    +
    @@ -67,6 +70,7 @@ + {foreach from=$order.history item=state} @@ -87,6 +91,7 @@ {if $order.follow_up}

    {l s='Click the following link to track the delivery of your order' d='Shop.Theme.Customeraccount'}

    + {$order.follow_up}
    {/if} @@ -95,6 +100,7 @@ {block name='addresses'}

    {l s='Addresses' d='Shop.Theme.Customeraccount'}

    +
    {if $order.addresses.delivery}
    @@ -143,6 +149,7 @@ {block name='order_carriers'} {if $order.shipping}

    {l s='Tracking' d='Shop.Theme.Customeraccount'}

    +
    {l s='Status' d='Shop.Theme.Global'}
    @@ -154,6 +161,7 @@ + {foreach from=$order.shipping item=line} @@ -176,18 +184,22 @@

    {l s='Date' d='Shop.Theme.Global'}

    {$line.shipping_date}

    +

  • {l s='Carrier' d='Shop.Theme.Checkout'}

    {$line.carrier_name}

    • +

  • {l s='Weight' d='Shop.Theme.Global'}

    {$line.shipping_weight}

    • +

  • {l s='Shipping cost' d='Shop.Theme.Global'}

    {$line.shipping_cost}

    • +

  • {l s='Tracking number' d='Shop.Theme.Global'}

    {$line.tracking nofilter}

    diff --git a/templates/customer/order-follow.tpl b/templates/customer/order-follow.tpl index 559c0b867..e43261af8 100644 --- a/templates/customer/order-follow.tpl +++ b/templates/customer/order-follow.tpl @@ -23,6 +23,7 @@
    • + {foreach from=$ordersReturn item=return} @@ -42,6 +43,7 @@
    {l s='Tracking number' d='Shop.Theme.Checkout'}
    {l s='Returns form' d='Shop.Theme.Customeraccount'}
    +
    {foreach from=$ordersReturn item=return}
    @@ -53,6 +55,7 @@

    +

    {l s='Return' d='Shop.Theme.Customeraccount'}

    @@ -61,14 +64,17 @@

    +

    {l s='Package status' d='Shop.Theme.Customeraccount'}

    {$return.state_name}

    +

    {l s='Date issued' d='Shop.Theme.Customeraccount'}

    {$return.return_date}

    + {if $return.print_url}

    {l s='Returns form' d='Shop.Theme.Customeraccount'}

    diff --git a/templates/customer/order-slip.tpl b/templates/customer/order-slip.tpl index b4a0f1ab1..5cab4c6cb 100644 --- a/templates/customer/order-slip.tpl +++ b/templates/customer/order-slip.tpl @@ -22,6 +22,7 @@ {l s='View credit slip' d='Shop.Theme.Customeraccount'} + {foreach from=$credit_slips item=slip} @@ -36,6 +37,7 @@
    +
    {foreach from=$credit_slips item=slip}
    @@ -44,14 +46,17 @@ {l s='Order' d='Shop.Theme.Customeraccount'} {$slip.order_reference}
    • +
  • {l s='Credit slip' d='Shop.Theme.Customeraccount'} {$slip.credit_slip_number}
    • +
  • {l s='Date issued' d='Shop.Theme.Customeraccount'} {$slip.credit_slip_date}
    • +
  • {l s='View credit slip' d='Shop.Theme.Customeraccount'} diff --git a/templates/customer/page.tpl b/templates/customer/page.tpl index 5999b3c9e..d5d20d282 100644 --- a/templates/customer/page.tpl +++ b/templates/customer/page.tpl @@ -10,6 +10,7 @@
    {include file='components/account-menu.tpl'}
    +
    {block name='page_header_container'} {block name='page_title'} @@ -17,6 +18,7 @@

    {$smarty.block.child}

    {/block} + {block name='account_link'}
    {l s='Back to login' d='Shop.Theme.Actions'} diff --git a/templates/customer/password-new.tpl b/templates/customer/password-new.tpl index 2cef9e612..f9c52f4b2 100644 --- a/templates/customer/password-new.tpl +++ b/templates/customer/password-new.tpl @@ -21,6 +21,7 @@
    • {/if} +
    {l @@ -63,9 +64,11 @@
    + + @@ -75,6 +78,7 @@ {block name='page_footer'}
    +     {l s='Back to login' d='Shop.Theme.Actions'} diff --git a/templates/index.tpl b/templates/index.tpl index 3b3149db9..6b3a6c342 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -11,7 +11,8 @@ {block name='content_wrapper'}
    - {hook h='displayContentWrapperTop'} + {hook h="displayContentWrapperTop"} + {block name='content'} {block name='page_header_container'} @@ -21,11 +22,11 @@ {/block} {/block} - + {block name='page_content_container'}
    {block name='page_content_top'}{/block} - + {block name='page_content'} {block name='hook_home'} {$HOOK_HOME nofilter} @@ -33,7 +34,7 @@ {/block}
    {/block} - + {block name='page_footer_container'}
    {block name='page_footer'} @@ -43,7 +44,8 @@ {/block} {/block} - {hook h='displayContentWrapperBottom'} + + {hook h="displayContentWrapperBottom"}
    {/block} diff --git a/templates/layouts/layout-both-columns.tpl b/templates/layouts/layout-both-columns.tpl index eeefa7bda..5fcd8b918 100644 --- a/templates/layouts/layout-both-columns.tpl +++ b/templates/layouts/layout-both-columns.tpl @@ -2,7 +2,6 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. *} - {include file='_partials/helpers.tpl'} diff --git a/templates/layouts/layout-error.tpl b/templates/layouts/layout-error.tpl index 674f23d6d..975d6deaf 100644 --- a/templates/layouts/layout-error.tpl +++ b/templates/layouts/layout-error.tpl @@ -4,32 +4,29 @@ *} - {block name='head_seo'} {block name='head_seo_title'}{/block} + {/block} + {block name='stylesheets'} {include file='_partials/stylesheets.tpl' stylesheets=$stylesheets} {/block} - -
    {block name='content'}

    Hello world! This is HTML5 Boilerplate.

    {/block}
    - - diff --git a/templates/page.tpl b/templates/page.tpl index 294477cd8..1d25bd569 100644 --- a/templates/page.tpl +++ b/templates/page.tpl @@ -16,6 +16,7 @@ {block name='page_content_container'}
    {block name='page_content_top'}{/block} + {block name='page_content'} {/block}