From c7ff507f5e20600a17b1601a04c1702848eafa66 Mon Sep 17 00:00:00 2001 From: Brieuc-brd Date: Fri, 31 Mar 2023 13:48:03 +0200 Subject: [PATCH] [IMP] website, *: add `sales_four` header *: website_sale, website_sale_wishlist task-3060986 Part-of: odoo/odoo#119650 --- addons/website/models/theme_models.py | 1 + .../header_template_sales_four.svg | 1 + .../static/src/scss/primary_variables.scss | 2 + .../static/src/scss/secondary_variables.scss | 1 + addons/website/static/src/scss/website.scss | 8 +- addons/website/views/snippets/snippets.xml | 18 +++- addons/website/views/website_templates.xml | 101 ++++++++++++++++++ addons/website_sale/views/templates.xml | 10 ++ .../views/website_sale_wishlist_template.xml | 10 ++ 9 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 addons/website/static/src/img/snippets_options/header_template_sales_four.svg diff --git a/addons/website/models/theme_models.py b/addons/website/models/theme_models.py index 0e2568bceb5..5f7bcc97fd8 100644 --- a/addons/website/models/theme_models.py +++ b/addons/website/models/theme_models.py @@ -231,6 +231,7 @@ class Theme(models.AbstractModel): 'website.template_header_sales_one', 'website.template_header_sales_two', 'website.template_header_sales_three', + 'website.template_header_sales_four', # Default one, keep it last 'website.template_header_default', ] diff --git a/addons/website/static/src/img/snippets_options/header_template_sales_four.svg b/addons/website/static/src/img/snippets_options/header_template_sales_four.svg new file mode 100644 index 00000000000..394193b99e7 --- /dev/null +++ b/addons/website/static/src/img/snippets_options/header_template_sales_four.svg @@ -0,0 +1 @@ + diff --git a/addons/website/static/src/scss/primary_variables.scss b/addons/website/static/src/scss/primary_variables.scss index d8cf687df80..3c1994a3bf9 100644 --- a/addons/website/static/src/scss/primary_variables.scss +++ b/addons/website/static/src/scss/primary_variables.scss @@ -14,6 +14,8 @@ $o-base-color-palette: map-merge($o-base-color-palette, ( 'header-sales_two-custom': null, 'header-sales_three': 2, 'header-sales_three-custom': null, + 'header-sales_four': 1, + 'header-sales_four-custom': null, 'footer': 5, // o_cc5 'footer-custom': null, 'copyright': null, diff --git a/addons/website/static/src/scss/secondary_variables.scss b/addons/website/static/src/scss/secondary_variables.scss index ba6bd705900..09ea82423a8 100644 --- a/addons/website/static/src/scss/secondary_variables.scss +++ b/addons/website/static/src/scss/secondary_variables.scss @@ -148,6 +148,7 @@ $-actual-user-color-palette: map-merge($-palette-default, $o-user-color-palette) 'header-sales_one': 'header-sales_one-custom', 'header-sales_two': 'header-sales_two-custom', 'header-sales_three': 'header-sales_three-custom', + 'header-sales_four': 'header-sales_four-custom', 'footer': 'footer-custom', 'copyright': 'copyright-custom' ) { diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 2a2e9a70b0c..95d149206ec 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -55,7 +55,7 @@ $-seen-urls: (); // 3) The values in the $colors map are also printed by Bootstrap. However, // we have color variables which can contain a reference to a color // combination and that is the info we want in that case. - @each $key in ('menu', 'header-sales_one', 'header-sales_two', 'header-sales_three', 'footer', 'copyright') { + @each $key in ('menu', 'header-sales_one', 'header-sales_two', 'header-sales_three', 'header-sales_four', 'footer', 'copyright') { $-value: map-get($o-color-palette, $key); @if type-of($-value) == 'number' { @include print-variable($key, $-value); @@ -1227,6 +1227,12 @@ header { @include o-apply-colors('header-sales_three-custom'); @include o-add-gradient('menu-secondary-gradient'); } +} @else if o-website-value('header-template') == 'sales_four' { + #wrapwrap .o_header_sales_four_bot { + @include o-apply-colors('header-sales_four'); + @include o-apply-colors('header-sales_four-custom'); + @include o-add-gradient('menu-secondary-gradient'); + } } .o_grid_header_3_cols { diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml index 1b2de8ff25d..3b1f87f10ee 100644 --- a/addons/website/views/snippets/snippets.xml +++ b/addons/website/views/snippets/snippets.xml @@ -781,6 +781,11 @@ data-customize-website-views="website.template_header_sales_three" data-customize-website-variable="'sales_three'" data-img="/website/static/src/img/snippets_options/header_template_sales_three.svg"/> + + @@ -983,15 +995,15 @@ - + - - diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 072adfdbd46..286b7181245 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -1154,6 +1154,107 @@ + + + + + + + + + + +