From 7aaef54fe2fee39979e643b7579c1b1e1d9f6799 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 25 Aug 2022 09:56:43 +0000
Subject: [PATCH] [IMP] website, *: reorganize main website menu

*: website_event, website_sale

The "Site" menu will now be organized in 3 sub-areas, the last two being
named "Content" and "This page". The first area contains a link to the
website iframe and the menu editor. The "Content" area will contain
menus to list all contents of the website (page, products, events, ...).
This commit only moves the "page" one, the others will be created by
other commits of this PR. The "This page" area contains elements
specific to the page (html editor, page properties, ...).

task-2889981

Part-of: odoo/odoo#98937
---
 .../static/src/components/navbar/navbar.js    |  3 +
 addons/website/views/website_pages_views.xml  |  4 +-
 addons/website/views/website_views.xml        | 59 ++++++++++---------
 addons/website_event/views/event_menus.xml    |  6 +-
 .../views/link_tracker_views.xml              |  4 +-
 .../website_sale/views/sale_order_views.xml   |  2 +-
 6 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/addons/website/static/src/components/navbar/navbar.js b/addons/website/static/src/components/navbar/navbar.js
index a07279679f8..48d7605b195 100644
--- a/addons/website/static/src/components/navbar/navbar.js
+++ b/addons/website/static/src/components/navbar/navbar.js
@@ -38,6 +38,9 @@ patch(NavBar.prototype, 'website_navbar', {
                 Component: OptimizeSEODialog,
                 isDisplayed: () => this.websiteService.currentWebsite && !!this.websiteService.currentWebsite.metadata.mainObject,
             },
+            'website.menu_current_page': {
+                isDisplayed: () => this.canShowAceEditor(),
+            },
             'website.menu_ace_editor': {
                 openWidget: () => this.websiteContext.showAceEditor = true,
                 isDisplayed: () => this.canShowAceEditor(),
diff --git a/addons/website/views/website_pages_views.xml b/addons/website/views/website_pages_views.xml
index 5f7da5b6bd9..2fb461fb10c 100644
--- a/addons/website/views/website_pages_views.xml
+++ b/addons/website/views/website_pages_views.xml
@@ -119,8 +119,8 @@
 </record>
 
 <menuitem id="menu_website_pages_list"
-    parent="menu_site"
-    sequence="20"
+    parent="menu_content"
+    sequence="10"
     name="Pages"
     action="action_website_pages_list"/>
 
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 45da5a34bf1..429b999efb3 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -417,46 +417,57 @@
 
         <menuitem id="menu_site"
             name="Site"
-            sequence="1"
-            parent="website.menu_website_configuration"/>
-
-        <menuitem id="menu_promote"
-            name="Promote"
-            sequence="5"
-            parent="website.menu_website_configuration"/>
-
-        <menuitem id="menu_reporting"
-            name="Reporting"
-            sequence="99"
+            sequence="10"
             parent="website.menu_website_configuration"/>
 
         <menuitem id="menu_website_preview"
             parent="menu_site"
             sequence="10"
-            name="Go to Website"
+            name="Homepage"
             action="website.website_preview"/>
 
         <menuitem id="menu_edit_menu"
+            parent="menu_site"
+            sequence="20"
+            name="Menu Editor"
+            action="website.website_preview"/>
+
+        <menuitem id="menu_content"
             parent="menu_site"
             sequence="30"
-            name="Edit Menu"
+            name="Content"/>
+
+        <menuitem id="menu_current_page"
+            parent="menu_site"
+            sequence="40"
+            name="This page"/>
+
+        <menuitem id="menu_page_properties"
+            parent="menu_current_page"
+            sequence="10"
+            name="Properties"
+            action="website.website_preview"/>
+
+        <menuitem id="menu_optimize_seo"
+            parent="menu_current_page"
+            name="Optimize SEO"
+            sequence="20"
             action="website.website_preview"/>
 
         <menuitem id="menu_ace_editor"
-            parent="menu_site"
-            sequence="40"
+            parent="menu_current_page"
+            sequence="30"
             name="HTML / CSS Editor"
             action="website.website_preview"/>
 
-        <menuitem id="menu_page_properties"
-            parent="menu_site"
-            sequence="50"
-            name="Page Properties"
-            action="website.website_preview"/>
+        <menuitem id="menu_reporting"
+            name="Reporting"
+            sequence="30"
+            parent="website.menu_website_configuration"/>
 
         <menuitem id="menu_website_dashboard"
             name="eCommerce"
-            sequence="1"
+            sequence="10"
             parent="menu_reporting"
             action="website.ir_actions_server_website_dashboard"
             active="0"/>
@@ -467,12 +478,6 @@
             parent="menu_reporting"
             action="website.ir_actions_server_website_analytics"/>
 
-        <menuitem id="menu_optimize_seo"
-            name="Optimize SEO"
-            sequence="1"
-            parent="website.menu_promote"
-            action="website.website_preview"/>
-
         <!-- Configurator actions -->
         <record id="website_configurator" model="ir.actions.client">
             <field name="name">Website Configurator</field>
diff --git a/addons/website_event/views/event_menus.xml b/addons/website_event/views/event_menus.xml
index 8fe3cd4fc92..2207a54e1ae 100644
--- a/addons/website_event/views/event_menus.xml
+++ b/addons/website_event/views/event_menus.xml
@@ -9,9 +9,9 @@
         sequence="99"/>
 
     <menuitem id="menu_edit_menu"
-        name="Edit Event Menu "
-        sequence="35"
-        parent="website.menu_site"
+        name="Edit Event Menu"
+        sequence="90"
+        parent="website.menu_current_page"
         action="website.website_preview"/>
 
 </data></odoo>
diff --git a/addons/website_links/views/link_tracker_views.xml b/addons/website_links/views/link_tracker_views.xml
index f779704d266..747c6cd5091 100644
--- a/addons/website_links/views/link_tracker_views.xml
+++ b/addons/website_links/views/link_tracker_views.xml
@@ -13,7 +13,7 @@
 
     <menuitem id="menu_link_tracker"
         name="Link Tracker"
-        sequence="5"
-        parent="website.menu_promote"
+        sequence="25"
+        parent="website.menu_site"
         action="website.website_preview"/>
 </odoo>
diff --git a/addons/website_sale/views/sale_order_views.xml b/addons/website_sale/views/sale_order_views.xml
index 721129b565b..57d0d19efe2 100644
--- a/addons/website_sale/views/sale_order_views.xml
+++ b/addons/website_sale/views/sale_order_views.xml
@@ -184,7 +184,7 @@
 
     <!-- Main website sale menu items -->
     <menuitem id="menu_ecommerce" name="eCommerce"
-        parent="website.menu_website_configuration" sequence="10"
+        parent="website.menu_website_configuration" sequence="20"
         groups="sales_team.group_sale_salesman"/>
     <menuitem id="menu_orders" name="Orders"
         parent="menu_ecommerce" sequence="2"