From a2a71ae2a133e20760086f6009950d87f447cb9d Mon Sep 17 00:00:00 2001
From: Benjamin Vray <bvr@odoo.com>
Date: Fri, 1 Apr 2022 09:54:07 +0000
Subject: [PATCH] [FIX] website: fix logo options not displayed if text logo

Before this commit, the logo options (type, height, height scrolled)
were not displayed if the logo type was "Text".

After this commit, these options are moved to the navbar section so that
they are always displayed if the logo is "Text" or "Image". And if the
logo type is "None" only the logo type selector is displayed. Just like
it was in 14.0.

task-2800680

closes odoo/odoo#98229

X-original-commit: cddf06da77cb7be2219f2f539d13a90ca53d9178
Related: odoo/upgrade#3781
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Co-authored-by: qsm-odoo <qsm@odoo.com>
---
 addons/website/views/snippets/snippets.xml | 25 ++++++----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index e00a4e81275..f258331252d 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -333,14 +333,6 @@
         data-allow-delete="true" data-fakem2m="true"/>
 </template>
 
-<template id="snippet_options_header_brand">
-    <we-select t-att-string="label" data-reload="/" t-att-data-dependencies="dependencies">
-        <we-button data-customize-website-views="" data-name="option_header_brand_none">None</we-button>
-        <we-button data-customize-website-views="website.option_header_brand_name">Text</we-button>
-        <we-button data-customize-website-views="website.option_header_brand_logo">Image</we-button>
-    </we-select>
-</template>
-
 <template id="snippet_options">
     <t t-call="web_editor.snippet_options">
         <t t-set="image_transform_dependencies" t-valuef="no_animation_opt"/>
@@ -869,23 +861,20 @@
             <we-button data-customize-website-views="website.header_language_selector_flag, website.header_language_selector_no_text">Flag</we-button>
             <we-button data-customize-website-views="website.header_language_selector_flag">Flag and Text</we-button>
         </we-select>
-        <t t-call="website.snippet_options_header_brand">
-            <t t-set="label">Logo Type</t>
-            <t t-set="dependencies" t-valuef="option_header_brand_none"/>
-        </t>
-    </div>
-    <div data-selector="#wrapwrap > header nav.navbar .navbar-brand img" data-no-check="true">
-        <t t-call="website.snippet_options_header_brand">
-            <t t-set="label">Type</t>
-        </t>
-
+        <we-select string="Logo" data-reload="/">
+            <we-button data-customize-website-views="" data-name="option_header_brand_none">None</we-button>
+            <we-button data-customize-website-views="website.option_header_brand_name">Text</we-button>
+            <we-button data-customize-website-views="website.option_header_brand_logo">Image</we-button>
+        </we-select>
         <we-input string="Height"
+                  class="o_we_sublevel_1"
                   data-dependencies="!option_header_brand_none"
                   data-customize-website-variable="null"
                   data-variable="logo-height"
                   data-unit="px"
                   data-save-unit="rem"/>
         <we-input string="Height (Scrolled)"
+                  class="o_we_sublevel_1"
                   data-name="option_logo_height_scrolled"
                   data-customize-website-variable="null"
                   data-variable="fixed-logo-height"