From 73e465e9c743cfee0c05b4018108cd751c830b6b Mon Sep 17 00:00:00 2001
From: Brieuc-brd <brd@odoo.com>
Date: Fri, 31 Mar 2023 13:47:10 +0200
Subject: [PATCH] [IMP] website, *: replace `slogan` by `sales_two` header

*: website_sale, website_sale_wishlist

The new header is quite different from the old one, the xml_id of
the header will thus change. That new "sales_two" header will however be
the closest one to the "slogan". A related upgrade script will be made
to treat this as a simple xml_id renaming.

task-3060986

Part-of: odoo/odoo#119650
---
 addons/website/models/theme_models.py         |   2 +-
 .../header_template_sales_two.svg             |   1 +
 .../header_template_slogan.svg                |  42 ----
 .../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    |  23 +-
 addons/website/views/website_templates.xml    | 199 +++++++++---------
 addons/website_sale/views/templates.xml       |  23 +-
 .../views/website_sale_wishlist_template.xml  |  23 +-
 10 files changed, 154 insertions(+), 170 deletions(-)
 create mode 100644 addons/website/static/src/img/snippets_options/header_template_sales_two.svg
 delete mode 100644 addons/website/static/src/img/snippets_options/header_template_slogan.svg

diff --git a/addons/website/models/theme_models.py b/addons/website/models/theme_models.py
index d9a87248b1e..ef0f169a131 100644
--- a/addons/website/models/theme_models.py
+++ b/addons/website/models/theme_models.py
@@ -222,7 +222,6 @@ class Theme(models.AbstractModel):
         'website.template_header_hamburger',
         'website.template_header_vertical',
         'website.template_header_sidebar',
-        'website.template_header_slogan',
         'website.template_header_contact',
         'website.template_header_boxed',
         'website.template_header_image',
@@ -231,6 +230,7 @@ class Theme(models.AbstractModel):
         'website.template_header_stretch',
         'website.template_header_search',
         'website.template_header_sales_one',
+        'website.template_header_sales_two',
         # Default one, keep it last
         'website.template_header_default',
     ]
