From df64fed894bbf9630b33fd6a20882f294982f8e3 Mon Sep 17 00:00:00 2001
From: Brieuc-brd <brd@odoo.com>
Date: Fri, 31 Mar 2023 13:39:31 +0200
Subject: [PATCH] [IMP] website, *: adapt `default` header

*: website_sale, website_sale_wishlist

This commit improves the layout of the default header.

task-3060986

Part-of: odoo/odoo#119650
---
 .../header_template_default.svg               | 29 +------
 addons/website/views/snippets/snippets.xml    |  2 +-
 addons/website/views/website_templates.xml    | 82 +++++++++++--------
 addons/website_sale/views/templates.xml       |  6 +-
 .../views/website_sale_wishlist_template.xml  |  4 +-
 5 files changed, 54 insertions(+), 69 deletions(-)

diff --git a/addons/website/static/src/img/snippets_options/header_template_default.svg b/addons/website/static/src/img/snippets_options/header_template_default.svg
index 0f9ce8293ca..a5d1640a782 100644
--- a/addons/website/static/src/img/snippets_options/header_template_default.svg
+++ b/addons/website/static/src/img/snippets_options/header_template_default.svg
@@ -1,28 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="234" height="60" viewBox="0 0 234 60">
-  <defs>
-    <linearGradient id="linearGradient-1" x1="0%" x2="100%" y1="49.429%" y2="50.571%">
-      <stop offset="0%" stop-color="#00A09D"/>
-      <stop offset="100%" stop-color="#00E2FF"/>
-    </linearGradient>
-    <rect id="path-22" width="234" height="25" x="0" y="5"/>
-  </defs>
-  <g fill="none" fill-rule="evenodd" class="header_template_default">
-    <g class="bg_def">
-      <use fill="#000" fill-opacity=".14" xlink:href="#path-22"/>
-      <use fill="url(#linearGradient-1)" fill-opacity=".3" xlink:href="#path-22"/>
-    </g>
-    <g fill="#FFF" fill-rule="nonzero" class="group" transform="translate(10 9)">
-      <path d="M7.676 13v-2.115H3.533V4.41H.88V13h6.797zm4.409.146c.953 0 1.749-.178 2.387-.536a3.613 3.613 0 0 0 1.465-1.5c.338-.642.507-1.465.507-2.47 0-1.382-.387-2.457-1.16-3.225-.773-.768-1.875-1.151-3.305-1.151-1.394 0-2.482.39-3.263 1.172-.782.78-1.172 1.873-1.172 3.275 0 1.004.197 1.84.592 2.508.394.668.909 1.156 1.543 1.465.635.308 1.437.462 2.406.462zm-.088-1.986c-.555 0-.993-.19-1.316-.568-.322-.38-.483-1.002-.483-1.87 0-.874.162-1.501.486-1.88.325-.38.754-.569 1.29-.569.558 0 1 .187 1.327.56.326.373.489.964.489 1.772 0 .961-.156 1.627-.469 1.999-.312.37-.754.556-1.324.556zm9.266 1.986c.828 0 1.544-.096 2.148-.29.603-.193 1.298-.557 2.083-1.092V8.102h-4.102v1.787h1.776v.808a4.59 4.59 0 0 1-.926.44 2.78 2.78 0 0 1-.85.129c-.625 0-1.112-.2-1.462-.598-.35-.398-.524-1.063-.524-1.992 0-.875.173-1.515.518-1.92.346-.403.81-.606 1.392-.606.39 0 .712.086.964.258.252.172.43.42.536.744l2.56-.457c-.156-.554-.39-1.012-.7-1.374a2.765 2.765 0 0 0-1.172-.8c-.47-.171-1.18-.257-2.13-.257-.984 0-1.767.138-2.349.416a3.757 3.757 0 0 0-1.7 1.579c-.386.693-.58 1.509-.58 2.446 0 .89.177 1.68.531 2.367a3.569 3.569 0 0 0 1.494 1.553c.643.348 1.474.521 2.493.521zm9.214 0c.953 0 1.749-.178 2.388-.536a3.613 3.613 0 0 0 1.464-1.5c.338-.642.507-1.465.507-2.47 0-1.382-.386-2.457-1.16-3.225-.773-.768-1.875-1.151-3.305-1.151-1.394 0-2.482.39-3.263 1.172-.781.78-1.172 1.873-1.172 3.275 0 1.004.197 1.84.592 2.508.394.668.909 1.156 1.544 1.465.634.308 1.436.462 2.405.462zm-.088-1.986c-.555 0-.993-.19-1.315-.568-.323-.38-.484-1.002-.484-1.87 0-.874.162-1.501.487-1.88.324-.38.753-.569 1.289-.569.558 0 1 .187 1.327.56.326.373.489.964.489 1.772 0 .961-.156 1.627-.469 1.999-.312.37-.754.556-1.324.556z" class="logo"/>
-    </g>
-    <g fill="#FFF" class="group" opacity=".804" transform="translate(71 16)">
-      <rect width="23" height="4" class="rectangle" rx="1"/>
-      <rect width="23" height="4" class="rectangle" rx="1" transform="translate(28)"/>
-      <rect width="23" height="4" class="rectangle" rx="1" transform="translate(56)"/>
-      <rect width="23" height="4" class="rectangle" rx="1" transform="translate(84)"/>
-    </g>
-    <rect width="20" height="9" fill="#FFF" class="rectangle" rx="4.5" transform="translate(204 13)"/>
-    <g fill="#FFF" class="page_content_default" opacity=".442" transform="translate(0 30)">
-      <rect width="234" height="25" class="rectangle_default"/>
-    </g>
-  </g>
-</svg>
+<svg width="234" height="60" viewBox="0 0 234 60" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" fill-opacity=".5" d="M0 5h234v50H0z"/><path transform="translate(0 5)" fill="url(#header_preview_default__a)" d="M0 0h234v30H0z"/><path d="M18.082 23.789v-1.865h-3.708V16.21H12v7.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="49.383" y="18" width="12" height="4" rx="1" fill="#fff"/><rect x="63.383" y="18" width="18" height="4" rx="1" fill="#fff"/><rect x="83.383" y="18" width="12" height="4" rx="1" fill="#fff"/><rect x="202" y="17" width="20" height="6" rx="3" fill="#fff"/><defs><linearGradient id="header_preview_default__a" x1="0" y1="0" x2="234" y2="30" gradientUnits="userSpaceOnUse"><stop stop-color="#357C83"/><stop offset="1" stop-color="#01A09D"/></linearGradient></defs></svg>
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index 5d66db3c439..110d9454da7 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -959,7 +959,7 @@
             <!-- 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">
+            <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">
                 <we-button data-customize-website-views=""
                            data-customize-website-variable="'left'"
                            data-icon="fa-align-left"/>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 506cafa44bf..ab7078f8598 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -417,50 +417,62 @@
 <template id="template_header_default" inherit_id="website.layout" name="Template Header Default" active="True">
     <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 justify-content-start justify-content-lg-between">
+            <t t-set="_navbar_classes" t-valuef="d-none d-lg-block shadow-sm"/>
+
+            <div id="top_menu_container" class="container">
                 <!-- Brand -->
                 <t t-call="website.placeholder_header_brand">
                     <t t-set="_link_class" t-valuef="me-4"/>
                 </t>
-                <!-- Navbar Collapse -->
-                <div id="top_menu_collapse" class="collapse navbar-collapse order-last order-lg-0">
-                    <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>
-                        <!-- Sign In -->
-                        <t t-call="portal.placeholder_user_sign_in">
-                            <t t-set="_item_class" t-valuef="nav-item ms-lg-auto"/>
-                            <t t-set="_link_class" t-valuef="nav-link fw-bold"/>
-                        </t>
-                        <!-- User Dropdown -->
-                        <t t-call="portal.user_dropdown">
-                            <t t-set="_user_name" t-value="true"/>
-                            <t t-set="_item_class" t-valuef="nav-item dropdown ms-lg-auto"/>
-                            <t t-set="_link_class" t-valuef="nav-link fw-bold"/>
-                        </t>
-                        <!-- Language Selector -->
-                        <t t-call="website.placeholder_header_language_selector">
-                            <t t-set="_div_classes" t-valuef="nav-item my-auto ms-lg-2"/>
+                <!-- Navbar -->
+                <t t-call="website.navbar_nav">
+                    <t t-set="_nav_class" t-valuef="me-auto"/>
+
+                    <!-- 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>
-                </div>
-                <!-- Call To Action -->
-                <t t-call="website.placeholder_header_call_to_action">
-                    <t t-set="_div_classes" t-valuef="ms-lg-4"/>
-                </t>
-                <!-- Navbar Toggler -->
-                <t t-call="website.navbar_toggler">
-                    <t t-set="_toggler_class" t-valuef="ms-auto"/>
                 </t>
+                <!-- Extra elements -->
+                <ul class="navbar-nav align-items-center gap-2 flex-shrink-0 justify-content-end ps-3">
+                    <!-- Search Bar -->
+                    <t t-call="website.placeholder_header_search_box">
+                        <t t-set="_layout" t-valuef="modal"/>
+                        <t t-set="_input_classes" t-valuef="border border-end-0 p-3"/>
+                        <t t-set="_submit_classes" t-valuef="border border-start-0 px-4 bg-o-color-4"/>
+                        <t t-set="_button_classes" t-valuef="o_navlink_background text-reset"/>
+                    </t>
+                    <!-- Text element -->
+                    <t t-call="website.placeholder_header_text_element"/>
+                    <!-- Social -->
+                    <t t-call="website.placeholder_header_social_links"/>
+                    <!-- Language Selector -->
+                    <t t-call="website.placeholder_header_language_selector">
+                        <t t-set="_btn_class" t-valuef="btn-outline-secondary border-0"/>
+                        <t t-set="_txt_class" t-valuef="small"/>
+                        <t t-set="_dropdown_menu_class" t-valuef="dropdown-menu-end"/>
+                    </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="_item_class" t-valuef="dropdown"/>
+                        <t t-set="_link_class" t-valuef="btn-outline-secondary border-0 fw-bold"/>
+                        <t t-set="_user_name_class" t-valuef="small"/>
+                        <t t-set="_dropdown_menu_class" t-valuef="dropdown-menu-end"/>
+                    </t>
+                    <!-- Call To Action -->
+                    <t t-call="website.placeholder_header_call_to_action"/>
+                </ul>
             </div>
         </t>
+        <t t-call="website.template_header_mobile"/>
     </xpath>
 </template>
 
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 3180a29385d..de7eded1054 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -42,11 +42,11 @@
     </template>
 
     <template id="template_header_default" inherit_id="website.template_header_default">
-        <xpath expr="//t[@t-foreach='website.menu_id.child_id']" position="after">
+        <xpath expr="//t[@t-call='website.placeholder_header_search_box']" position="before">
             <t t-call="website_sale.header_cart_link">
                 <t t-set="_icon" t-value="True"/>
-                <t t-set="_item_class" t-value="'nav-item mx-lg-3'"/>
-                <t t-set="_link_class" t-value="'nav-link'"/>
+                <t t-set="_link_class" t-value="'o_navlink_background btn position-relative rounded-circle p-1 text-center text-reset'"/>
+                <t t-set="_badge_class" t-value="'position-absolute top-0 end-0 mt-n1 me-n1 rounded-pill'"/>
             </t>
         </xpath>
     </template>
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 6f64582794a..4de89938333 100644
--- a/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
+++ b/addons/website_sale_wishlist/views/website_sale_wishlist_template.xml
@@ -69,8 +69,8 @@
         <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 me-lg-3'"/>
-                <t t-set="_link_class" t-value="'nav-link'"/>
+                <t t-set="_link_class" t-value="'o_navlink_background btn position-relative rounded-circle p-1 text-center text-reset'"/>
+                <t t-set="_badge_class" t-value="'position-absolute top-0 end-0 mt-n1 me-n1 rounded-pill'"/>
             </t>
         </xpath>
     </template>