From 0211b2367d27affccda6c17c006da646b7e481e7 Mon Sep 17 00:00:00 2001
From: Brieuc-brd <brd@odoo.com>
Date: Wed, 17 Jul 2024 13:12:49 +0200
Subject: [PATCH] [IMP] theme_anelusia, *: s_product_catalog adaptations

*: theme_artists, theme_avantgarde, theme_beauty, theme_bewise,
theme_bistro, theme_bookstore, theme_buzzy, theme_clean, theme_kiddo,
theme_loftspace, theme_notes, theme_odoo_experts, theme_orchid,
theme_paptic

This commit adapts the s_product_catalog customizations since this
snippet has been redesigned in PR [1].

task-3665307
Part of task-3619705

[1]:https://github.com/odoo/odoo/pull/173507

closes odoo/design-themes#833

Related: odoo/odoo#173507
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
---
 .../views/snippets/s_product_catalog.xml      |  2 ++
 .../views/snippets/s_product_catalog.xml      |  4 +++-
 theme_avantgarde/views/customizations.xml     |  6 ++++++
 .../views/snippets/s_product_catalog.xml      |  4 ++--
 theme_bewise/views/customizations.xml         |  4 ++--
 .../views/snippets/s_product_catalog.xml      | 19 ++++++-------------
 .../views/snippets/s_product_catalog.xml      |  4 ++--
 .../views/snippets/s_product_catalog.xml      |  4 ++--
 .../views/snippets/s_product_catalog.xml      |  2 +-
 .../views/snippets/s_product_catalog.xml      |  4 ++--
 .../views/snippets/s_product_catalog.xml      |  4 ++--
 .../views/snippets/s_product_catalog.xml      |  9 +++++----
 .../views/snippets/s_product_catalog.xml      |  4 ++--
 .../views/snippets/s_product_catalog.xml      |  2 +-
 theme_paptic/views/customizations.xml         |  9 +++++++--
 15 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/theme_anelusia/views/snippets/s_product_catalog.xml b/theme_anelusia/views/snippets/s_product_catalog.xml
index c14218348..462eca6cd 100644
--- a/theme_anelusia/views/snippets/s_product_catalog.xml
+++ b/theme_anelusia/views/snippets/s_product_catalog.xml
@@ -13,6 +13,8 @@
     <xpath expr="//div[hasclass('container')]" position="before">
         <div class="o_we_shape o_web_editor_Airy_11"/>
     </xpath>
+    <!-- Remove filter -->
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
 
 </odoo>
diff --git a/theme_artists/views/snippets/s_product_catalog.xml b/theme_artists/views/snippets/s_product_catalog.xml
index 77eb28fd4..7ccfd743c 100644
--- a/theme_artists/views/snippets/s_product_catalog.xml
+++ b/theme_artists/views/snippets/s_product_catalog.xml
@@ -4,9 +4,11 @@
 <template id="s_product_catalog" inherit_id="website.s_product_catalog">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt200 pb200" remove="pb32 pt48" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pt200 pb200" remove="pb64 pt64" separator=" "/>
         <attribute name="style"/>
     </xpath>
+    <!-- Remove filter -->
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
 </template>
 
 </odoo>
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
index e0daeb3de..f126510e8 100644
--- a/theme_avantgarde/views/customizations.xml
+++ b/theme_avantgarde/views/customizations.xml
@@ -220,4 +220,10 @@
     </xpath>
 </template>
 
+<!-- ======== PRICELIST ======== -->
+<template id="s_product_catalog" inherit_id="website.s_product_catalog">
+    <!-- Remove filter -->
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace"/>
+</template>
+
 </odoo>
diff --git a/theme_beauty/views/snippets/s_product_catalog.xml b/theme_beauty/views/snippets/s_product_catalog.xml
index 4975cf70a..6595a2ec0 100644
--- a/theme_beauty/views/snippets/s_product_catalog.xml
+++ b/theme_beauty/views/snippets/s_product_catalog.xml
@@ -3,8 +3,8 @@
 
 <template id="s_product_catalog" inherit_id="website.s_product_catalog">
     <!-- Filter -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_bg_filter bg-white-75"/>
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
+        <attribute name="class" add="bg-white-75" remove="bg-white-85" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index f4c1e328d..5a4ec98f2 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -417,11 +417,11 @@
 <!-- ======== PRICELIST ======== -->
 <template id="s_product_catalog" inherit_id="website.s_product_catalog" name="Be Wise s_product_catalog">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt120 pb120" remove="pt48 pb32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pt120 pb120" remove="pt64 pb64" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/06","flip":[]}</attribute>
     </xpath>
     <!-- Filter & shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-black-75"/>
         <div class="o_we_shape o_web_editor_Floats_06"/>
     </xpath>
