From 7b31d32888b6c6719fe6a499a2aeac00c79506f5 Mon Sep 17 00:00:00 2001
From: Ivan Office <guohuadeng@hotmail.com>
Date: Mon, 11 Sep 2023 22:40:40 +0800
Subject: [PATCH] =?UTF-8?q?opt=20seo=EF=BC=8Copt=20=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/blog_post_views.xml                 | 50 ++++++-------------
 .../views/product_template_views.xml          |  8 ++-
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/app_website_blog_editor/views/blog_post_views.xml b/app_website_blog_editor/views/blog_post_views.xml
index f320892a..f25f1c21 100644
--- a/app_website_blog_editor/views/blog_post_views.xml
+++ b/app_website_blog_editor/views/blog_post_views.xml
@@ -44,9 +44,6 @@
 		<field name="model">blog.post</field>
 		<field name="inherit_id" ref="website_blog.view_blog_post_form"/>
 		<field name="arch" type="xml">
-			<xpath expr="//field[@name='tag_ids']" position="after">
-				<field name="seo_name"/>
-			</xpath>
 			<xpath expr="//page[@name='seo']" position="after">
 				<page name="post_content" string="Content">
 					<field name="content" widget="html" nolabel="1" class="oe-bordered-editor"
@@ -56,7 +53,20 @@
 		</field>
 	</record>
 
-	<record id="app_view_blog_post_search" model="ir.ui.view">
+    <record id="app_blog_post_form_view_code" model="ir.ui.view">
+        <field name="name">app.blog.post.code</field>
+        <field name="model">blog.post</field>
+        <field name="priority">99</field>
+        <field name="mode">primary</field>
+        <field name="inherit_id" ref="app_view_blog_post_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='content']" position="replace">
+                <field name="content" nolabel="1" widget="ace"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="app_view_blog_post_search" model="ir.ui.view">
 		<field name="name">app.blog.post.search</field>
 		<field name="model">blog.post</field>
 		<field name="inherit_id" ref="website_blog.view_blog_post_search"/>
@@ -71,38 +81,6 @@
 			</xpath>
 		</field>
 	</record>
-
-	<record id="app_blog_post_form_view_code" model="ir.ui.view">
-		<field name="name">app.blog.post.code</field>
-		<field name="model">blog.post</field>
-		<field name="priority">99</field>
-		<field name="mode">primary</field>
-		<field name="arch" type="xml">
-			<form string="Blog Content">
-				<sheet name="blog_content">
-					<field name="id" invisible="True"/>
-					<div class="oe_title">
-						<label for="name" string="Blog Name"/>
-						<h1>
-							<div class="d-flex">
-								<field class="text-break" name="name"/>
-							</div>
-						</h1>
-					</div>
-					<group>
-						<group>
-							<field name="is_published" widget="website_redirect_button"></field>
-						</group>
-					</group>
-					<notebook>
-						<page name="shop_desc" string="Website Description">
-							<field name="content" nolabel="1" widget="ace"/>
-						</page>
-					</notebook>
-				</sheet>
-			</form>
-		</field>
-	</record>
 </odoo>
 
 
diff --git a/app_website_sale_editor/views/product_template_views.xml b/app_website_sale_editor/views/product_template_views.xml
index 571f9b9f..8ee35ee8 100644
--- a/app_website_sale_editor/views/product_template_views.xml
+++ b/app_website_sale_editor/views/product_template_views.xml
@@ -64,7 +64,12 @@
 		    <field name="arch" type="xml">
 			    <form string="Website Product">
 				    <sheet name="product_form">
-					    <field name="id" invisible="True"/>
+                        <div class="oe_button_box" name="button_box" attrs="{'invisible': [('active', '=', False)]}">
+                            <field name="is_published" widget="website_redirect_button"/>
+                        </div>
+                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+					    <field name="id" invisible="1"/>
+					    <field name="active" invisible="1"/>
 					    <field name="image_1920" widget="image" class="oe_avatar" options="{'preview_image': 'image_128'}"/>
 					    <div class="oe_title">
 						    <label for="name" string="Product Name"/>
@@ -78,7 +83,6 @@
 					    <group>
 						    <group>
 							    <field name="sale_ok" invisible="1"/>
-							    <field name="is_published" widget="website_redirect_button" attrs="{'invisible': [('sale_ok','=',False)]}"></field>
 						    </group>
                         </group>
                         <notebook>