From 20597c0ebd850037e781f8489ef8df07a3308301 Mon Sep 17 00:00:00 2001 From: Yannick Armand Date: Fri, 9 Feb 2024 17:59:27 +0100 Subject: [PATCH] Templates: fix some formatting --- .../views/templates/hook/ps_bestsellers.tpl | 2 +- .../views/templates/hook/product.tpl | 4 +- templates/_partials/head.tpl | 19 ++++++--- templates/_partials/header.tpl | 39 ++++++++++++++++--- templates/_partials/pagination.tpl | 3 +- templates/catalog/listing/search.tpl | 4 +- .../checkout/_partials/steps/addresses.tpl | 4 +- 7 files changed, 56 insertions(+), 19 deletions(-) diff --git a/modules/ps_bestsellers/views/templates/hook/ps_bestsellers.tpl b/modules/ps_bestsellers/views/templates/hook/ps_bestsellers.tpl index 92b657792..464fd0602 100644 --- a/modules/ps_bestsellers/views/templates/hook/ps_bestsellers.tpl +++ b/modules/ps_bestsellers/views/templates/hook/ps_bestsellers.tpl @@ -4,7 +4,7 @@ *}
- {include file='components/section-title.tpl' title={l s="Best Sellers" d="Shop.Theme.Catalog"}} + {include file='components/section-title.tpl' title={l s='Best Sellers' d='Shop.Theme.Catalog'}} {include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'} diff --git a/modules/ps_emailalerts/views/templates/hook/product.tpl b/modules/ps_emailalerts/views/templates/hook/product.tpl index d1541a9c4..4b7f59a36 100644 --- a/modules/ps_emailalerts/views/templates/hook/product.tpl +++ b/modules/ps_emailalerts/views/templates/hook/product.tpl @@ -25,10 +25,10 @@
{if isset($email) AND $email} -

{l s="Interested in this product? Drop us an email and we will let you know when it's available for order." d='Modules.Emailalerts.Shop'}

+

{l s='Interested in this product? Drop us an email and we will let you know when it\'s available for order.' d='Modules.Emailalerts.Shop'}

{else} -

{l s="Interested in this product? Click below and we will let you know when it's available for order." d='Modules.Emailalerts.Shop'}

+

{l s='Interested in this product? Click below and we will let you know when it\'s available for order.' d='Modules.Emailalerts.Shop'}

{/if} {if !empty($id_module)} diff --git a/templates/_partials/head.tpl b/templates/_partials/head.tpl index f842e865f..642c0e3e1 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} @@ -43,11 +49,14 @@ {/block} {block name='head_open_graph'} - - - - - {if !isset($product) && $page.page_name != 'product'}{/if} + + + + + + {if !isset($product) && $page.page_name !== 'product'} + + {/if} {/block} {/block} diff --git a/templates/_partials/header.tpl b/templates/_partials/header.tpl index 8413d5f73..916f3203e 100644 --- a/templates/_partials/header.tpl +++ b/templates/_partials/header.tpl @@ -33,23 +33,50 @@
- + search
-
+
- + +
diff --git a/templates/_partials/pagination.tpl b/templates/_partials/pagination.tpl index 7bac1b49d..179b7df7b 100644 --- a/templates/_partials/pagination.tpl +++ b/templates/_partials/pagination.tpl @@ -23,7 +23,8 @@ {else}
  • - diff --git a/templates/catalog/listing/search.tpl b/templates/catalog/listing/search.tpl index 114aef739..f0a376715 100644 --- a/templates/catalog/listing/search.tpl +++ b/templates/catalog/listing/search.tpl @@ -18,9 +18,9 @@ {l s='Nothing to search for' d='Shop.Theme.Catalog'} {else} {if $listing.products|count} - {l s='Search results for "%s"' sprintf=[$smarty.get.s] d='Shop.Theme.Catalog' } + {l s='Search results for "%search_string%"' sprintf=['%search_string%' => $smarty.get.s] d='Shop.Theme.Catalog'} {else} - {l s='No search results for "%s"' sprintf=[$smarty.get.s] d='Shop.Theme.Catalog'} + {l s='No search results for "%search_string%"' sprintf=['%search_string%' => $smarty.get.s] d='Shop.Theme.Catalog'} {/if} {/if} diff --git a/templates/checkout/_partials/steps/addresses.tpl b/templates/checkout/_partials/steps/addresses.tpl index 9df81dcc3..a2bc69efd 100644 --- a/templates/checkout/_partials/steps/addresses.tpl +++ b/templates/checkout/_partials/steps/addresses.tpl @@ -46,7 +46,7 @@ {if isset($delivery_address_error)}

    {$delivery_address_error.exception}

    {else} - + {/if}     @@ -87,7 +87,7 @@ {if isset($invoice_address_error)}

    {$invoice_address_error.exception}

    {else} - + {/if}