diff --git a/theme_bistro/views/snippets/s_product_catalog.xml b/theme_bistro/views/snippets/s_product_catalog.xml
index ff954de81..6a2925a0b 100644
--- a/theme_bistro/views/snippets/s_product_catalog.xml
+++ b/theme_bistro/views/snippets/s_product_catalog.xml
@@ -5,17 +5,15 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="style"/>
-        <attribute name="class" add="parallax s_parallax_is_fixed o_cc o_cc5 pt120 pb104" remove="pt48 pb32" separator=" "/>
+        <attribute name="class" add="parallax s_parallax_is_fixed o_cc o_cc5 pt120 pb104" remove="pt64 pb64" separator=" "/>
         <attribute name="data-scroll-background-ratio">1</attribute>
     </xpath>
-    <xpath expr="//*[hasclass('container')]" position="before">
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_product_catalog_default_image'); background-position: 50% 0%;"/>
         <div class="o_we_bg_filter bg-black-50"/>
     </xpath>
-    <!-- Title -->
-    <xpath expr="//h2" position="replace"/>
-    <!-- Paragraph -->
-    <xpath expr="//p" position="replace"/>
+    <!-- Remove Title & lead -->
+    <xpath expr="//div[hasclass('row')]" position="replace"/>
 </template>
 
 <template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
@@ -30,13 +28,8 @@
 </template>
 
 <template id="s_product_catalog_dish" inherit_id="website.s_product_catalog_dish">
-    <xpath expr="//li" position="inside">
-        <p class="s_product_catalog_dish_description border-top text-muted pt-1 o_default_snippet_text">
-            <em>Add the description of this dish here.</em>
-        </p>
-    </xpath>
-    <xpath expr="//*[hasclass('s_product_catalog_dish_name')]" position="attributes">
-        <attribute name="class" remove="s_product_catalog_dish_dot_leaders" separator=" "/>
+    <xpath expr="//li" position="attributes">
+        <attribute name="class" add="mb-3" remove="mb-4" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_bookstore/views/snippets/s_product_catalog.xml b/theme_bookstore/views/snippets/s_product_catalog.xml
index 098f4b55c..6ba79cd70 100644
--- a/theme_bookstore/views/snippets/s_product_catalog.xml
+++ b/theme_bookstore/views/snippets/s_product_catalog.xml
@@ -4,10 +4,10 @@
 <template id="s_product_catalog" inherit_id="website.s_product_catalog">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pb112 pt112" remove="pb32 pt48" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pb112 pt112" remove="pb64 pt64" separator=" "/>
     </xpath>
     <!-- Filter -->
-    <xpath expr="//section/*" position="before">
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter" style="background-color: rgba(47, 47, 47, 0.7) !important;"/>
     </xpath>
 </template>
diff --git a/theme_buzzy/views/snippets/s_product_catalog.xml b/theme_buzzy/views/snippets/s_product_catalog.xml
index b14776c19..8b02ac8b1 100644
--- a/theme_buzzy/views/snippets/s_product_catalog.xml
+++ b/theme_buzzy/views/snippets/s_product_catalog.xml
@@ -4,13 +4,13 @@
 <template id="s_product_catalog" inherit_id="website.s_product_catalog">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc4 pb88 pt88" remove="pb32 pt48" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4 pb88 pt88" remove="pb64 pt64" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/07","flip":[]}</attribute>
         <!-- Enable SVG dynamic color functionality -->
         <attribute name="style">background-image: url('/web_editor/shape/theme_buzzy/s_product_catalog.svg?c1=o-color-1'); background-position: 50% 0%;</attribute>
     </xpath>
     <!-- Shape -->
-    <xpath expr="//section/*" position="before">
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_shape o_web_editor_Airy_07"/>
     </xpath>
 </template>
diff --git a/theme_clean/views/snippets/s_product_catalog.xml b/theme_clean/views/snippets/s_product_catalog.xml
index 7fd514b97..e0c044077 100644
--- a/theme_clean/views/snippets/s_product_catalog.xml
+++ b/theme_clean/views/snippets/s_product_catalog.xml
@@ -9,7 +9,7 @@
         <attribute name="style"/>
     </xpath>
     <!-- Filter & Parallax -->
-    <xpath expr="//div[hasclass('container')]" position="before">
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <span class="s_parallax_bg oe_img_bg" style="background-image: url('/web/image/website.s_product_catalog_default_image');"/>
         <div class="o_we_bg_filter bg-black-50"/>
     </xpath>
