From e9115f049df5d0b6ef259a27840f5749d944af94 Mon Sep 17 00:00:00 2001 From: Yannick Armand Date: Fri, 9 Feb 2024 16:25:42 +0100 Subject: [PATCH 1/5] .tpl : fix formatting --- .../views/templates/hook/ps_bestsellers.tpl | 18 +- .../views/templates/hook/ps_brandlist.tpl | 2 +- .../templates/hook/ps_categoryproducts.tpl | 6 +- .../views/templates/hook/ps_crossselling.tpl | 5 +- .../ps_customeraccountlinks.tpl | 4 +- .../templates/hook/ps_featuredproducts.tpl | 4 +- .../views/templates/hook/ps_newproducts.tpl | 17 +- .../views/templates/hook/ps_specials.tpl | 17 +- .../views/templates/hook/ps_supplierlist.tpl | 2 +- .../views/templates/hook/ps_viewedproduct.tpl | 5 +- .../templates/hook/displayGDPRConsent.tpl | 2 +- .../useProgressRing/index.stories.mdx | 2 +- templates/_partials/breadcrumb.tpl | 6 +- templates/_partials/footer.tpl | 2 + templates/_partials/form-errors.tpl | 27 +-- templates/_partials/form-fields.tpl | 7 +- templates/_partials/head.tpl | 10 +- templates/_partials/header.tpl | 3 +- templates/_partials/javascript.tpl | 2 +- templates/_partials/microdata/head-jsonld.tpl | 19 ++- .../_partials/microdata/product-jsonld.tpl | 94 +++++----- .../microdata/product-list-jsonld.tpl | 16 +- templates/_partials/notifications.tpl | 94 +++++----- templates/_partials/pagination-seo.tpl | 40 +++-- templates/_partials/pagination.tpl | 3 +- .../catalog/_partials/category-footer.tpl | 6 +- .../catalog/_partials/category-header.tpl | 43 ++--- .../catalog/_partials/customization-modal.tpl | 13 +- templates/catalog/_partials/facets.tpl | 14 +- .../catalog/_partials/miniatures/brand.tpl | 6 +- .../catalog/_partials/miniatures/category.tpl | 2 +- .../catalog/_partials/product-accessories.tpl | 5 +- .../catalog/_partials/product-activation.tpl | 1 + .../catalog/_partials/product-add-to-cart.tpl | 5 +- .../_partials/product-cover-thumbnails.tpl | 9 +- .../_partials/product-customization-modal.tpl | 10 ++ .../_partials/product-customization.tpl | 6 + .../catalog/_partials/product-details.tpl | 18 +- .../catalog/_partials/product-discounts.tpl | 26 +-- .../_partials/product-images-modal.tpl | 2 +- .../catalog/_partials/product-prices.tpl | 7 +- .../catalog/_partials/product-variants.tpl | 5 +- templates/catalog/_partials/productlist.tpl | 4 +- templates/catalog/_partials/products.tpl | 2 +- templates/catalog/_partials/quickview.tpl | 97 ++++++----- templates/catalog/_partials/sort-orders.tpl | 2 + templates/catalog/_partials/subcategories.tpl | 1 + templates/catalog/_partials/variant-links.tpl | 7 +- templates/catalog/brands.tpl | 2 +- templates/catalog/listing/manufacturer.tpl | 4 +- templates/catalog/listing/product-list.tpl | 67 ++++---- templates/catalog/listing/search.tpl | 4 +- templates/catalog/listing/supplier.tpl | 2 +- templates/catalog/product.tpl | 126 +++++++------- templates/catalog/suppliers.tpl | 2 +- templates/checkout/_partials/address-form.tpl | 16 +- .../_partials/address-selector-block.tpl | 3 + .../_partials/cart-detailed-actions.tpl | 16 +- .../_partials/cart-detailed-product-line.tpl | 2 +- .../_partials/cart-detailed-totals.tpl | 2 + .../checkout/_partials/cart-detailed.tpl | 5 +- .../_partials/cart-summary-products.tpl | 1 + .../_partials/cart-summary-subtotals.tpl | 5 +- .../_partials/cart-summary-totals.tpl | 3 +- templates/checkout/_partials/cart-voucher.tpl | 2 + .../checkout/_partials/customer-form.tpl | 31 ++-- templates/checkout/_partials/login-form.tpl | 2 +- templates/checkout/_partials/modal-terms.tpl | 1 + .../_partials/order-confirmation-table.tpl | 161 +++++++++--------- .../_partials/order-final-summary-table.tpl | 1 + .../_partials/order-final-summary.tpl | 21 ++- .../checkout/_partials/steps/addresses.tpl | 3 +- .../_partials/steps/checkout-step.tpl | 24 +-- .../checkout/_partials/steps/payment.tpl | 7 +- .../_partials/steps/personal-information.tpl | 5 +- .../checkout/_partials/steps/shipping.tpl | 5 + templates/checkout/checkout-navigation.tpl | 2 +- templates/checkout/checkout.tpl | 2 +- templates/components/account-menu.tpl | 1 + .../components/password-policy-template.tpl | 3 + templates/components/qty-input.tpl | 2 + templates/components/toast-container.tpl | 2 +- templates/components/toast.tpl | 1 + templates/contact.tpl | 4 +- templates/customer/_partials/address-form.tpl | 8 +- .../customer/_partials/customer-form.tpl | 8 +- templates/customer/address.tpl | 2 +- templates/customer/addresses.tpl | 2 +- templates/customer/authentication.tpl | 3 +- templates/customer/discount.tpl | 8 + templates/customer/guest-login.tpl | 6 +- templates/customer/history.tpl | 1 + templates/customer/order-detail.tpl | 20 ++- templates/customer/order-follow.tpl | 16 +- templates/customer/order-return.tpl | 74 +++++--- templates/customer/order-slip.tpl | 5 + templates/customer/page.tpl | 10 +- templates/customer/password-email.tpl | 6 +- templates/customer/password-infos.tpl | 3 +- templates/customer/password-new.tpl | 14 +- templates/customer/registration.tpl | 7 +- templates/errors/404.tpl | 4 +- templates/errors/410.tpl | 4 +- templates/errors/maintenance.tpl | 52 +++--- templates/errors/not-found.tpl | 15 +- templates/errors/restricted-country.tpl | 36 ++-- templates/index.tpl | 20 ++- templates/layouts/layout-both-columns.tpl | 39 ++--- templates/layouts/layout-content-only.tpl | 18 +- templates/layouts/layout-error.tpl | 9 +- templates/layouts/layout-full-width.tpl | 28 +-- templates/layouts/layout-left-column.tpl | 22 +-- templates/layouts/layout-right-column.tpl | 20 ++- templates/page.tpl | 3 +- 114 files changed, 961 insertions(+), 740 deletions(-) diff --git a/modules/ps_bestsellers/views/templates/hook/ps_bestsellers.tpl b/modules/ps_bestsellers/views/templates/hook/ps_bestsellers.tpl index 3329e2da1..92b657792 100644 --- a/modules/ps_bestsellers/views/templates/hook/ps_bestsellers.tpl +++ b/modules/ps_bestsellers/views/templates/hook/ps_bestsellers.tpl @@ -3,13 +3,15 @@ * file that was distributed with this source code. *}
-
- {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"} -
- - {l s='All 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'} + +
+ + {l s='All best sellers' d='Shop.Theme.Catalog'} +
+
diff --git a/modules/ps_brandlist/views/templates/hook/ps_brandlist.tpl b/modules/ps_brandlist/views/templates/hook/ps_brandlist.tpl index fe2a69a13..a4fbad4ca 100644 --- a/modules/ps_brandlist/views/templates/hook/ps_brandlist.tpl +++ b/modules/ps_brandlist/views/templates/hook/ps_brandlist.tpl @@ -18,7 +18,7 @@
{if $brands} - {include file="module:ps_brandlist/views/templates/_partials/$brand_display_type.tpl" brands=$brands} + {include file='module:ps_brandlist/views/templates/_partials/$brand_display_type.tpl' brands=$brands} {else}

{l s='No brand' d='Shop.Theme.Catalog'}

{/if} diff --git a/modules/ps_categoryproducts/views/templates/hook/ps_categoryproducts.tpl b/modules/ps_categoryproducts/views/templates/hook/ps_categoryproducts.tpl index 6aef12c06..140f7000a 100644 --- a/modules/ps_categoryproducts/views/templates/hook/ps_categoryproducts.tpl +++ b/modules/ps_categoryproducts/views/templates/hook/ps_categoryproducts.tpl @@ -5,11 +5,11 @@
{if $products|@count == 1} - {include file="components/section-title.tpl" title={l s='%s other product in the same category' sprintf=[$products|@count] d='Shop.Theme.Catalog'}} + {include file='components/section-title.tpl' title={l s='%s other product in the same category' sprintf=[$products|@count] d='Shop.Theme.Catalog'}} {else} - {include file="components/section-title.tpl" title={l s='%s other products in the same category' sprintf=[$products|@count] d='Shop.Theme.Catalog'}} + {include file='components/section-title.tpl' title={l s='%s other products in the same category' sprintf=[$products|@count] d='Shop.Theme.Catalog'}} {/if} - {include file="catalog/_partials/productlist.tpl" products=$products productClass="col-6 col-lg-4 col-xl-3"} + {include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'}
diff --git a/modules/ps_crossselling/views/templates/hook/ps_crossselling.tpl b/modules/ps_crossselling/views/templates/hook/ps_crossselling.tpl index a8c803286..61d6783b1 100644 --- a/modules/ps_crossselling/views/templates/hook/ps_crossselling.tpl +++ b/modules/ps_crossselling/views/templates/hook/ps_crossselling.tpl @@ -5,7 +5,8 @@
- {include file="components/section-title.tpl" title={l s='Customers who bought this product also bought:' d='Shop.Theme.Catalog'}} - {include file="catalog/_partials/productlist.tpl" products=$products productClass="col-6 col-lg-4 col-xl-3"} + {include file='components/section-title.tpl' title={l s='Customers who bought this product also bought:' 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_customeraccountlinks/ps_customeraccountlinks.tpl b/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl index 0eedc41ff..ed27679b9 100644 --- a/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl +++ b/modules/ps_customeraccountlinks/ps_customeraccountlinks.tpl @@ -34,13 +34,13 @@ {if $configuration.return_enabled && !$configuration.is_catalog}
  • {l s='Merchandise returns' d='Shop.Theme.Customeraccount'}
    • {/if} - {hook h="displayMyAccountBlock"} + {hook h='displayMyAccountBlock'}
  • {l s='Sign out' d='Shop.Theme.Actions'}
    • {else}
  • {l s='Order tracking' d='Shop.Theme.Customeraccount'}
  • {l s='Sign in' d='Shop.Theme.Actions'}
  • {l s='Create account' d='Shop.Theme.Customeraccount'}
    • - {hook h="displayMyAccountBlock"} + {hook h='displayMyAccountBlock'} {/if}
    diff --git a/modules/ps_featuredproducts/views/templates/hook/ps_featuredproducts.tpl b/modules/ps_featuredproducts/views/templates/hook/ps_featuredproducts.tpl index 74d7e7d2d..822b44943 100644 --- a/modules/ps_featuredproducts/views/templates/hook/ps_featuredproducts.tpl +++ b/modules/ps_featuredproducts/views/templates/hook/ps_featuredproducts.tpl @@ -4,8 +4,8 @@ *}
    - {include file="components/section-title.tpl" title={l s="Popular Products" d="Shop.Theme.Catalog"}} - {include file="catalog/_partials/productlist.tpl" products=$products productClass="col-6 col-lg-4 col-xl-3"} + {include file='components/section-title.tpl' title={l s='Popular Products' 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_newproducts/views/templates/hook/ps_newproducts.tpl b/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl index 0b0759850..e913a4634 100644 --- a/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl +++ b/modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl @@ -4,13 +4,14 @@ *}
    -
    - {include file="components/section-title.tpl" title={l s="New products" d="Shop.Theme.Catalog"}} - {include file="catalog/_partials/productlist.tpl" products=$products productClass="col-6 col-lg-4 col-xl-3"} -
    - - {l s='All new products' d='Shop.Theme.Catalog'} - -
    +
    + {include file='components/section-title.tpl' title={l s='New products' d='Shop.Theme.Catalog'}} + {include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'} + +
    + + {l s='All new products' d='Shop.Theme.Catalog'} +
    +
    diff --git a/modules/ps_specials/views/templates/hook/ps_specials.tpl b/modules/ps_specials/views/templates/hook/ps_specials.tpl index 920626cc8..252d30860 100644 --- a/modules/ps_specials/views/templates/hook/ps_specials.tpl +++ b/modules/ps_specials/views/templates/hook/ps_specials.tpl @@ -4,13 +4,14 @@ *}
    -
    - {include file="components/section-title.tpl" title={l s="On sale" d="Shop.Theme.Catalog"}} - {include file="catalog/_partials/productlist.tpl" products=$products productClass="col-6 col-lg-4 col-xl-3"} -
    - - {l s='All sale products' d='Shop.Theme.Catalog'} - -
    +
    + {include file='components/section-title.tpl' title={l s='On sale' d='Shop.Theme.Catalog'}} + {include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'} + +
    + + {l s='All sale products' d='Shop.Theme.Catalog'} +
    +
    diff --git a/modules/ps_supplierlist/views/templates/hook/ps_supplierlist.tpl b/modules/ps_supplierlist/views/templates/hook/ps_supplierlist.tpl index 58cbbe362..09f4a379e 100644 --- a/modules/ps_supplierlist/views/templates/hook/ps_supplierlist.tpl +++ b/modules/ps_supplierlist/views/templates/hook/ps_supplierlist.tpl @@ -18,7 +18,7 @@
    {if $suppliers} - {include file="module:ps_supplierlist/views/templates/_partials/$supplier_display_type.tpl" suppliers=$suppliers} + {include file='module:ps_supplierlist/views/templates/_partials/$supplier_display_type.tpl' suppliers=$suppliers} {else}

    {l s='No supplier' d='Shop.Theme.Catalog'}

    {/if} diff --git a/modules/ps_viewedproduct/views/templates/hook/ps_viewedproduct.tpl b/modules/ps_viewedproduct/views/templates/hook/ps_viewedproduct.tpl index 7c17b9a81..1dd955fe1 100644 --- a/modules/ps_viewedproduct/views/templates/hook/ps_viewedproduct.tpl +++ b/modules/ps_viewedproduct/views/templates/hook/ps_viewedproduct.tpl @@ -4,7 +4,8 @@ *}
    - {include file="components/section-title.tpl" title={l s="Viewed products" d="Shop.Theme.Catalog"}} - {include file="catalog/_partials/productlist.tpl" products=$products productClass="col-6 col-lg-4 col-xl-3"} + {include file='components/section-title.tpl' title={l s='Viewed products' 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/psgdpr/views/templates/hook/displayGDPRConsent.tpl b/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl index 71dcff497..d959ada3c 100644 --- a/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl +++ b/modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl @@ -16,7 +16,7 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) * International Registered Trademark & Property of PrestaShop SA *} -{extends file="modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl"} +{extends file='modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl'} {block name='gdpr_checkbox'} + {hook h='displayNavFullWidth'} {/block} diff --git a/templates/_partials/javascript.tpl b/templates/_partials/javascript.tpl index 4866caa4f..2db7a1578 100644 --- a/templates/_partials/javascript.tpl +++ b/templates/_partials/javascript.tpl @@ -15,7 +15,7 @@ {if isset($vars) && $vars|@count} {/if} diff --git a/templates/_partials/microdata/head-jsonld.tpl b/templates/_partials/microdata/head-jsonld.tpl index 80f8df257..26ef0e9ea 100644 --- a/templates/_partials/microdata/head-jsonld.tpl +++ b/templates/_partials/microdata/head-jsonld.tpl @@ -6,12 +6,12 @@ { "@context": "https://schema.org", "@type": "Organization", - "name" : "{$shop.name}", - "url" : "{$urls.pages.index}", + "name": "{$shop.name}", + "url": "{$urls.pages.index}", {if $shop.logo_details} "logo": { "@type": "ImageObject", - "url":"{$shop.logo_details.src}" + "url": "{$shop.logo_details.src}" } {/if} } @@ -23,11 +23,11 @@ "@type": "WebPage", "isPartOf": { "@type": "WebSite", - "url": "{$urls.pages.index}", + "url": "{$urls.pages.index}", "name": "{$shop.name}" }, "name": "{$page.meta.title}", - "url": "{$urls.current_url}" + "url": "{$urls.current_url}" } @@ -36,7 +36,7 @@ { "@context": "https://schema.org", "@type": "WebSite", - "url" : "{$urls.pages.index}", + "url": "{$urls.pages.index}", "image": { "@type": "ImageObject", "url":"{$shop.logo_details.src}" @@ -62,8 +62,9 @@ "position": {$smarty.foreach.breadcrumb.iteration}, "name": "{$path.title}", "item": "{$path.url}" - }{if !$smarty.foreach.breadcrumb.last},{/if} - {/foreach}] - } + }{if !$smarty.foreach.breadcrumb.last},{/if} + {/foreach} + ] + } {/if} diff --git a/templates/_partials/microdata/product-jsonld.tpl b/templates/_partials/microdata/product-jsonld.tpl index 13a9614a0..90c9f2e35 100644 --- a/templates/_partials/microdata/product-jsonld.tpl +++ b/templates/_partials/microdata/product-jsonld.tpl @@ -3,89 +3,95 @@ * 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} + diff --git a/templates/_partials/microdata/product-list-jsonld.tpl b/templates/_partials/microdata/product-list-jsonld.tpl index 4ed2bfdea..3a4764191 100644 --- a/templates/_partials/microdata/product-list-jsonld.tpl +++ b/templates/_partials/microdata/product-list-jsonld.tpl @@ -7,14 +7,14 @@ "@context": "https://schema.org", "@type": "ItemList", "itemListElement": [ - {foreach from=$listing.products item=item name=productsForJsonLd} - { - "@type": "ListItem", - "position": {$smarty.foreach.productsForJsonLd.iteration}, - "name": "{$item.name}", - "url": "{$item.url}" - }{if !$smarty.foreach.productsForJsonLd.last},{/if} - {/foreach} + {foreach from=$listing.products item=item name=productsForJsonLd} + { + "@type": "ListItem", + "position": {$smarty.foreach.productsForJsonLd.iteration}, + "name": "{$item.name}", + "url": "{$item.url}" + }{if !$smarty.foreach.productsForJsonLd.last},{/if} + {/foreach} ] } diff --git a/templates/_partials/notifications.tpl b/templates/_partials/notifications.tpl index b08d47dee..11a0930a9 100644 --- a/templates/_partials/notifications.tpl +++ b/templates/_partials/notifications.tpl @@ -4,55 +4,55 @@ *} {if isset($notifications)} -
    -
    - {if $notifications.error} - {block name='notifications_error'} - - {/block} - {/if} +
    +
    + {if $notifications.error} + {block name='notifications_error'} + + {/block} + {/if} - {if $notifications.warning} - {block name='notifications_warning'} - - {/block} - {/if} + {if $notifications.warning} + {block name='notifications_warning'} + + {/block} + {/if} - {if $notifications.success} - {block name='notifications_success'} - - {/block} - {/if} + {if $notifications.success} + {block name='notifications_success'} + + {/block} + {/if} - {if $notifications.info} - {block name='notifications_info'} - - {/block} - {/if} + {if $notifications.info} + {block name='notifications_info'} + + {/block} + {/if} +
    -
    {/if} diff --git a/templates/_partials/pagination-seo.tpl b/templates/_partials/pagination-seo.tpl index bed1d2895..b887c107e 100644 --- a/templates/_partials/pagination-seo.tpl +++ b/templates/_partials/pagination-seo.tpl @@ -4,24 +4,28 @@ *} {if isset($listing.pagination) && $listing.pagination.should_be_displayed} - {$page_nb = 1} - {if isset($smarty.get.page)} - {$page_nb = $smarty.get.page|intval|default:1} - {/if} - {$queryPage = '?page='|cat:$page_nb} - {$page.canonical = $page.canonical|replace:$queryPage:''} + {$page_nb = 1} - {$prev = false} - {$next = false} - {if ($page_nb - 1) == 1} - {$prev = $page.canonical} - {elseif $page_nb> 2} - {$prev = ($page['canonical']|cat:'?page='|cat:($page_nb - 1))} - {/if} - {if $listing.pagination.total_items> $listing.pagination.items_shown_to} - {$next = ($page['canonical']|cat:'?page='|cat:($page_nb + 1))} - {/if} + {if isset($smarty.get.page)} + {$page_nb = $smarty.get.page|intval|default:1} + {/if} - {if $prev}{/if} - {if $next}{/if} + {$queryPage = '?page='|cat:$page_nb} + {$page.canonical = $page.canonical|replace:$queryPage:''} + + {$prev = false} + {$next = false} + + {if ($page_nb - 1) == 1} + {$prev = $page.canonical} + {elseif $page_nb> 2} + {$prev = ($page['canonical']|cat:'?page='|cat:($page_nb - 1))} + {/if} + + {if $listing.pagination.total_items> $listing.pagination.items_shown_to} + {$next = ($page['canonical']|cat:'?page='|cat:($page_nb + 1))} + {/if} + + {if $prev}{/if} + {if $next}{/if} {/if} diff --git a/templates/_partials/pagination.tpl b/templates/_partials/pagination.tpl index 16bda5e95..7bac1b49d 100644 --- a/templates/_partials/pagination.tpl +++ b/templates/_partials/pagination.tpl @@ -25,7 +25,8 @@
  • + class="page-link btn-with-icon {if $page.type === 'previous'}previous {elseif $page.type === 'next'}next {/if}{['disabled' => !$page.clickable, 'js-pager-link' => true]|classnames}" + > {if $page.type === 'previous'} {l s='Previous' d='Shop.Theme.Actions'} diff --git a/templates/catalog/_partials/category-footer.tpl b/templates/catalog/_partials/category-footer.tpl index 9119ad94b..169621a90 100644 --- a/templates/catalog/_partials/category-footer.tpl +++ b/templates/catalog/_partials/category-footer.tpl @@ -3,7 +3,7 @@ * file that was distributed with this source code. *} diff --git a/templates/catalog/_partials/category-header.tpl b/templates/catalog/_partials/category-header.tpl index 43b9236e9..1dae08bbe 100644 --- a/templates/catalog/_partials/category-header.tpl +++ b/templates/catalog/_partials/category-header.tpl @@ -3,25 +3,28 @@ * file that was distributed with this source code. *}
    - {if $listing.pagination.items_shown_from == 1} -
    - {include file="components/page-title-section.tpl" title={$category.name}} - {if $category.description} -
    {$category.description nofilter}
    - {/if} - {if !empty($category.image.large.url)} -
    - {if !empty($category.image.legend)}{$category.image.legend}{else}{$category.name}{/if} -
    - {/if} + {if $listing.pagination.items_shown_from == 1} +
    + {include file='components/page-title-section.tpl' title={$category.name}} + + {if $category.description} +
    {$category.description nofilter}
    + {/if} + + {if !empty($category.image.large.url)} +
    + {if !empty($category.image.legend)}{$category.image.legend}{else}{$category.name}{/if}
    - {/if} - {if isset($subcategories) && $subcategories|@count> 0} - {include file='catalog/_partials/subcategories.tpl' subcategories=$subcategories} - {/if} + {/if} +
    + {/if} + + {if isset($subcategories) && $subcategories|@count> 0} + {include file='catalog/_partials/subcategories.tpl' subcategories=$subcategories} + {/if}
    diff --git a/templates/catalog/_partials/customization-modal.tpl b/templates/catalog/_partials/customization-modal.tpl index edcd98d13..86fedc0ee 100644 --- a/templates/catalog/_partials/customization-modal.tpl +++ b/templates/catalog/_partials/customization-modal.tpl @@ -5,18 +5,21 @@ +
    +
    {foreach from=$customization.fields item="field"}
    - {if $field.type != 'image'} - {$field.label} - {else} - {l s='Image' d='Shop.Theme.Catalog'} - {/if} + {if $field.type != 'image'} + {$field.label} + {else} + {l s='Image' d='Shop.Theme.Catalog'} + {/if}
    +
    {if $field.type == 'text'} {if (int)$field.id_module} diff --git a/templates/catalog/_partials/facets.tpl b/templates/catalog/_partials/facets.tpl index 56ab2dcc6..0cc61b92c 100644 --- a/templates/catalog/_partials/facets.tpl +++ b/templates/catalog/_partials/facets.tpl @@ -26,14 +26,17 @@

    {$facet.label}

    + {assign var=_expand_id value=10|mt_rand:100000} {assign var=_collapse value=true} + {foreach from=$facet.filters item="filter"} {if $filter.active}{assign var=_collapse value=false}{/if} {/foreach}

    {$facet.label}

    + @@ -85,7 +88,7 @@ href="{$filter.nextEncodedFacetsURL}" class="_gray-darker search-link js-search-link" rel="nofollow" - > + > {$filter.label} {if $filter.magnitude} ({$filter.magnitude}) @@ -96,15 +99,14 @@ {/foreach} {/block} - {else} - {block name='facet_item_dropdown'}
    {/if} +
    {l @@ -29,10 +30,13 @@ sprintf=['%email%' => stripslashes($customer_email)] }
    +
    +
    +
    +
    +
    - + +
    + + @@ -75,6 +84,7 @@ {block name='page_footer'}
    +     {l s='Back to login' d='Shop.Theme.Actions'} diff --git a/templates/customer/registration.tpl b/templates/customer/registration.tpl index 8db7fee46..ffcb8e12c 100644 --- a/templates/customer/registration.tpl +++ b/templates/customer/registration.tpl @@ -4,7 +4,7 @@ *} {extends file='page.tpl'} -{block name="container_class"}container container--limited-md{/block} +{block name='container_class'}container container--limited-md{/block} {block name='page_title'} {l s='Create an account' d='Shop.Theme.Customeraccount'} @@ -13,9 +13,12 @@ {block name='page_content'} {block name='register_form_container'} {$hook_create_account_top nofilter} +
    - {render file='customer/_partials/customer-form.tpl' ui=$register_form mode="register"} + {render file='customer/_partials/customer-form.tpl' ui=$register_form mode='register'} +
    +
    {/block} diff --git a/templates/errors/404.tpl b/templates/errors/404.tpl index 124f694b5..dac3cd32d 100644 --- a/templates/errors/404.tpl +++ b/templates/errors/404.tpl @@ -4,9 +4,9 @@ *} {extends file='page.tpl'} -{block name="breadcrumb"}{/block} +{block name='breadcrumb'}{/block} -{block name="container_class"}container container--limited-md text-center{/block} +{block name='container_class'}container container--limited-md text-center{/block} {block name='page_header_container'} {block name='page_title'} diff --git a/templates/errors/410.tpl b/templates/errors/410.tpl index 3dc14af2b..52dddf488 100644 --- a/templates/errors/410.tpl +++ b/templates/errors/410.tpl @@ -4,9 +4,9 @@ *} {extends file='page.tpl'} -{block name="breadcrumb"}{/block} +{block name='breadcrumb'}{/block} -{block name="container_class"}container container--limited-md text-center{/block} +{block name='container_class'}container container--limited-md text-center{/block} {block name='page_header_container'} {block name='page_title'} diff --git a/templates/errors/maintenance.tpl b/templates/errors/maintenance.tpl index 07f407ad5..b929349ff 100644 --- a/templates/errors/maintenance.tpl +++ b/templates/errors/maintenance.tpl @@ -5,33 +5,29 @@ {extends file='layouts/layout-error.tpl'} {block name='content'} - - {block name='page_header_container'} -
    - {block name='page_header_logo'} + {block name='page_header_container'} +
    + {block name='page_header_logo'} - {/block} - - {block name='hook_maintenance'} - {$HOOK_MAINTENANCE nofilter} - {/block} - - {block name='page_header'} -

    {block name='page_title'}{l s='We\'ll be back soon.' d='Shop.Theme.Global'}{/block}

    - {/block} -
    - {/block} - - {block name='page_content_container'} -
    - {block name='page_content'} - {$maintenance_text nofilter} - {/block} -
    - {/block} - - {block name='page_footer_container'} - - {/block} - + {/block} + + {block name='hook_maintenance'} + {$HOOK_MAINTENANCE nofilter} + {/block} + + {block name='page_header'} +

    {block name='page_title'}{l s='We\'ll be back soon.' d='Shop.Theme.Global'}{/block}

    + {/block} +
    + {/block} + + {block name='page_content_container'} +
    + {block name='page_content'} + {$maintenance_text nofilter} + {/block} +
    + {/block} + + {block name='page_footer_container'}{/block} {/block} diff --git a/templates/errors/not-found.tpl b/templates/errors/not-found.tpl index be14e6a13..b9b62443b 100644 --- a/templates/errors/not-found.tpl +++ b/templates/errors/not-found.tpl @@ -4,16 +4,19 @@ *}
    {block name='page_content'} - {block name="error_content"} + {block name='error_content'} {if isset($errorContent)} - {$errorContent nofilter} - - {l s='Back to Home page' d='Shop.Theme.Catalog'} - - + {$errorContent nofilter} + + + {l s='Back to Home page' d='Shop.Theme.Catalog'} + + {else}

    {l s='The page you are looking for is no longer available' d='Shop.Theme.Catalog'}

    +

    {l s='It can not be reached anymore. Can we still attract you into our shop?' d='Shop.Theme.Catalog'}

    + {l s='Go shopping' d='Shop.Theme.Catalog'} diff --git a/templates/errors/restricted-country.tpl b/templates/errors/restricted-country.tpl index ef466ec1e..bd288c74a 100644 --- a/templates/errors/restricted-country.tpl +++ b/templates/errors/restricted-country.tpl @@ -5,27 +5,25 @@ {extends file='layouts/layout-error.tpl'} {block name='content'} + {block name='page_header_container'} +
    + - {block name='page_header_container'} -
    - - {block name='page_header'} -

    {block name='page_title'}{$shop.name}{/block}

    - {/block} -
    - {/block} + {block name='page_header'} +

    {block name='page_title'}{$shop.name}{/block}

    + {/block} +
    + {/block} - {block name='page_content_container'} -
    - {block name='page_content'} -

    {l s='403 Forbidden' d='Shop.Theme.Global'}

    -

    {l s='You cannot access this store from your country. We apologize for the inconvenience.' d='Shop.Theme.Global'}

    - {/block} -
    - {/block} + {block name='page_content_container'} +
    + {block name='page_content'} +

    {l s='403 Forbidden' d='Shop.Theme.Global'}

    - {block name='page_footer_container'} - - {/block} +

    {l s='You cannot access this store from your country. We apologize for the inconvenience.' d='Shop.Theme.Global'}

    + {/block} +
    + {/block} + {block name='page_footer_container'}{/block} {/block} diff --git a/templates/index.tpl b/templates/index.tpl index cec2d7cb2..7ff2ea365 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -6,12 +6,13 @@ {block name='breadcrumb'}{/block} -{block name="content_columns"} - {block name="left_column"}{/block} +{block name='content_columns'} + {block name='left_column'}{/block} - {block name="content_wrapper"} + {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,9 +44,10 @@ {/block} {/block} - {hook h="displayContentWrapperBottom"} + + {hook h='displayContentWrapperBottom'}
    {/block} - {block name="right_column"}{/block} + {block name='right_column'}{/block} {/block} diff --git a/templates/layouts/layout-both-columns.tpl b/templates/layouts/layout-both-columns.tpl index 32c1401f3..0091f3370 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'} @@ -29,7 +28,7 @@
    - {hook h="displayWrapperTop"} + {hook h='displayWrapperTop'} {block name='breadcrumb'} {include file='_partials/breadcrumb.tpl'} @@ -39,35 +38,37 @@ {include file='_partials/notifications.tpl'} {/block} - {block name="content_columns"} -
    + {block name='content_columns'} +
    - {block name="left_column"} + {block name='left_column'}
    - {if $page.page_name == 'product'} + {if $page.page_name === 'product'} {hook h='displayLeftColumnProduct'} {else} - {hook h="displayLeftColumn"} + {hook h='displayLeftColumn'} {/if}
    {/block} - {block name="content_wrapper"} + {block name='content_wrapper'}
    - {hook h="displayContentWrapperTop"} - {block name="content"} + {hook h='displayContentWrapperTop'} + + {block name='content'}

    Hello world! This is HTML5 Boilerplate.

    {/block} - {hook h="displayContentWrapperBottom"} + + {hook h='displayContentWrapperBottom'}
    {/block} - {block name="right_column"} + {block name='right_column'}
    - {if $page.page_name == 'product'} + {if $page.page_name === 'product'} {hook h='displayRightColumnProduct'} {else} - {hook h="displayRightColumn"} + {hook h='displayRightColumn'} {/if}
    {/block} @@ -75,21 +76,21 @@
    {/block} - {hook h="displayWrapperBottom"} + {hook h='displayWrapperBottom'}
    - {block name="footer"} - {include file="_partials/footer.tpl"} + {block name='footer'} + {include file='_partials/footer.tpl'} {/block}
    {block name='javascript_bottom'} - {include file="_partials/javascript.tpl" javascript=$javascript.bottom} + {include file='_partials/javascript.tpl' javascript=$javascript.bottom} {/block} {block name='bottom_elements'} - {include file="components/page-loader.tpl"} + {include file='components/page-loader.tpl'} {include file='components/toast-container.tpl'} {include file='components/password-policy-template.tpl'} {/block} diff --git a/templates/layouts/layout-content-only.tpl b/templates/layouts/layout-content-only.tpl index 8eb67774a..641b77190 100644 --- a/templates/layouts/layout-content-only.tpl +++ b/templates/layouts/layout-content-only.tpl @@ -6,18 +6,22 @@ {block name='header'}{/block} -{block name="content_columns"} - {block name="left_column"}{/block} - {block name="content_wrapper"} +{block name='content_columns'} + {block name='left_column'}{/block} + + {block name='content_wrapper'}
    - {hook h="displayContentWrapperTop"} - {block name="content"} + {hook h='displayContentWrapperTop'} + + {block name='content'}

    Hello world! This is HTML5 Boilerplate.

    {/block} - {hook h="displayContentWrapperBottom"} + + {hook h='displayContentWrapperBottom'}
    {/block} - {block name="right_column"}{/block} + + {block name='right_column'}{/block} {/block} {block name='footer'}{/block} diff --git a/templates/layouts/layout-error.tpl b/templates/layouts/layout-error.tpl index 1c2ceee82..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} + {include file='_partials/stylesheets.tpl' stylesheets=$stylesheets} {/block} - -
    {block name='content'}

    Hello world! This is HTML5 Boilerplate.

    {/block}
    - - diff --git a/templates/layouts/layout-full-width.tpl b/templates/layouts/layout-full-width.tpl index 01f069214..a1e89d428 100644 --- a/templates/layouts/layout-full-width.tpl +++ b/templates/layouts/layout-full-width.tpl @@ -5,17 +5,21 @@ {extends file='layouts/layout-both-columns.tpl'} {block name='content_columns'} -
    - {block name="left_column"}{/block} - {block name="content_wrapper"} -
    - {hook h="displayContentWrapperTop"} - {block name="content"} -

    Hello world! This is HTML5 Boilerplate.

    - {/block} - {hook h="displayContentWrapperBottom"} -
    - {/block} - {block name="right_column"}{/block} +
    + {block name='left_column'}{/block} + + {block name='content_wrapper'} +
    + {hook h='displayContentWrapperTop'} + + {block name='content'} +

    Hello world! This is HTML5 Boilerplate.

    + {/block} + + {hook h='displayContentWrapperBottom'} +
    + {/block} + + {block name='right_column'}{/block}
    {/block} diff --git a/templates/layouts/layout-left-column.tpl b/templates/layouts/layout-left-column.tpl index 88c7d83ab..10da6520b 100644 --- a/templates/layouts/layout-left-column.tpl +++ b/templates/layouts/layout-left-column.tpl @@ -4,30 +4,32 @@ *} {extends file='layouts/layout-both-columns.tpl'} -{block name="content_columns"} -
    +{block name='content_columns'} +
    - {block name="left_column"} + {block name='left_column'}
    - {if $page.page_name == 'product'} + {if $page.page_name === 'product'} {hook h='displayLeftColumnProduct'} {else} - {hook h="displayLeftColumn"} + {hook h='displayLeftColumn'} {/if}
    {/block} - {block name="content_wrapper"} + {block name='content_wrapper'}
    - {hook h="displayContentWrapperTop"} - {block name="content"} + {hook h='displayContentWrapperTop'} + + {block name='content'}

    Hello world! This is HTML5 Boilerplate.

    {/block} - {hook h="displayContentWrapperBottom"} + + {hook h='displayContentWrapperBottom'}
    {/block} - {block name="right_column"}{/block} + {block name='right_column'}{/block}
    {/block} diff --git a/templates/layouts/layout-right-column.tpl b/templates/layouts/layout-right-column.tpl index a4270e992..0fc658535 100644 --- a/templates/layouts/layout-right-column.tpl +++ b/templates/layouts/layout-right-column.tpl @@ -4,27 +4,29 @@ *} {extends file='layouts/layout-both-columns.tpl'} -{block name="content_columns"} -
    +{block name='content_columns'} +
    {block name='left_column'}{/block} - {block name="content_wrapper"} + {block name='content_wrapper'}
    - {hook h="displayContentWrapperTop"} - {block name="content"} + {hook h='displayContentWrapperTop'} + + {block name='content'}

    Hello world! This is HTML5 Boilerplate.

    {/block} - {hook h="displayContentWrapperBottom"} + + {hook h='displayContentWrapperBottom'}
    {/block} - {block name="right_column"} + {block name='right_column'}
    - {if $page.page_name == 'product'} + {if $page.page_name === 'product'} {hook h='displayRightColumnProduct'} {else} - {hook h="displayRightColumn"} + {hook h='displayRightColumn'} {/if}
    {/block} diff --git a/templates/page.tpl b/templates/page.tpl index 294477cd8..91f4b2200 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} @@ -25,7 +26,7 @@ {block name='page_footer_container'}
    {block name='page_footer'} - + {/block}
    {/block} From 1a70c5682fba63c85922e14839a0f10e7ff2d37b Mon Sep 17 00:00:00 2001 From: Yannick Armand Date: Fri, 9 Feb 2024 17:42:38 +0100 Subject: [PATCH 2/5] Search: fix string for translation --- templates/catalog/listing/search.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/catalog/listing/search.tpl b/templates/catalog/listing/search.tpl index 90234843e..114aef739 100644 --- a/templates/catalog/listing/search.tpl +++ b/templates/catalog/listing/search.tpl @@ -18,10 +18,10 @@ {l s='Nothing to search for' d='Shop.Theme.Catalog'} {else} {if $listing.products|count} - {l s='Search results for' d='Shop.Theme.Catalog'} + {l s='Search results for "%s"' sprintf=[$smarty.get.s] d='Shop.Theme.Catalog' } {else} - {l s='No search results for' d='Shop.Theme.Catalog'} - {/if} "{$smarty.get.s}" + {l s='No search results for "%s"' sprintf=[$smarty.get.s] d='Shop.Theme.Catalog'} + {/if} {/if} {/block} From 20597c0ebd850037e781f8489ef8df07a3308301 Mon Sep 17 00:00:00 2001 From: Yannick Armand Date: Fri, 9 Feb 2024 17:59:27 +0100 Subject: [PATCH 3/5] 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}     From 53f3672b7019100738eaf9c48f639cf7b232f1e4 Mon Sep 17 00:00:00 2001 From: Yannick Armand Date: Fri, 9 Feb 2024 18:06:10 +0100 Subject: [PATCH 4/5] Templates: fix some formatting --- .../catalog/_partials/category-header.tpl | 14 ++++++++------ .../catalog/_partials/customization-modal.tpl | 8 +++++++- templates/catalog/_partials/facets.tpl | 13 ++++++++----- .../catalog/_partials/miniatures/brand.tpl | 1 + .../catalog/_partials/miniatures/product.tpl | 18 +++++++++++++----- .../catalog/_partials/product-accessories.tpl | 2 +- 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/templates/catalog/_partials/category-header.tpl b/templates/catalog/_partials/category-header.tpl index 1dae08bbe..4f36aa7d2 100644 --- a/templates/catalog/_partials/category-header.tpl +++ b/templates/catalog/_partials/category-header.tpl @@ -13,12 +13,14 @@ {if !empty($category.image.large.url)}
    - {if !empty($category.image.legend)}{$category.image.legend}{else}{$category.name}{/if} + {if !empty($category.image.legend)}{$category.image.legend}{else}{$category.name}{/if}
    {/if}
    • diff --git a/templates/catalog/_partials/customization-modal.tpl b/templates/catalog/_partials/customization-modal.tpl index 86fedc0ee..c6b44619d 100644 --- a/templates/catalog/_partials/customization-modal.tpl +++ b/templates/catalog/_partials/customization-modal.tpl @@ -1,4 +1,10 @@ -