From 1f138480a0b1f08538b936496d36fa3af6147616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81ach?= Date: Fri, 16 Dec 2022 12:47:51 +0100 Subject: [PATCH 01/12] a few small fixes that have also been made in the classic theme --- .../ps_customersignin/ps_customersignin.tpl | 8 +- .../views/templates/hook/slider.tpl | 74 +++++++++---------- modules/ps_shoppingcart/modal.tpl | 8 +- 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/modules/ps_customersignin/ps_customersignin.tpl b/modules/ps_customersignin/ps_customersignin.tpl index bda9b5a62..e65795c39 100644 --- a/modules/ps_customersignin/ps_customersignin.tpl +++ b/modules/ps_customersignin/ps_customersignin.tpl @@ -65,7 +65,13 @@ {else} - + {l s='Sign in' d='Shop.Theme.Actions'} diff --git a/modules/ps_imageslider/views/templates/hook/slider.tpl b/modules/ps_imageslider/views/templates/hook/slider.tpl index 7c362dc88..316e82a0c 100644 --- a/modules/ps_imageslider/views/templates/hook/slider.tpl +++ b/modules/ps_imageslider/views/templates/hook/slider.tpl @@ -4,43 +4,43 @@ *} {if $homeslider.slides} -
-
-
- {assign var="count" value=0} - {foreach from=$homeslider.slides item=slide name='homeslider'} - - {$count = $count + 1} - {/foreach} -
-
- {foreach from=$homeslider.slides item=slide name='homeslider'} -
  • - {if !empty($slide.url)}{/if} -
    - {$slide.legend|escape} - {if $slide.title || $slide.description} -
    -

    {$slide.title}

    -
    {$slide.description nofilter}
    -
    - {/if} -
    - {if !empty($slide.url)}    {/if} -
    • - {/foreach} -
    +
    +
    +
    + {assign var="count" value=0} + {foreach from=$homeslider.slides item=slide name='homeslider'} + + {$count = $count + 1} + {/foreach} +
    +
    + {foreach from=$homeslider.slides item=slide name='homeslider'} +
  • + {if !empty($slide.url)}{/if} +
    + {$slide.legend|escape} + {if $slide.title || $slide.description} +
    +

    {$slide.title}

    +
    {$slide.description nofilter}
    +
    + {/if} +
    + {if !empty($slide.url)}    {/if} +
    • + {/foreach} +
    - - -
    + +
    +
    {/if} diff --git a/modules/ps_shoppingcart/modal.tpl b/modules/ps_shoppingcart/modal.tpl index c900937f6..195eadc7c 100644 --- a/modules/ps_shoppingcart/modal.tpl +++ b/modules/ps_shoppingcart/modal.tpl @@ -58,18 +58,18 @@
    {l s='Subtotal:' d='Shop.Theme.Checkout'} - {$cart.subtotals.products.value} + {$cart.subtotals.products.value}
    {if $cart.subtotals.shipping.value}
    {l s='Shipping:' d='Shop.Theme.Checkout'} - {$cart.subtotals.shipping.value} {hook h='displayCheckoutSubtotalDetails' subtotal=$cart.subtotals.shipping} + {$cart.subtotals.shipping.value} {hook h='displayCheckoutSubtotalDetails' subtotal=$cart.subtotals.shipping}
    {/if}
    {if !$configuration.display_prices_tax_incl && $configuration.taxes_enabled}
    - {$cart.totals.total.label} {$cart.labels.tax_short} + {$cart.totals.total.label}{if $configuration.display_taxes_label} {$cart.labels.tax_short}{/if} {$cart.totals.total.value}
    @@ -78,7 +78,7 @@
    {else}
    - {$cart.totals.total.label} {if $configuration.taxes_enabled}{$cart.labels.tax_short}{/if} + {$cart.totals.total.label} {if $configuration.taxes_enabled && $configuration.display_taxes_label}{$cart.labels.tax_short}{/if} {$cart.totals.total.value}
    {/if} From 93111d0189dffdbceea4cf7c7d9feab43a60e0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81ach?= Date: Fri, 16 Dec 2022 13:09:08 +0100 Subject: [PATCH 02/12] ps_imageslider corrections --- modules/ps_imageslider/views/templates/hook/slider.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ps_imageslider/views/templates/hook/slider.tpl b/modules/ps_imageslider/views/templates/hook/slider.tpl index 316e82a0c..f6806042b 100644 --- a/modules/ps_imageslider/views/templates/hook/slider.tpl +++ b/modules/ps_imageslider/views/templates/hook/slider.tpl @@ -20,7 +20,7 @@ aria-hidden="{if $smarty.foreach.homeslider.first}false{else}true{/if}"> {if !empty($slide.url)}{/if}
    - {$slide.legend|escape} + {$slide.legend|escape} {if $slide.title || $slide.description}

    {$slide.title}

    @@ -35,11 +35,11 @@
    From 0b19bd4e2c50a03d94f24a2a1d5668e662f63a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=81ach?= Date: Fri, 16 Dec 2022 14:36:40 +0100 Subject: [PATCH 03/12] improved style of modules 'ps_supplierlist', 'ps_brandlist' in the left column --- .../views/templates/_partials/brand_text.tpl | 7 +++-- .../views/templates/hook/ps_brandlist.tpl | 9 +++--- .../templates/_partials/supplier_text.tpl | 7 +++-- .../views/templates/hook/ps_supplierlist.tpl | 7 +++-- src/scss/custom/components/_index.scss | 1 + .../search-filters-modules/_index.scss | 1 + .../_search-filters-modules.scss | 30 +++++++++++++++++++ 7 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 src/scss/custom/components/search-filters-modules/_index.scss create mode 100644 src/scss/custom/components/search-filters-modules/_search-filters-modules.scss diff --git a/modules/ps_brandlist/views/templates/_partials/brand_text.tpl b/modules/ps_brandlist/views/templates/_partials/brand_text.tpl index 9440bef1a..ade12bd7c 100644 --- a/modules/ps_brandlist/views/templates/_partials/brand_text.tpl +++ b/modules/ps_brandlist/views/templates/_partials/brand_text.tpl @@ -2,12 +2,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. *} +{$componentName = 'search-filters-modules'} -