pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website: rename #top_menu_container

Browse Source 
Prior to this commit the id used for the main navigation wasn't
descriptive enough.

This commit fixes this issue.

task-3060986

Part-of: odoo/odoo#119650
This commit is contained in:
Brieuc-brd
2023-10-25 11:37:12 +00:00
committed by qsm-odoo
parent d8ea618732
commit c6c2cdd676
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/components/wysiwyg_adapter/wysiwyg_adapter.js
+1 -1
View File
@@ -155,7 +155,7 @@ export class WysiwygAdapterComponent extends Wysiwyg {
const $editableWindow = this.$editable[0].ownerDocument.defaultView;
// Dropdown menu initialization: handle dropdown openings by hand
var $dropdownMenuToggles = $editableWindow.$('.o_mega_menu_toggle, #top_menu_container .dropdown-toggle');
var $dropdownMenuToggles = $editableWindow.$('.o_mega_menu_toggle, #o_main_nav .dropdown-toggle');
$dropdownMenuToggles.removeAttr('data-bs-toggle').dropdown('dispose');
$dropdownMenuToggles.on('click.wysiwyg_megamenu', ev => {
this.odooEditor.observerUnactive();
addons/website/static/src/scss/website.scss
+4 -4
View File
@@ -1036,7 +1036,7 @@ header {
z-index: $zindex-website-header;
}
&:not(.o_header_no_transition) {
#top_menu_container {
#o_main_nav {
transition: all $-transition-duration, color 0ms;
}
.navbar-brand {
@@ -1075,7 +1075,7 @@ header {
$-is-hamburger: o-website-value('header-template') == 'hamburger';
@include media-breakpoint-up(md) {
@if $-is-hamburger {
#top_menu_container {
#o_main_nav {
padding-top: $spacer * 0.5;
padding-bottom: $spacer * 0.5;
}
@@ -1083,7 +1083,7 @@ header {
}
}
#top_menu_container {
#o_main_nav {
flex-direction: inherit;
}
@@ -1140,7 +1140,7 @@ header {
max-width: 100%;
padding: 0 0 $spacer 0;
}
#top_menu_container {
#o_main_nav {
flex-direction: column;
align-items: start;
padding: 0;
addons/website/static/tests/tours/edit_link_popover.js
+1 -1
View File
@@ -135,7 +135,7 @@ wTourUtils.registerWebsitePreviewTour('edit_link_popover', {
// 3. Test other links (CTA in navbar & links in footer)
{
content: "Click CTA in navbar",
trigger: 'iframe #top_menu_container a.btn-primary[href="/contactus"]',
trigger: 'iframe #o_main_nav a.btn-primary[href="/contactus"]',
},
{
content: "Popover should be shown (3)",
addons/website/views/website_templates.xml
+12 -12
View File
@@ -304,7 +304,7 @@
<t t-set="_navbar_expand_class" t-valuef="None"/>
<t t-set="_navbar_name" t-valuef="Mobile"/>
<div id="top_menu_container" class="container flex-wrap justify-content-between">
<div id="o_main_nav" class="container flex-wrap justify-content-between">
<!-- Brand -->
<t t-call="website.placeholder_header_brand"/>
<ul class="o_header_mobile_buttons_wrap navbar-nav flex-row align-items-center gap-2 mb-0">
@@ -433,7 +433,7 @@
<t t-call="website.navbar">
<t t-set="_navbar_classes" t-valuef="d-none d-lg-block shadow-sm"/>
<div id="top_menu_container" class="container">
<div id="o_main_nav" class="container">
<!-- Brand -->
<t t-call="website.placeholder_header_brand">
<t t-set="_link_class" t-valuef="me-4"/>
@@ -509,7 +509,7 @@
<t t-set="_navbar_classes" t-valuef="d-none d-lg-block shadow-sm"/>
<t t-set="_navbar_expand_class" t-valuef="None"/>
<div id="top_menu_container" class="container d-grid py-0 o_grid_header_3_cols">
<div id="o_main_nav" class="container d-grid py-0 o_grid_header_3_cols">
<!-- Nav Toggler -->
<t t-call="website.navbar_toggler">
<t t-set="_toggler_class" t-valuef="btn me-auto p-2"/>
@@ -639,7 +639,7 @@
<t t-call="website.navbar">
<t t-set="_navbar_classes" t-valuef="d-none d-lg-block py-0 shadow-sm"/>
<div id="top_menu_container" class="container align-items-stretch">
<div id="o_main_nav" class="container align-items-stretch">
<!-- Brand -->
<t t-call="website.placeholder_header_brand">
<t t-set="_link_class" t-valuef="d-flex align-items-center me-4 p-2"/>
@@ -725,7 +725,7 @@
<t t-call="website.navbar">
<t t-set="_navbar_classes" t-valuef="d-none d-lg-block pt-3 shadow-sm"/>
<div id="top_menu_container" class="container flex-wrap gap-3">
<div id="o_main_nav" class="container flex-wrap gap-3">
<div class="d-grid align-items-center w-100 o_grid_header_3_cols">
<ul class="navbar-nav align-items-center gap-1">
<!-- Search bar -->
@@ -796,7 +796,7 @@
<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" class="flex-wrap">
<div id="o_main_nav" class="flex-wrap">
<div aria-label="Top" class="border-bottom o_border_contrast">
<div class="container d-flex justify-content-between flex-wrap w-100">
<ul class="o_header_search_left_col navbar-nav flex-wrap">
@@ -901,7 +901,7 @@
<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 id="o_main_nav">
<div aria-label="Top" class="container d-flex justify-content-between py-3">
<!-- Brand -->
<t t-call="website.placeholder_header_brand">
@@ -992,7 +992,7 @@
<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 id="o_main_nav">
<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 -->
@@ -1093,7 +1093,7 @@
<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 id="o_main_nav">
<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_search_box') or is_view_active('website.header_call_to_action')" class="o_header_sales_three_top position-relative border-bottom z-index-1 o_border_contrast">
<div class="container d-flex justify-content-between gap-3 h-100">
<ul class="navbar-nav align-items-center gap-3 py-1">
@@ -1176,7 +1176,7 @@
<t t-call="website.navbar">
<t t-set="_navbar_classes" t-valuef="o_header_sales_four_top d-none d-lg-block p-0 shadow-sm z-index-1"/>
<div id="top_menu_container">
<div id="o_main_nav">
<div aria-label="Top" class="container d-flex">
<!-- Navbar -->
<t t-call="website.navbar_nav">
@@ -1280,7 +1280,7 @@
<t t-call="website.navbar">
<t t-set="_navbar_classes" t-valuef="d-none d-lg-block shadow"/>
<div id="top_menu_container" class="navbar-nav d-flex flex-column justify-content-between h-100 w-100">
<div id="o_main_nav" class="navbar-nav d-flex flex-column justify-content-between h-100 w-100">
<div class="d-flex flex-column w-100 h-100">
<div class="d-flex pb-3">
<!-- Brand -->
@@ -1402,7 +1402,7 @@
<t t-call="website.navbar">
<t t-set="_navbar_classes" t-valuef="d-none d-lg-block rounded-pill py-2 px-3 shadow-sm"/>
<div id="top_menu_container" class="container">
<div id="o_main_nav" class="container">
<!-- Brand -->
<t t-call="website.placeholder_header_brand">
<t t-set="_link_class" t-valuef="me-4"/>