diff --git a/config/theme.yml b/config/theme.yml index 4ab1fc749..daa3c2675 100644 --- a/config/theme.yml +++ b/config/theme.yml @@ -182,3 +182,5 @@ theme_settings: new-products: layout-left-column prices-drop: layout-left-column contact: layout-left-column + manufacturer: layout-left-column + supplier: layout-left-column \ No newline at end of file diff --git a/modules/productcomments/views/templates/hook/confirm-modal.tpl b/modules/productcomments/views/templates/hook/confirm-modal.tpl index 5beb32c87..cca85af99 100644 --- a/modules/productcomments/views/templates/hook/confirm-modal.tpl +++ b/modules/productcomments/views/templates/hook/confirm-modal.tpl @@ -38,10 +38,10 @@
- -
diff --git a/modules/ps_brandlist/views/templates/_partials/brand_text.tpl b/modules/ps_brandlist/views/templates/_partials/brand_text.tpl index 9440bef1a..71ef0c5b0 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'} -
{else} - + {l s='Sign in' d='Shop.Theme.Actions'} diff --git a/modules/ps_emailalerts/views/templates/front/mailalerts-account-line.tpl b/modules/ps_emailalerts/views/templates/front/mailalerts-account-line.tpl new file mode 100644 index 000000000..a7e3e838f --- /dev/null +++ b/modules/ps_emailalerts/views/templates/front/mailalerts-account-line.tpl @@ -0,0 +1,24 @@ +{** + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + *} +{$componentName = 'mailalerts-account-line'} + +
+ + + + +
+ {$mailAlert.name} + {$mailAlert.attributes_small} +
+ + + delete + +
diff --git a/modules/ps_emailalerts/views/templates/front/mailalerts-account.tpl b/modules/ps_emailalerts/views/templates/front/mailalerts-account.tpl new file mode 100644 index 000000000..18ebe5aee --- /dev/null +++ b/modules/ps_emailalerts/views/templates/front/mailalerts-account.tpl @@ -0,0 +1,21 @@ +{** + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + *} +{extends file='customer/page.tpl'} + +{block name='page_title'} + {l s='My alerts' d='Modules.Emailalerts.Shop'} +{/block} + +{block name='page_content'} + {if $mailAlerts} + + {else} + + {/if} +{/block} diff --git a/modules/ps_emailalerts/views/templates/hook/product.tpl b/modules/ps_emailalerts/views/templates/hook/product.tpl index 302263dd9..d1541a9c4 100644 --- a/modules/ps_emailalerts/views/templates/hook/product.tpl +++ b/modules/ps_emailalerts/views/templates/hook/product.tpl @@ -23,7 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} -
+
{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'}

diff --git a/modules/ps_imageslider/views/templates/hook/slider.tpl b/modules/ps_imageslider/views/templates/hook/slider.tpl index 7c362dc88..f6806042b 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} diff --git a/modules/ps_supplierlist/views/templates/_partials/supplier_text.tpl b/modules/ps_supplierlist/views/templates/_partials/supplier_text.tpl index 125df103d..dce6af0d9 100644 --- a/modules/ps_supplierlist/views/templates/_partials/supplier_text.tpl +++ b/modules/ps_supplierlist/views/templates/_partials/supplier_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'} -
      +
        {foreach from=$suppliers item=supplier name=supplier_list} {if $smarty.foreach.supplier_list.iteration <= $text_list_nb} -
      • - +
      • + {$supplier['name']}
        • diff --git a/modules/ps_supplierlist/views/templates/hook/ps_supplierlist.tpl b/modules/ps_supplierlist/views/templates/hook/ps_supplierlist.tpl index 2c9bd6fc4..58cbbe362 100644 --- a/modules/ps_supplierlist/views/templates/hook/ps_supplierlist.tpl +++ b/modules/ps_supplierlist/views/templates/hook/ps_supplierlist.tpl @@ -2,15 +2,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. *} +{$componentName = 'search-filters-modules'}
        -
        +
        {if $display_link_supplier} - + {l s='Suppliers' d='Shop.Theme.Catalog'} {else} -

        +

        {l s='Suppliers' d='Shop.Theme.Catalog'}

        {/if} diff --git a/src/scss/custom/components/_index.scss b/src/scss/custom/components/_index.scss index d3d5a392f..99e610c82 100644 --- a/src/scss/custom/components/_index.scss +++ b/src/scss/custom/components/_index.scss @@ -15,3 +15,5 @@ @import "address"; @import "table-wrapper"; @import "product"; +@import "search-filters-modules"; +@import "mailalerts-account"; diff --git a/src/scss/custom/components/mailalerts-account/_index.scss b/src/scss/custom/components/mailalerts-account/_index.scss new file mode 100644 index 000000000..8d7bf337e --- /dev/null +++ b/src/scss/custom/components/mailalerts-account/_index.scss @@ -0,0 +1 @@ +@import "mailalerts-account"; diff --git a/src/scss/custom/components/mailalerts-account/_mailalerts-account.scss b/src/scss/custom/components/mailalerts-account/_mailalerts-account.scss new file mode 100644 index 000000000..2e95a89d9 --- /dev/null +++ b/src/scss/custom/components/mailalerts-account/_mailalerts-account.scss @@ -0,0 +1,29 @@ +$component-name: mailalerts-account-line; + +.#{$component-name} { + padding: 1rem; + border: var(--bs-border-width) solid var(--bs-border-color); + border-radius: var(--bs-border-radius-xl); + + &__product { + min-height: 54px; + + &__name { + font-size: 0.875rem; + font-weight: 600; + color: var(--bs-body-color); + } + + &__attributes { + font-size: 0.75rem; + color: var(--bs-body-color); + } + } + + &__remove { + position: absolute; + top: 0; + right: 0; + color: var(--bs-black); + } +} diff --git a/src/scss/custom/components/search-filters-modules/_index.scss b/src/scss/custom/components/search-filters-modules/_index.scss new file mode 100644 index 000000000..68258ff94 --- /dev/null +++ b/src/scss/custom/components/search-filters-modules/_index.scss @@ -0,0 +1 @@ +@import "search-filters-modules"; diff --git a/src/scss/custom/components/search-filters-modules/_search-filters-modules.scss b/src/scss/custom/components/search-filters-modules/_search-filters-modules.scss new file mode 100644 index 000000000..6b15a48b9 --- /dev/null +++ b/src/scss/custom/components/search-filters-modules/_search-filters-modules.scss @@ -0,0 +1,26 @@ +$component-name: search-filters-modules; + +.#{$component-name} { + padding-bottom: 1rem; + margin-bottom: 2rem; + border-bottom: var(--category-tree-border-bottom); + + &-title { + font-size: var(--category-tree-title-size); + font-weight: 600; + color: var(--category-tree-title-color); + } + + &__list { + margin-bottom: 0; + } + + &__item { + &__link { + display: block; + font-weight: 600; + line-height: 2rem; + color: var(--category-tree-title-color); + } + } +} diff --git a/src/scss/custom/components/search-filters/_search-filters.scss b/src/scss/custom/components/search-filters/_search-filters.scss index 3dc1f1a5e..c664affbb 100644 --- a/src/scss/custom/components/search-filters/_search-filters.scss +++ b/src/scss/custom/components/search-filters/_search-filters.scss @@ -1,6 +1,10 @@ $component-name: search-filters; .#{$component-name} { + padding-bottom: 1rem; + margin-bottom: 2rem; + border-bottom: var(--category-tree-border-bottom); + & &-title { font-size: var(--category-tree-title-size); font-weight: 600; diff --git a/templates/catalog/_partials/category-header.tpl b/templates/catalog/_partials/category-header.tpl index d256412f0..2548b5fbe 100644 --- a/templates/catalog/_partials/category-header.tpl +++ b/templates/catalog/_partials/category-header.tpl @@ -5,7 +5,7 @@
        {if $listing.pagination.items_shown_from == 1}
        -

        {$category.name}

        + {include file="components/page-title-section.tpl" title={$category.name}} {if $category.description}
        {$category.description nofilter}
        {/if} @@ -14,6 +14,7 @@ {if !empty($category.image.legend)}{$category.image.legend}{else}{$category.name}{/if}
        diff --git a/templates/catalog/brands.tpl b/templates/catalog/brands.tpl index e02e565ec..7037a1296 100644 --- a/templates/catalog/brands.tpl +++ b/templates/catalog/brands.tpl @@ -6,7 +6,7 @@ {block name='content'} {block name='brand_header'} -

        {l s='Brands' d='Shop.Theme.Catalog'}

        + {include file="components/page-title-section.tpl" title={l s='Brands' d='Shop.Theme.Catalog'}} {/block} {block name='brand_miniature'} diff --git a/templates/catalog/listing/manufacturer.tpl b/templates/catalog/listing/manufacturer.tpl index 1a8c95807..5095a2114 100644 --- a/templates/catalog/listing/manufacturer.tpl +++ b/templates/catalog/listing/manufacturer.tpl @@ -5,7 +5,7 @@ {extends file='catalog/listing/product-list.tpl'} {block name='product_list_header'} -

        {l s='List of products by brand %brand_name%' sprintf=['%brand_name%' => $manufacturer.name] d='Shop.Theme.Catalog'}

        + {include file="components/page-title-section.tpl" title={l s='List of products by brand %brand_name%' sprintf=['%brand_name%' => $manufacturer.name] d='Shop.Theme.Catalog'}}
        {$manufacturer.short_description nofilter}
        {$manufacturer.description nofilter}
        {/block} diff --git a/templates/catalog/listing/supplier.tpl b/templates/catalog/listing/supplier.tpl index 4a4bc9ac5..ab4efa78c 100644 --- a/templates/catalog/listing/supplier.tpl +++ b/templates/catalog/listing/supplier.tpl @@ -5,6 +5,6 @@ {extends file='catalog/listing/product-list.tpl'} {block name='product_list_header'} -

        {l s='List of products by supplier %s' sprintf=[$supplier.name] d='Shop.Theme.Catalog'}

        + {include file="components/page-title-section.tpl" title={l s='List of products by supplier %s' sprintf=[$supplier.name] d='Shop.Theme.Catalog'}}
        {$supplier.description nofilter}
        {/block} diff --git a/templates/catalog/suppliers.tpl b/templates/catalog/suppliers.tpl index 5666e4637..e54e8395a 100644 --- a/templates/catalog/suppliers.tpl +++ b/templates/catalog/suppliers.tpl @@ -5,5 +5,5 @@ {extends file='catalog/brands.tpl'} {block name='brand_header'} -

        {l s='Suppliers' d='Shop.Theme.Catalog'}

        + {include file="components/page-title-section.tpl" title={l s='Suppliers' d='Shop.Theme.Catalog'}} {/block} diff --git a/templates/components/page-title-section.tpl b/templates/components/page-title-section.tpl new file mode 100644 index 000000000..12b6fc83d --- /dev/null +++ b/templates/components/page-title-section.tpl @@ -0,0 +1,9 @@ +{** + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + *} +{$componentName = 'page-title-section'} + +{block name='page_title_section'} +

        {$title}

        +{/block}