[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>
This commit is contained in:
Benjamin Vray
2022-08-17 12:45:05 +02:00
committed by qsm-odoo
co-authored by qsm-odoo
parent 6819f2b0d2
commit a2a71ae2a1
+7 -18
View File
@@ -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"