diff --git a/theme_kiddo/views/snippets/s_product_catalog.xml b/theme_kiddo/views/snippets/s_product_catalog.xml
index 9cc2fccd3..e6d2d7586 100644
--- a/theme_kiddo/views/snippets/s_product_catalog.xml
+++ b/theme_kiddo/views/snippets/s_product_catalog.xml
@@ -8,8 +8,8 @@
     </xpath>
 
     <!-- Filter -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_bg_filter bg-black-25"/>
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
+        <div class="o_we_bg_filter bg-black-75"/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_product_catalog.xml b/theme_loftspace/views/snippets/s_product_catalog.xml
index 5be019eba..826e71fe7 100644
--- a/theme_loftspace/views/snippets/s_product_catalog.xml
+++ b/theme_loftspace/views/snippets/s_product_catalog.xml
@@ -4,11 +4,11 @@
 <template id="s_product_catalog" inherit_id="website.s_product_catalog">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt48 pb32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt64 pb64" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/09","flip":[]}</attribute>
     </xpath>
     <!-- Filter & shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-black-50"/>
         <div class="o_we_shape o_web_editor_Floats_09"/>
     </xpath>
diff --git a/theme_notes/views/snippets/s_product_catalog.xml b/theme_notes/views/snippets/s_product_catalog.xml
index 610a33d2a..99303e1db 100644
--- a/theme_notes/views/snippets/s_product_catalog.xml
+++ b/theme_notes/views/snippets/s_product_catalog.xml
@@ -4,13 +4,14 @@
 <template id="s_product_catalog" inherit_id="website.s_product_catalog">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pb160 pt160 parallax s_parallax_is_fixed s_parallax_no_overflow_hidden o_full_screen_height" remove="pb32 pt48" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pb160 pt160 parallax s_parallax_is_fixed s_parallax_no_overflow_hidden o_full_screen_height" remove="pb64 pt64" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","flip":[]}</attribute>
         <attribute name="data-scroll-background-ratio">1</attribute>
     </xpath>
     <!-- Shape & Background image -->
-    <xpath expr="//section/*" position="before">
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <span class="s_parallax_bg oe_img_bg o_bg_img_center" style="background-image: url('/web/image/website.s_product_catalog_default_image');"/>
+        <div class="o_we_bg_filter bg-black-50"/>
         <div class="o_we_shape o_web_editor_Wavy_10"/>
     </xpath>
     <!-- Title & subtitles -->
@@ -24,8 +25,8 @@
         Paris edition
     </xpath>
     <!-- Description -->
-    <xpath expr="//div[hasclass('container')]//p" position="replace">
-        <p style="text-align: center;">Get your ticket now</p>
+    <xpath expr="//div[hasclass('container')]//p" position="replace" mode="inner">
+        Get your ticket now
     </xpath>
     <!-- Left column : names -->
     <xpath expr="//ul/t/t" position="replace" mode="inner">
diff --git a/theme_odoo_experts/views/snippets/s_product_catalog.xml b/theme_odoo_experts/views/snippets/s_product_catalog.xml
index a22d3850a..dece2ecd6 100644
--- a/theme_odoo_experts/views/snippets/s_product_catalog.xml
+++ b/theme_odoo_experts/views/snippets/s_product_catalog.xml
@@ -4,11 +4,11 @@
 <template id="s_product_catalog" inherit_id="website.s_product_catalog">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt96 pb96" remove="pt48 pb32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pt96 pb96" remove="pt64 pb64" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
     </xpath>
     <!-- Filter & shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-black-50"/>
         <div class="o_we_shape o_web_editor_Airy_03_001"/>
     </xpath>
diff --git a/theme_orchid/views/snippets/s_product_catalog.xml b/theme_orchid/views/snippets/s_product_catalog.xml
index 330ae083e..951cebe79 100644
--- a/theme_orchid/views/snippets/s_product_catalog.xml
+++ b/theme_orchid/views/snippets/s_product_catalog.xml
@@ -7,7 +7,7 @@
         <attribute name="class" add="o_cc o_cc5" separator=" "/>
     </xpath>
     <!-- Filter -->
-    <xpath expr="//div[hasclass('container')]" position="before">
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter bg-black-50"/>
     </xpath>
 </template>
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index deedec48f..6ef534f61 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -396,9 +396,14 @@
 
 <!-- ==== Pricelist ===== -->
 <template id="s_product_catalog" inherit_id="website.s_product_catalog" name="Paptic s_product_catalog">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc3" separator=" "/>
+    </xpath>
     <!-- Filter -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_bg_filter bg-white-75"/>
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
+        <attribute name="class" remove="bg-white-85" separator=" "/>
+        <attribute name="style">background-image: linear-gradient(135deg, rgba(255, 255, 255, 0.75) 0%, rgba(178, 255, 218, 1) 100%);</attribute>
     </xpath>
 </template>