diff --git a/addons/website/static/src/img/snippets_options/header_template_sales_two.svg b/addons/website/static/src/img/snippets_options/header_template_sales_two.svg
new file mode 100644
index 00000000000..5e9ba0ca277
--- /dev/null
+++ b/addons/website/static/src/img/snippets_options/header_template_sales_two.svg
@@ -0,0 +1 @@
+<svg width="234" height="60" viewBox="0 0 234 60" xmlns="http://www.w3.org/2000/svg"><path fill="url(#header_preview_sales_two__a)" d="M0 5h234v50H0z"/><path fill="#fff" d="M202 43h20v12h-20z"/><rect x="12" y="47" width="12" height="4" rx="1" fill="#fff"/><rect x="26" y="47" width="18" height="4" rx="1" fill="#fff"/><rect x="46" y="47" width="12" height="4" rx="1" fill="#fff"/><path fill="#fff" fill-opacity=".25" d="M0 42h234v1H0z"/><path d="M18.082 30.708v-1.865h-3.708v-5.714H12v7.58l6.082-.001Zm3.945.13c.852 0 1.565-.158 2.136-.473a3.21 3.21 0 0 0 1.31-1.324c.303-.567.454-1.293.454-2.179 0-1.22-.346-2.169-1.038-2.846-.692-.677-1.677-1.016-2.957-1.016-1.247 0-2.22.345-2.92 1.034-.699.69-1.048 1.653-1.048 2.89 0 .886.176 1.624.53 2.213.352.59.813 1.02 1.38 1.292.569.273 1.286.409 2.153.409Zm-.079-1.753c-.496 0-.889-.167-1.177-.501-.288-.335-.432-.884-.432-1.65 0-.772.145-1.325.435-1.66.29-.333.674-.5 1.153-.5.5 0 .896.164 1.188.493.291.33.437.85.437 1.564 0 .848-.14 1.436-.42 1.763-.279.327-.674.491-1.184.491Zm8.291 1.753c.741 0 1.381-.085 1.921-.256.54-.17 1.162-.492 1.864-.964v-3.232h-3.67v1.577h1.589v.714c-.26.16-.539.29-.828.388a2.52 2.52 0 0 1-.76.113c-.56 0-.996-.176-1.309-.527-.312-.352-.469-.938-.469-1.758 0-.772.155-1.336.464-1.693.31-.357.724-.535 1.245-.535.35 0 .637.076.863.227.225.152.385.37.48.657l2.29-.403c-.14-.49-.348-.894-.626-1.213a2.476 2.476 0 0 0-1.049-.705c-.42-.152-1.056-.228-1.905-.228-.881 0-1.582.122-2.103.367-.64.293-1.173.78-1.52 1.393-.346.612-.519 1.332-.519 2.159 0 .786.158 1.482.474 2.089a3.17 3.17 0 0 0 1.337 1.37c.575.306 1.319.46 2.231.46Zm8.244 0c.853 0 1.565-.158 2.136-.473a3.21 3.21 0 0 0 1.31-1.324c.303-.567.454-1.293.454-2.179 0-1.22-.346-2.169-1.038-2.846-.692-.677-1.677-1.016-2.957-1.016-1.247 0-2.22.345-2.92 1.034-.699.69-1.048 1.653-1.048 2.89 0 .886.176 1.624.53 2.213.352.59.813 1.02 1.38 1.292.569.273 1.286.409 2.153.409Zm-.079-1.753c-.496 0-.888-.167-1.177-.501-.288-.335-.432-.884-.432-1.65 0-.772.145-1.325.435-1.66.29-.333.674-.5 1.153-.5.5 0 .896.164 1.188.493.292.33.437.85.437 1.564 0 .848-.14 1.436-.419 1.763-.28.327-.675.491-1.185.491Z" fill="#fff"/><rect x="128" y="21" width="40" height="12" rx="6" fill="#fff"/><path d="M149.786 26.286a2.41 2.41 0 0 0-.734-1.767 2.407 2.407 0 0 0-1.766-.733c-.688 0-1.277.244-1.766.733a2.405 2.405 0 0 0-.734 1.767c0 .688.244 1.277.734 1.766.489.49 1.078.734 1.766.734s1.277-.245 1.766-.734a2.41 2.41 0 0 0 .734-1.766Zm2.857 4.643a.69.69 0 0 1-.212.502.688.688 0 0 1-.502.212.665.665 0 0 1-.503-.212l-1.914-1.909a3.82 3.82 0 0 1-2.226.692 3.857 3.857 0 0 1-1.526-.31 3.929 3.929 0 0 1-1.256-.837 3.912 3.912 0 0 1-.837-1.255 3.85 3.85 0 0 1-.31-1.526c0-.532.103-1.041.31-1.527a3.91 3.91 0 0 1 .837-1.255 3.93 3.93 0 0 1 1.256-.837c.485-.207.994-.31 1.526-.31s1.04.103 1.526.31c.485.206.904.485 1.256.837.351.351.63.77.837 1.255.206.486.309.995.309 1.527 0 .818-.23 1.56-.692 2.226l1.914 1.914a.683.683 0 0 1 .207.503Z" fill="#35979C"/><rect x="178" y="21" width="12" height="12" rx="6" fill="#fff"/><rect x="194" y="21" width="12" height="12" rx="6" fill="#fff"/><rect x="210" y="21" width="12" height="12" rx="6" fill="#fff"/><path fill-opacity=".33" d="M0 5h234v8H0z"/><rect x="12" y="7" width="16" height="4" rx="2" fill="#fff"/><rect x="206" y="7" width="4" height="4" rx="1" fill="#fff"/><rect x="212" y="7" width="4" height="4" rx="1" fill="#fff"/><rect x="218" y="7" width="4" height="4" rx="1" fill="#fff"/><rect x="95" y="8" width="45" height="2" rx="1" fill="#fff"/><defs><linearGradient id="header_preview_sales_two__a" x1="0" y1="5" x2="236.447" y2="23.188" gradientUnits="userSpaceOnUse"><stop stop-color="#357C83"/><stop offset="1" stop-color="#01A09D"/></linearGradient></defs></svg>
diff --git a/addons/website/static/src/img/snippets_options/header_template_slogan.svg b/addons/website/static/src/img/snippets_options/header_template_slogan.svg
deleted file mode 100644
index 5bb81d4a365..00000000000
--- a/addons/website/static/src/img/snippets_options/header_template_slogan.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="234px" height="50px" viewBox="0 0 234 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <defs>
-        <linearGradient x1="0%" y1="47.717%" x2="100%" y2="52.283%" id="linearGradient-1">
-            <stop stop-color="#00A09D" offset="0%"></stop>
-            <stop stop-color="#00E2FF" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="header_template_slogan" fill-rule="nonzero">
-            <g id="Group">
-                <g id="path-21-link" fill="#000000" fill-opacity="0.14">
-                    <rect id="path-21" x="0" y="0" width="234" height="50"></rect>
-                </g>
-                <g id="path-21-link" fill="url(#linearGradient-1)" fill-opacity="0.3">
-                    <rect id="path-21" x="0" y="0" width="234" height="50"></rect>
-                </g>
-            </g>
-            <text id="LOGO" fill="#FFFFFF" font-family="Arial-Black, Arial Black" font-size="12" font-weight="700">
-                <tspan x="10" y="18">LOGO</tspan>
-            </text>
-            <rect id="Rectangle" fill="#FFFFFF" opacity="0.375" x="10" y="26" width="214" height="1"></rect>
-            <g id="Group" opacity="0.804" transform="translate(10, 36)" fill="#FFFFFF">
-                <rect id="Rectangle" x="0" y="0" width="23" height="4" rx="1"></rect>
-                <g transform="translate(28, 0)" id="Rectangle">
-                    <rect x="0" y="0" width="9" height="4" rx="1"></rect>
-                </g>
-                <g id="Group-Copy" transform="translate(204, 0)">
-                    <rect id="Rectangle" x="0" y="0" width="9" height="4" rx="1"></rect>
-                </g>
-                <g transform="translate(42, 0)" id="Rectangle">
-                    <rect x="0" y="0" width="23" height="4" rx="1"></rect>
-                </g>
-                <g transform="translate(70, 0)" id="Rectangle">
-                    <rect x="0" y="0" width="16" height="4" rx="1"></rect>
-                </g>
-            </g>
-            <rect id="Rectangle" fill="#FFFFFF" x="204" y="11" width="20" height="9" rx="4.5"></rect>
-            <path d="M59.227,17 L59.699,15.7 L61.989,15.7 L62.489,17 L63.746,17 L61.453,11.273 L60.23,11.273 L58,17 L59.227,17 Z M61.617,14.734 L60.055,14.734 L60.828,12.609 L61.618,14.734 L61.617,14.734 Z M68.117,17 L68.82,14.332 L69.535,17 L70.59,17 L71.922,12.852 L70.84,12.852 L70.047,15.57 L69.355,12.852 L68.297,12.852 L67.582,15.57 L66.805,12.852 L65.738,12.852 L67.051,17 L68.117,17 Z M74.391,17.094 C75.005,17.094 75.515,16.887 75.92,16.474 C76.325,16.062 76.527,15.542 76.527,14.914 C76.527,14.292 76.327,13.777 75.926,13.369 C75.525,12.962 75.01,12.758 74.383,12.758 C73.977,12.758 73.609,12.848 73.279,13.028 C72.9516526,13.2048745 72.6856193,13.4768351 72.516,13.808 C72.336,14.15 72.246,14.503 72.246,14.868 C72.246,15.344 72.336,15.748 72.516,16.08 C72.696,16.412 72.958,16.664 73.303,16.836 C73.648,17.008 74.01,17.094 74.391,17.094 Z M74.387,16.199 C74.1090953,16.2031961 73.8438798,16.082877 73.664,15.871 C73.469,15.652 73.371,15.337 73.371,14.926 C73.371,14.514 73.469,14.199 73.664,13.98 C73.8438798,13.768123 74.1090953,13.6478039 74.387,13.652 C74.673,13.652 74.913,13.762 75.107,13.98 C75.301,14.2 75.398,14.512 75.398,14.918 C75.398,15.335 75.301,15.652 75.108,15.871 C74.9290044,16.0829098 74.6643566,16.2033044 74.387,16.199 L74.387,16.199 Z M78.477,17 L78.477,15.121 C78.477,14.658 78.505,14.34 78.561,14.168 C78.6147422,13.9990169 78.7239772,13.8531353 78.871,13.754 C79.0213295,13.6501005 79.2002756,13.5955778 79.383,13.598 C79.5179113,13.5939992 79.6507222,13.6320949 79.763,13.707 C79.8706854,13.7819375 79.9513416,13.889596 79.993,14.014 C80.039,14.145 80.063,14.434 80.063,14.883 L80.063,17 L81.16,17 L81.16,14.422 C81.16,14.102 81.14,13.855 81.1,13.684 C81.0618077,13.5168351 80.9885219,13.3596967 80.885,13.223 C80.7645517,13.0744203 80.6078461,12.9593881 80.43,12.889 C80.2202434,12.7994433 79.9940529,12.7548183 79.766,12.758 C79.216,12.758 78.76,12.992 78.398,13.461 L78.398,12.851 L77.378,12.851 L77.378,17 L78.477,17 L78.477,17 Z M83.762,17.094 C83.996,17.094 84.229,17.036 84.459,16.92 C84.689,16.804 84.889,16.628 85.059,16.39 L85.059,17 L86.079,17 L86.079,11.273 L84.98,11.273 L84.98,13.336 C84.642,12.951 84.24,12.758 83.777,12.758 C83.272,12.758 82.854,12.941 82.523,13.307 C82.193,13.673 82.027,14.207 82.027,14.91 C82.027,15.598 82.197,16.133 82.537,16.518 C82.877,16.902 83.285,17.094 83.762,17.094 L83.762,17.094 Z M84.074,16.227 C83.757,16.227 83.509,16.083 83.332,15.797 C83.21,15.599 83.148,15.279 83.148,14.836 C83.148,14.424 83.236,14.116 83.412,13.908 C83.5706199,13.7094553 83.8118901,13.5950917 84.066,13.598 C84.335,13.598 84.555,13.702 84.726,13.912 C84.898,14.122 84.984,14.465 84.984,14.942 C84.984,15.368 84.896,15.689 84.719,15.904 C84.542,16.119 84.327,16.227 84.074,16.227 L84.074,16.227 Z M88.852,17.094 C89.307,17.094 89.687,16.989 89.99,16.779 C90.294,16.569 90.516,16.264 90.656,15.863 L89.562,15.68 C89.502,15.888 89.414,16.04 89.297,16.133 C89.1730736,16.2288263 89.0195626,16.278346 88.863,16.273 C88.6227147,16.2785791 88.3918095,16.179724 88.23,16.002 C88.061,15.821 87.973,15.568 87.965,15.242 L90.715,15.242 C90.73,14.401 90.56,13.777 90.203,13.369 C89.846,12.962 89.359,12.758 88.743,12.758 C88.193,12.758 87.738,12.952 87.379,13.342 C87.019,13.732 86.839,14.27 86.839,14.957 C86.839,15.533 86.977,16.009 87.25,16.387 C87.596,16.858 88.13,17.094 88.852,17.094 L88.852,17.094 Z M89.625,14.57 L87.985,14.57 C87.982,14.27 88.059,14.034 88.215,13.86 C88.3640317,13.6884692 88.5818395,13.5923991 88.809,13.598 C89.033,13.598 89.223,13.68 89.379,13.846 C89.535,14.011 89.617,14.253 89.625,14.57 L89.625,14.57 Z M92.66,17 L92.66,15.719 C92.66,15.013 92.69,14.549 92.752,14.329 C92.813,14.107 92.897,13.954 93.004,13.869 C93.1154442,13.7829203 93.253238,13.7380489 93.394,13.742 C93.554,13.742 93.725,13.802 93.91,13.922 L94.25,12.965 C94.0325359,12.8310194 93.7824202,12.7594095 93.527,12.758 C93.3594604,12.7555439 93.1948061,12.8017444 93.053,12.891 C92.913,12.979 92.757,13.163 92.582,13.441 L92.582,12.851 L91.562,12.851 L91.562,17 L92.66,17 L92.66,17 Z M95.95,17 L95.95,13.715 L96.77,13.715 L96.77,12.852 L95.95,12.852 L95.95,12.559 C95.95,12.348 95.984,12.205 96.053,12.131 C96.122,12.057 96.236,12.02 96.395,12.02 C96.556,12.02 96.724,12.04 96.898,12.082 L97.047,11.316 C96.747,11.223 96.441,11.176 96.129,11.176 C95.824,11.176 95.572,11.23 95.373,11.338 C95.1922962,11.4269548 95.0475753,11.5752054 94.963,11.758 C94.889,11.93 94.852,12.19 94.852,12.539 L94.852,12.852 L94.242,12.852 L94.242,13.715 L94.852,13.715 L94.852,17 L95.949,17 L95.95,17 Z M98.742,17.094 C99.016,17.094 99.275,17.03 99.522,16.902 C99.768,16.775 99.966,16.6 100.117,16.379 L100.117,17 L101.137,17 L101.137,12.852 L100.039,12.852 L100.039,14.602 C100.039,15.195 100.012,15.568 99.957,15.721 C99.8987642,15.8779176 99.7918979,16.0121136 99.652,16.104 C99.5041371,16.2065674 99.3279381,16.2604059 99.148,16.258 C99.0038794,16.263829 98.8616554,16.2235439 98.742,16.143 C98.6356588,16.0662727 98.5581801,15.9560418 98.522,15.83 C98.482,15.699 98.461,15.341 98.461,14.758 L98.461,12.852 L97.363,12.852 L97.363,15.477 C97.363,15.867 97.413,16.173 97.512,16.395 C97.611,16.615 97.771,16.788 97.992,16.91 C98.214,17.033 98.464,17.094 98.742,17.094 L98.742,17.094 Z M103.372,17 L103.372,11.273 L102.273,11.273 L102.273,17 L103.371,17 L103.372,17 Z M108.32,17.094 C108.943,17.094 109.413,16.957 109.73,16.684 C110.048,16.41 110.207,16.084 110.207,15.704 C110.207,15.354 110.092,15.082 109.863,14.887 C109.632,14.694 109.223,14.531 108.639,14.398 C108.054,14.266 107.712,14.163 107.613,14.09 C107.54,14.035 107.503,13.969 107.503,13.89 C107.503283,13.7990563 107.551064,13.7148707 107.629,13.668 C107.754,13.588 107.961,13.547 108.25,13.547 C108.48,13.547 108.656,13.59 108.78,13.676 C108.905427,13.7651477 108.994535,13.8965022 109.031,14.046 L110.066,13.856 C109.962,13.493 109.772,13.22 109.496,13.036 C109.22,12.85 108.798,12.758 108.23,12.758 C107.634,12.758 107.194,12.88 106.91,13.125 C106.637097,13.3461006 106.480196,13.6797921 106.484,14.031 C106.484,14.43 106.648,14.741 106.977,14.965 C107.214,15.126 107.775,15.305 108.66,15.5 C108.85,15.544 108.973,15.592 109.027,15.645 C109.079519,15.7008657 109.107592,15.7753679 109.105,15.852 C109.10828,15.9674429 109.054401,16.0770728 108.961,16.145 C108.818,16.249 108.604,16.301 108.321,16.301 C108.063,16.301 107.862,16.245 107.719,16.135 C107.568493,16.01225 107.467303,15.8393392 107.434,15.648 L106.332,15.816 C106.434,16.21 106.649,16.521 106.979,16.75 C107.308,16.98 107.755,17.094 108.32,17.094 L108.32,17.094 Z M112.266,17 L112.266,11.273 L111.168,11.273 L111.168,17 L112.266,17 Z M115.281,17.094 C115.896,17.094 116.406,16.887 116.811,16.474 C117.215,16.062 117.418,15.542 117.418,14.914 C117.418,14.292 117.218,13.777 116.816,13.369 C116.416,12.962 115.901,12.758 115.273,12.758 C114.867,12.758 114.499,12.848 114.17,13.028 C113.84,13.207 113.586,13.468 113.406,13.808 C113.226,14.15 113.136,14.503 113.136,14.868 C113.136,15.344 113.226,15.748 113.406,16.08 C113.586,16.412 113.848,16.664 114.193,16.836 C114.538,17.008 114.901,17.094 115.281,17.094 L115.281,17.094 Z M115.277,16.199 C114.999443,16.2028959 114.734656,16.0826047 114.555,15.871 C114.359,15.652 114.262,15.337 114.262,14.926 C114.262,14.514 114.359,14.199 114.555,13.98 C114.734656,13.7683953 114.999443,13.6481041 115.277,13.652 C115.564,13.652 115.804,13.762 115.998,13.98 C116.192,14.2 116.289,14.512 116.289,14.918 C116.289,15.335 116.192,15.652 115.998,15.871 C115.819228,16.0826367 115.555008,16.2030032 115.278,16.199 L115.277,16.199 Z M120.109,18.684 C120.482,18.684 120.789,18.644 121.033,18.566 C121.249541,18.5032594 121.449155,18.3925148 121.617,18.242 C121.775667,18.0829942 121.892479,17.887163 121.957,17.672 C122.037,17.43 122.078,17.064 122.078,16.574 L122.078,12.852 L121.051,12.852 L121.051,13.434 C120.717,12.984 120.294,12.758 119.781,12.758 C119.304336,12.7487635 118.847803,12.9499597 118.533,13.308 C118.199,13.676 118.031,14.207 118.031,14.902 C118.031,15.457 118.159,15.921 118.414,16.293 C118.74,16.764 119.181,17 119.738,17 C120.238,17 120.652,16.776 120.98,16.328 L120.98,16.934 C120.98,17.178 120.964,17.346 120.93,17.437 C120.89068,17.5521335 120.813016,17.6502729 120.71,17.715 C120.568,17.801 120.353,17.844 120.066,17.844 C119.842,17.844 119.678,17.804 119.574,17.727 C119.499,17.672 119.451,17.572 119.43,17.426 L118.176,17.273 C118.173584,17.3172942 118.17225,17.3616407 118.172,17.406 C118.172,17.776 118.319,18.081 118.613,18.322 C118.908,18.563 119.406,18.684 120.109,18.684 L120.109,18.684 Z M120.043,16.114012 C119.796651,16.1153551 119.563735,16.0018549 119.413,15.807 C119.242,15.602 119.156,15.28 119.156,14.84 C119.156,14.42 119.242,14.109 119.412,13.904 C119.569108,13.7062377 119.809475,13.5930805 120.062,13.598 C120.333,13.598 120.557,13.702 120.734,13.91 C120.911,14.118 121,14.437 121,14.867 C121,15.279 120.908,15.589 120.723,15.799 C120.555117,16.0006405 120.305364,16.115968 120.043,16.113 L120.043,16.114012 Z M124.253,17.094 C124.496,17.094 124.724,17.048 124.938,16.957 C125.161938,16.8586276 125.36571,16.7196147 125.539,16.547 C125.547,16.567 125.559,16.611 125.579,16.676 C125.619,16.819 125.655,16.927 125.684,17 L126.77,17 C126.680857,16.823391 126.614333,16.6362491 126.572,16.443 C126.537,16.27 126.52,16.001 126.52,15.637 L126.531,14.355 C126.531,13.879 126.482,13.551 126.385,13.373 C126.287,13.195 126.118,13.048 125.879,12.932 C125.639,12.816 125.275,12.758 124.785,12.758 C124.246,12.758 123.84,12.854 123.566,13.047 C123.293,13.24 123.1,13.537 122.988,13.937 L123.984,14.117 C124.052,13.924 124.141,13.79 124.25,13.713 C124.36,13.636 124.512,13.598 124.707,13.598 C124.997,13.598 125.193,13.643 125.297,13.732 C125.401,13.822 125.453,13.972 125.453,14.184 L125.453,14.293 C125.255,14.376 124.9,14.466 124.387,14.563 C124.007,14.635 123.715,14.721 123.514,14.818 C123.318979,14.9093823 123.155171,15.0561485 123.043,15.24 C122.929485,15.4291845 122.871283,15.6464042 122.875,15.867 C122.875,16.221 122.998,16.514 123.245,16.747 C123.49,16.977 123.827,17.094 124.254,17.094 L124.253,17.094 Z M124.582,16.32 C124.419594,16.3254873 124.261907,16.2648662 124.145,16.152 C124.03438,16.0493311 123.971971,15.9049193 123.972987,15.754 C123.972987,15.598 124.044,15.469 124.187,15.367 C124.281,15.305 124.48,15.241 124.785,15.176 C125.09,15.111 125.313,15.055 125.453,15.008 L125.453,15.227 C125.453,15.49 125.439,15.668 125.41,15.762 C125.365576,15.9088245 125.273359,16.0365915 125.148,16.125 C124.985279,16.2492997 124.786752,16.3176969 124.582,16.32 L124.582,16.32 Z M128.703,17 L128.703,15.121 C128.703,14.658 128.731,14.34 128.787,14.168 C128.840742,13.9990169 128.949977,13.8531353 129.097,13.754 C129.247329,13.6501005 129.426276,13.5955778 129.609,13.598 C129.74425,13.5937898 129.877442,13.6318946 129.99,13.707 C130.097313,13.7820943 130.177605,13.8897353 130.219,14.014 C130.266,14.145 130.289,14.434 130.289,14.883 L130.289,17 L131.387,17 L131.387,14.422 C131.387,14.102 131.367,13.855 131.327,13.684 C131.288507,13.5167542 131.214878,13.3596098 131.111,13.223 C130.990552,13.0744203 130.833846,12.9593881 130.656,12.889 C130.446243,12.7994433 130.220053,12.7548183 129.992,12.758 C129.442,12.758 128.987,12.992 128.625,13.461 L128.625,12.851 L127.605,12.851 L127.605,17 L128.703,17 L128.703,17 Z" id="Shape" fill="#FFFFFF"></path>
-        </g>
-    </g>
-</svg>
diff --git a/addons/website/static/src/scss/primary_variables.scss b/addons/website/static/src/scss/primary_variables.scss
index cbed752ee5b..12d088616b9 100644
--- a/addons/website/static/src/scss/primary_variables.scss
+++ b/addons/website/static/src/scss/primary_variables.scss
@@ -10,6 +10,8 @@ $o-base-color-palette: map-merge($o-base-color-palette, (
     'menu-border-color': null, // Default to classes used on the template
     'header-sales_one': 2,
     'header-sales_one-custom': null,
+    'header-sales_two': 5,
+    'header-sales_two-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 3d4569d506c..8bed19d7918 100644
--- a/addons/website/static/src/scss/secondary_variables.scss
+++ b/addons/website/static/src/scss/secondary_variables.scss
@@ -146,6 +146,7 @@ $-actual-user-color-palette: map-merge($-palette-default, $o-user-color-palette)
     // are handled by another variable.
     'menu': 'menu-custom',
     'header-sales_one': 'header-sales_one-custom',
+    'header-sales_two': 'header-sales_two-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 17ab371a14e..2f78a49be59 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', 'footer', 'copyright') {
+    @each $key in ('menu', 'header-sales_one', 'header-sales_two', 'footer', 'copyright') {
         $-value: map-get($o-color-palette, $key);
         @if type-of($-value) == 'number' {
             @include print-variable($key, $-value);
@@ -1215,6 +1215,12 @@ header {
         @include o-apply-colors('header-sales_one-custom');
         @include o-add-gradient('menu-secondary-gradient');
     }
+} @else if o-website-value('header-template') == 'sales_two' {
+    #wrapwrap .o_header_sales_two_top {
+        @include o-apply-colors('header-sales_two');
+        @include o-apply-colors('header-sales_two-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 cc8ca8b952e..3fd03834be1 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -771,16 +771,16 @@
                        data-customize-website-views="website.template_header_sales_one"
                        data-customize-website-variable="'sales_one'"
                        data-img="/website/static/src/img/snippets_options/header_template_sales_one.svg"/>
+            <we-button title="Menu - Sales 2"
+                       data-name="header_sales_two_opt"
+                       data-customize-website-views="website.template_header_sales_two"
+                       data-customize-website-variable="'sales_two'"
+                       data-img="/website/static/src/img/snippets_options/header_template_sales_two.svg"/>
             <we-button title="Sidebar"
                        data-name="header_sidebar_opt"
                        data-customize-website-views="website.template_header_sidebar, website.no_autohide_menu"
                        data-customize-website-variable="'sidebar'"
                        data-img="/website/static/src/img/snippets_options/header_template_sidebar.svg"/>
-            <we-button title="Slogan"
-                       data-name="header_slogan_opt"
-                       data-customize-website-views="website.template_header_slogan"
-                       data-customize-website-variable="'slogan'"
-                       data-img="/website/static/src/img/snippets_options/header_template_slogan.svg"/>
             <we-button title="Contact"
                        data-name="header_contact_opt"
                        data-customize-website-views="website.template_header_contact"
@@ -826,6 +826,13 @@
                             data-null-value="'NULL'"
                             data-with-combinations="customizeWebsiteColor"
                             data-with-gradients="true"/>
+            <we-colorpicker data-dependencies="header_sales_two_opt"
+                            data-customize-website-color="" data-color="header-sales_two"
+                            data-customize-website-layer2-color="" data-layer-color="header-sales_two-custom" data-layer-gradient="menu-secondary-gradient"
+                            data-no-bundle-reload="true"
+                            data-null-value="'NULL'"
+                            data-with-combinations="customizeWebsiteColor"
+                            data-with-gradients="true"/>
         </we-row>
     </div>
 
@@ -969,15 +976,15 @@
             <!-- Generic alignment option controling all the template at once. -->
             <!-- Currently needed to be this way as the SCSS variable controls -->
             <!-- the mobile alignement which is the same for all templates. -->
-            <we-select class="o_we_icon_select" data-name="header_alignment_opt" data-variable="hamburger-position" data-reload="/" title="Alignment" data-dependencies="header_default_opt, header_hamburger_opt, header_slogan_opt, header_boxed_opt, header_stretch_opt, header_search_opt, header_sales_one_opt">
+            <we-select class="o_we_icon_select" data-name="header_alignment_opt" data-variable="hamburger-position" data-reload="/" title="Alignment" data-dependencies="header_default_opt, header_hamburger_opt, header_boxed_opt, header_stretch_opt, header_search_opt, header_sales_one_opt, header_sales_two_opt">
                 <we-button data-customize-website-views=""
                            data-customize-website-variable="'left'"
                            data-icon="fa-align-left"/>
-                <we-button data-customize-website-views="website.template_header_default_align_center, website.template_header_slogan_align_center, website.template_header_boxed_align_center, website.template_header_stretch_align_center, website.template_header_search_align_center, website.template_header_sales_one_align_center"
+                <we-button data-customize-website-views="website.template_header_default_align_center, website.template_header_boxed_align_center, website.template_header_stretch_align_center, website.template_header_search_align_center, website.template_header_sales_one_align_center, website.template_header_sales_two_align_center"
                            data-customize-website-variable="'center'"
                            data-icon="fa-align-center"
                            data-dependencies="!header_hamburger_opt"/>
-                <we-button data-customize-website-views="website.template_header_default_align_right, website.template_header_hamburger_align_right, website.template_header_boxed_align_right, website.template_header_slogan_align_right, website.template_header_stretch_align_right, website.template_header_search_align_right, website.template_header_sales_one_align_right"
+                <we-button data-customize-website-views="website.template_header_default_align_right, website.template_header_hamburger_align_right, website.template_header_boxed_align_right, website.template_header_stretch_align_right, website.template_header_search_align_right, website.template_header_sales_one_align_right, website.template_header_sales_two_align_right"
                            data-customize-website-variable="'right'"
                            data-icon="fa-align-right"/>
             </we-select>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 841f9b1fa39..46c2ad7af82 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -970,6 +970,107 @@
     </xpath>
 </template>
 
+<!-- "Sales two" template -->
+<template id="template_header_sales_two" inherit_id="website.layout" name="Template Header Sale 2" active="False">
+    <xpath expr="//header//nav" position="replace">
+        <t t-call="website.navbar">
+            <t t-set="_navbar_classes" t-valuef="d-none d-lg-block p-0 shadow-sm"/>
+
+            <div id="top_menu_container">
+                <div aria-label="Top" t-if="is_view_active('website.header_text_element') or is_view_active('website.header_social_links') or is_view_active('website.header_language_selector')" class="o_header_sales_two_top py-1">
+                    <ul class="navbar-nav container d-grid h-100 px-3 o_grid_header_3_cols">
+                        <!-- Return empty placeholder if the element is not active to keep the right layout -->
+                        <li class="o_header_sales_two_lang_selector_placeholder" t-if="is_view_active('website.header_language_selector') == False"/>
+                        <!-- Language Selector -->
+                        <t t-call="website.placeholder_header_language_selector">
+                            <t t-set="_div_classes" t-valuef="d-flex align-items-center h-100"/>
+                            <t t-set="_btn_class" t-valuef="btn-sm btn-outline-secondary border-0"/>
+                        </t>
+                        <!-- Text element -->
+                        <!-- Return empty placeholder if the element is not active to keep the right layout -->
+                        <li class="o_header_sales_two_txt_elts_placeholder" t-if="is_view_active('website.header_text_element') == False"/>
+                        <t t-call="website.placeholder_header_text_element">
+                            <t t-set="_txt_elt_content" t-valuef="sentence"/>
+                            <t t-set="_div_class" t-valuef="d-flex align-items-center mx-auto"/>
+                            <t t-set="_item_class" t-valuef="d-flex align-items-center"/>
+                        </t>
+                        <!-- Social -->
+                        <!-- Return empty placeholder if the element is not active to keep the right layout -->
+                        <li class="o_header_sales_two_social_links_placeholder" t-if="is_view_active('website.header_social_links') == False"/>
+                        <t t-call="website.header_social_links_no_color">
+                            <t t-set="_div_class" t-valuef="d-flex align-items-center justify-content-end h-100"/>
+                        </t>
+                    </ul>
+                </div>
+                <div aria-label="Middle" class="container d-flex justify-content-between align-items-center py-1">
+                    <!-- Brand -->
+                    <t t-call="website.placeholder_header_brand">
+                        <t t-set="_link_class" t-valuef="me-4"/>
+                    </t>
+                    <ul class="navbar-nav align-items-center gap-1">
+                        <!-- Search bar -->
+                        <t t-call="website.placeholder_header_search_box">
+                            <t t-set="_input_classes" t-valuef="rounded-start-pill ps-3 text-bg-light"/>
+                            <t t-set="_submit_classes" t-valuef="rounded-end-pill p-3 bg-o-color-3 lh-1"/>
+                        </t>
+                        <!-- Sign In -->
+                        <t t-call="portal.placeholder_user_sign_in">
+                            <t t-set="_link_class" t-valuef="btn btn-outline-secondary"/>
+                        </t>
+                        <!-- User Dropdown -->
+                        <t t-call="portal.user_dropdown">
+                            <t t-set="_user_name" t-value="true"/>
+                            <t t-set="_icon" t-value="true"/>
+                            <t t-set="_icon_class" t-valuef="fa-stack"/>
+                            <t t-set="_item_class" t-valuef="dropdown"/>
+                            <t t-set="_link_class" t-valuef="d-flex align-items-center border-0 fw-bold text-reset o_navlink_background_hover"/>
+                            <t t-set="_icon_wrap_class" t-value="'position-relative me-2 rounded-circle border p-2 bg-o-color-3'"/>
+                            <t t-set="_dropdown_menu_class" t-valuef="dropdown-menu-end"/>
+                        </t>
+                    </ul>
+                </div>
+                <div aria-label="Bottom" class="border-top o_border_contrast">
+                    <div class="container d-flex justify-content-between">
+                        <!-- Navbar -->
+                        <t t-call="website.navbar_nav">
+                            <t t-set="_nav_class" t-valuef="me-4 py-1"/>
+
+                            <!-- Menu -->
+                            <t t-foreach="website.menu_id.child_id" t-as="submenu">
+                                <t t-call="website.submenu">
+                                    <t t-set="item_class" t-valuef="nav-item"/>
+                                    <t t-set="link_class" t-valuef="nav-link"/>
+                                </t>
+                            </t>
+                        </t>
+                        <!-- Call To Action -->
+                        <ul class="navbar-nav">
+                            <t t-call="website.header_call_to_action_stretched">
+                                <t t-set="_div_class" t-valuef="d-flex h-100"/>
+                            </t>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </t>
+        <t t-call="website.template_header_mobile">
+            <t t-set="_txt_elt_content" t-valuef="sentence"/>
+        </t>
+    </xpath>
+</template>
+
+<template id="template_header_sales_two_align_center" inherit_id="website.template_header_sales_two" active="False">
+    <xpath expr="//t[@t-set='_nav_class']" position="replace">
+        <t t-set="_nav_class" t-valuef="mx-auto p-2"/>
+    </xpath>
+</template>
+
+<template id="template_header_sales_two_align_right" inherit_id="website.template_header_sales_two" active="False">
+    <xpath expr="//t[@t-set='_nav_class']" position="replace">
+        <t t-set="_nav_class" t-valuef="ms-auto py-2 pe-2"/>
+    </xpath>
+</template>
+
 <template id="template_header_sidebar" inherit_id="website.layout" name="Template Header Sidebar" active="False">
     <xpath expr="//header" position="attributes">
         <attribute name="t-attf-class" add="o_header_sidebar" separator=" "/>
@@ -1081,104 +1182,6 @@
     </xpath>
 </template>
 
-<template id="template_header_slogan" inherit_id="website.layout" name="Template Header Slogan" active="False">
-    <xpath expr="//header//nav" position="replace">
-        <t t-call="website.navbar">
-            <t t-set="_navbar_classes" t-valuef="shadow-sm"/>
-            <div id="top_menu_container" class="container flex-row flex-wrap">
-                <!-- Brand -->
-                <t t-call="website.placeholder_header_brand">
-                    <t t-set="_link_class" t-valuef="me-4"/>
-                </t>
-                <!-- Slogan -->
-                <div class="ms-lg-3 me-auto">
-                    <div class="oe_structure oe_structure_solo" id="oe_structure_header_slogan_1"/>
-                </div>
-                <ul class="nav navbar-nav navbar-expand ms-auto order-last order-lg-0">
-                    <!-- Sign In -->
-                    <t t-call="portal.placeholder_user_sign_in">
-                        <t t-set="_item_class" t-valuef="nav-item ms-3"/>
-                        <t t-set="_link_class" t-valuef="btn btn-outline-primary"/>
-                    </t>
-                    <!-- User Dropdown -->
-                    <t t-call="portal.user_dropdown">
-                        <t t-set="_user_name" t-value="True"/>
-                        <t t-set="_user_name_class" t-valuef="fw-bold"/>
-                        <t t-set="_item_class" t-valuef="nav-item dropdown ms-3"/>
-                        <t t-set="_link_class" t-valuef="nav-link"/>
-                        <t t-set="_dropdown_menu_class" t-valuef="dropdown-menu-end position-absolute"/>
-                    </t>
-                    <li class="nav-item">
-                        <!-- Call To Action -->
-                        <t t-call="website.placeholder_header_call_to_action">
-                            <t t-set="_div_classes" t-valuef="ms-2"/>
-                        </t>
-                    </li>
-                </ul>
-                <!-- Separator -->
-                <div class="w-100">
-                    <div class="oe_structure oe_structure_solo" id="oe_structure_header_slogan_3"/>
-                </div>
-                <!-- Navbar Toggler -->
-                <t t-call="website.navbar_toggler"/>
-                 <!-- Navbar Collapse -->
-                <div id="top_menu_collapse" class="collapse navbar-collapse">
-                    <t t-call="website.navbar_nav">
-                        <t t-set="_nav_class" t-valuef="flex-grow-1"/>
-                        <!-- Menu -->
-                        <t t-foreach="website.menu_id.child_id" t-as="submenu">
-                            <t t-call="website.submenu">
-                                <t t-set="item_class" t-valuef="nav-item"/>
-                                <t t-set="link_class" t-valuef="nav-link"/>
-                            </t>
-                        </t>
-                        <!-- Language Selector -->
-                        <t t-call="website.placeholder_header_language_selector">
-                            <t t-set="_div_classes" t-valuef="nav-item mb-4 mb-lg-0 align-self-lg-center ms-lg-auto"/>
-                            <t t-set="_dropdown_menu_class" t-valuef="float-lg-end"/>
-                        </t>
-                    </t>
-                </div>
-            </div>
-        </t>
-    </xpath>
-</template>
-<template id="template_header_slogan_align_center" inherit_id="website.template_header_slogan" active="False">
-    <xpath expr="//t[@t-set='_nav_class']" position="after">
-        <t t-set="_nav_class" t-valuef="#{_nav_class} justify-content-center"/>
-    </xpath>
-</template>
-<template id="template_header_slogan_align_right" inherit_id="website.template_header_slogan" active="False">
-    <xpath expr="//t[@t-set='_nav_class']" position="after">
-        <t t-set="_nav_class" t-valuef="#{_nav_class} justify-content-end"/>
-    </xpath>
-</template>
-<template id="template_header_slogan_oe_structure_header_slogan_1" inherit_id="website.template_header_slogan" name="Template Header Slogan (oe_structure_header_slogan_1)">
-    <xpath expr="//*[hasclass('oe_structure')][@id='oe_structure_header_slogan_1']" position="replace">
-        <div class="oe_structure oe_structure_solo" id="oe_structure_header_slogan_1">
-            <section class="s_text_block" data-snippet="s_text_block" data-name="Text">
-                <div class="container">
-                    <h5 class="m-0" data-name="Slogan">We help <b>you</b> grow your business</h5>
-                </div>
-            </section>
-        </div>
-    </xpath>
-</template>
-
-<template id="template_header_slogan_oe_structure_header_slogan_3" inherit_id="website.template_header_slogan" name="Template Header Slogan (oe_structure_header_slogan_3)">
-    <xpath expr="//*[hasclass('oe_structure')][@id='oe_structure_header_slogan_3']" position="replace">
-        <div class="oe_structure oe_structure_solo" id="oe_structure_header_slogan_3">
-            <section class="s_text_block" data-snippet="s_text_block" data-name="Text">
-                <div class="container">
-                    <div class="s_hr w-100 pt8 pb8" data-name="Separator">
-                        <hr class="w-100 mx-auto" style="border-top-width: 1px; border-top-style: solid; border-color: var(--200);"/>
-                    </div>
-                </div>
-            </section>
-        </div>
-    </xpath>
-</template>
-
 <template id="template_header_contact" inherit_id="website.layout" name="Template Header Contact" active="False">
     <xpath expr="//header//nav" position="replace">
         <div class="oe_structure oe_structure_solo" id="oe_structure_header_contact_1"/>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 7954df66e1f..e83f75d0547 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -103,6 +103,19 @@
         </xpath>
     </template>
 
+    <template id="template_header_sales_two" inherit_id="website.template_header_sales_two">
+        <xpath expr="//t[@t-call='portal.placeholder_user_sign_in']" position="before">
+            <t t-call="website_sale.header_cart_link">
+                <t t-set="_icon" t-value="True"/>
+                <t t-set="_text" t-value="True"/>
+                <t t-set="_icon_wrap_class" t-value="'position-relative me-2 rounded-circle border p-2 bg-o-color-3 o_border_contrast'"/>
+                <t t-set="_link_class" t-value="'btn d-flex align-items-center fw-bold text-reset o_navlink_background_hover'"/>
+                <t t-set="_badge_class" t-value="'position-absolute top-0 end-0 mt-n1 me-n1 rounded-pill'"/>
+                <t t-set="_text_class" t-value="'small'"/>
+            </t>
+        </xpath>
+    </template>
+
     <template id="template_header_sidebar" inherit_id="website.template_header_sidebar">
         <xpath expr="//t[@t-foreach='website.menu_id.child_id']" position="after">
             <t t-call="website_sale.header_cart_link">
@@ -114,16 +127,6 @@
         </xpath>
     </template>
 
-    <template id="template_header_slogan" inherit_id="website.template_header_slogan">
-        <xpath expr="//t[@t-foreach='website.menu_id.child_id']" position="after">
-            <t t-call="website_sale.header_cart_link">
-                <t t-set="_icon" t-value="True"/>
-                <t t-set="_item_class" t-value="'nav-item'"/>
-                <t t-set="_link_class" t-value="'nav-link'"/>
-            </t>
-        </xpath>
-    </template>
-
     <template id="template_header_contact" inherit_id="website.template_header_contact">
         <xpath expr="//t[@t-foreach='website.menu_id.child_id']" position="after">
             <t t-call="website_sale.header_cart_link">
diff --git a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
index e4c66a3cd6b..b0a87e28d78 100644
--- a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
+++ b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
@@ -127,6 +127,19 @@
         </xpath>
     </template>
 
+    <template id="template_header_sales_two" inherit_id="website_sale.template_header_sales_two">
+        <xpath expr="//t[@t-call='website_sale.header_cart_link']" position="after">
+            <t t-call="website_sale_wishlist.header_wishlist_link">
+                <t t-set="_icon" t-value="True"/>
+                <t t-set="_text" t-value="True"/>
+                <t t-set="_icon_wrap_class" t-value="'position-relative me-2 rounded-circle border p-2 bg-o-color-3 o_border_contrast'"/>
+                <t t-set="_link_class" t-value="'btn d-flex align-items-center fw-bold text-reset o_navlink_background_hover'"/>
+                <t t-set="_badge_class" t-value="'position-absolute top-0 end-0 mt-n1 me-n1 rounded-pill'"/>
+                <t t-set="_text_class" t-value="'small'"/>
+            </t>
+        </xpath>
+    </template>
+
     <template id="template_header_sidebar" inherit_id="website_sale.template_header_sidebar">
         <xpath expr="//t[@t-call='website_sale.header_cart_link']" position="after">
             <t t-call="website_sale_wishlist.header_wishlist_link">
@@ -138,16 +151,6 @@
         </xpath>
     </template>
 
-    <template id="template_header_slogan" inherit_id="website_sale.template_header_slogan">
-        <xpath expr="//t[@t-call='website_sale.header_cart_link']" position="after">
-            <t t-call="website_sale_wishlist.header_wishlist_link">
-                <t t-set="_icon" t-value="True"/>
-                <t t-set="_item_class" t-value="'nav-item ms-lg-3'"/>
-                <t t-set="_link_class" t-value="'nav-link'"/>
-            </t>
-        </xpath>
-    </template>
-
     <template id="template_header_contact" inherit_id="website_sale.template_header_contact">
         <xpath expr="//t[@t-call='website_sale.header_cart_link']" position="after">
             <t t-call="website_sale_wishlist.header_wishlist_link">