From 676e43f93c839b99669dfa9fc03c985a65642a33 Mon Sep 17 00:00:00 2001
From: "Antoine (anso)" <anso@odoo.com>
Date: Thu, 25 Jul 2024 17:25:22 +0200
Subject: [PATCH] [IMP] theme_*: adapt themes with new `s_company_team` design

*: (anelusia, beauty, bewise, graphene, notes, yes)

This commit adapts the design of `s_company_team` for multiple themes,
based on the new Odoo 18 snippet redesign.

task-3657640

closes odoo/design-themes#844

Related: odoo/odoo#172719
Signed-off-by: Benjamin Vray (bvr) <bvr@odoo.com>
---
 .../views/snippets/s_company_team.xml         | 29 ++++++++++++++-----
 .../views/snippets/s_company_team.xml         |  8 ++---
 theme_bewise/views/customizations.xml         | 20 ++++++++++---
 theme_graphene/views/customizations.xml       | 24 ---------------
 theme_notes/views/snippets/s_company_team.xml | 20 ++++++++-----
 theme_yes/views/snippets/s_company_team.xml   | 20 ++++++++-----
 6 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/theme_anelusia/views/snippets/s_company_team.xml b/theme_anelusia/views/snippets/s_company_team.xml
index a28f4af55..1745903f6 100644
--- a/theme_anelusia/views/snippets/s_company_team.xml
+++ b/theme_anelusia/views/snippets/s_company_team.xml
@@ -14,10 +14,13 @@
     <!-- Team #01 - Title -->
     <xpath expr="//div[hasclass('col-lg-6')]//h4" position="replace" mode="inner">
         <font style="background-image: linear-gradient(135deg, var(--o-color-1) 0%, var(--o-color-5) 100%);" class="text-gradient">Tony Fred</font>
-        <br/>Editor-in-chief
+    </xpath>
+    <!-- Team #01 - Work Description -->
+    <xpath expr="//div[hasclass('col-lg-6')]//p" position="replace" mode="inner">
+        Editor-in-chief
     </xpath>
     <!-- Team #01 - Paragraph -->
-    <xpath expr="//div[hasclass('col-lg-6')]//p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('col-lg-6')]//p[2]" position="replace" mode="inner">
         Founder and chief visionary, Tony is the driving force behind the company. He loves to keep his hands full by participating in the development of the magazine and does not hesitate to carry out field surveys.
     </xpath>
     <!-- Team #01 - Img -->
@@ -36,10 +39,14 @@
     <!-- Team #02 - Title -->
     <xpath expr="//div[hasclass('col-lg-6')][2]//h4" position="replace" mode="inner">
         <font style="background-image: linear-gradient(135deg, var(--o-color-1) 0%, var(--o-color-5) 100%);" class="text-gradient">Mich Stark</font>
-        <br/>Sports Reporter
+        <br/>
+    </xpath>
+    <!-- Team #02 - Work Description -->
+    <xpath expr="//div[hasclass('col-lg-6')][2]//p" position="replace" mode="inner">
+        Sports Reporter
     </xpath>
     <!-- Team #02 - Paragraph -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]//p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('col-lg-6')][2]//p[2]" position="replace" mode="inner">
         Mich loves taking on challenges. With his multi-year experience as a journalist, he wanted to join a team that puts people at the center of the stories.
     </xpath>
     <!-- Team #02 - Img -->
@@ -58,10 +65,13 @@
     <!-- Team #03 - Title -->
     <xpath expr="//div[hasclass('col-lg-6')][3]//h4" position="replace" mode="inner">
         <font style="background-image: linear-gradient(135deg, var(--o-color-2) 0%, var(--o-color-5) 100%);" class="text-gradient">Aline Turner</font>
-        <br/>Photograph
+    </xpath>
+    <!-- Team #03 - Work Description -->
+    <xpath expr="//div[hasclass('col-lg-6')][3]//p" position="replace" mode="inner">
+        Photograph
     </xpath>
     <!-- Team #03 - Paragraph -->
-    <xpath expr="//div[hasclass('col-lg-6')][3]//p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('col-lg-6')][3]//p[2]" position="replace" mode="inner">
         Aline is one of the iconic people in life who can say they love what they do. She likes to capture the moment from another point of view, another perspective.
     </xpath>
     <!-- Team #03 - Img -->
@@ -80,10 +90,13 @@
     <!-- Team #04 - Title -->
     <xpath expr="//div[hasclass('col-lg-6')][4]//h4" position="replace" mode="inner">
         <font style="background-image: linear-gradient(135deg, var(--o-color-2) 0%, var(--o-color-5) 100%);" class="text-gradient">Iris Joe</font>
-        <br/>Political Reporter
+    </xpath>
+    <!-- Team #04 - Work Description -->
+    <xpath expr="//div[hasclass('col-lg-6')][3]//p" position="replace" mode="inner">
+        Political Reporter
     </xpath>
     <!-- Team #04 - Paragraph -->
-    <xpath expr="//div[hasclass('col-lg-6')][4]//p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('col-lg-6')][4]//p[2]" position="replace" mode="inner">
         Iris, with her international experience, helps us easily understand global politics. She is determined to drive success and delivers her professional acumen to bring the magazine to the next level.
     </xpath>
     <!-- Team #04 - Img -->
diff --git a/theme_beauty/views/snippets/s_company_team.xml b/theme_beauty/views/snippets/s_company_team.xml
index fa6f44615..6b9ca5c0b 100644
--- a/theme_beauty/views/snippets/s_company_team.xml
+++ b/theme_beauty/views/snippets/s_company_team.xml
@@ -7,16 +7,16 @@
         <attribute name="class" add="o_cc o_cc4 pt80 pb80" remove="pb48 pt48" separator=" "/>
     </xpath>
     <!-- Titles -->
-    <xpath expr="(//div[hasclass('col-lg-8')])[1]/h4" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[1]/h4" position="replace" mode="inner">
         Tony
     </xpath>
-    <xpath expr="(//div[hasclass('col-lg-8')])[2]/h4" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[2]/h4" position="replace" mode="inner">
         Mich
     </xpath>
-    <xpath expr="(//div[hasclass('col-lg-8')])[3]/h4" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[3]/h4" position="replace" mode="inner">
         Aline
     </xpath>
-    <xpath expr="(//div[hasclass('col-lg-8')])[4]/h4" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[4]/h4" position="replace" mode="inner">
         Iris
     </xpath>
     <!-- Images -->
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index f30a9eccd..f4c1e328d 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -206,28 +206,40 @@
 <template id="s_company_team" inherit_id="website.s_company_team" name="Be Wise s_company_team">
     <!-- Profile #1 -->
     <xpath expr="//div[hasclass('s_nb_column_fixed')]/div//h4" position="replace" mode="inner">
-        <b>Tony Fred, Faculty Head of IT</b>
+        <b>Tony Fred</b>
     </xpath>
     <xpath expr="//div[hasclass('s_nb_column_fixed')]/div//p" position="replace" mode="inner">
+        Faculty Head of IT
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-6')]//p[2]" position="replace" mode="inner">
         Tony received a degree in Electrical and Mechanical Engineering and a Ph D. degree in 1998 and 2004. After a post-doctoral experience  he joined the school as professor of mechatronics in 2006. In 2010, he became Head of IT.
     </xpath>
     <!-- Profile #2 -->
     <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//h4" position="replace" mode="inner">
-        <b>Mich Stark, IT Officer</b>
+        <b>Mich Stark</b>
     </xpath>
     <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//p" position="replace" mode="inner">
+        IT Officer
+    </xpath>
+    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//p[2]" position="replace" mode="inner">
         He is professor in the Institute of Mechanics, Materials and Civil Engineering since 2000. He lectures in mechanical drawing and mechanical design for undergraduate and graduate students. He is active in Problem and Project based learning. He is the promoter of 8 doctoral theses.
     </xpath>
     <!-- Profile #3 -->
     <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//h4" position="replace" mode="inner">
-        <b>Aline Turner, Law professor</b>
+        <b>Aline Turner</b>
     </xpath>
     <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//p" position="replace" mode="inner">
+        Law professor
+    </xpath>
+    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//p[2]" position="replace" mode="inner">
         She has been practicing law at the French-speaking Brussels Bar since 2006. She has worked in various major law firms based in Brussels, as member and then head of their litigation/arbitration practice groups.
     </xpath>
     <!-- Profile #4 -->
     <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[4]//h4" position="replace" mode="inner">
-        <b>Iris Joe, team leader professor</b>
+        <b>Iris Joe</b>
+    </xpath>
+    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[4]//p" position="replace" mode="inner">
+        Team leader professor
     </xpath>
 </template>
 
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
index 656fb166c..e96fd353a 100644
--- a/theme_graphene/views/customizations.xml
+++ b/theme_graphene/views/customizations.xml
@@ -134,30 +134,6 @@
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb64" remove="pb48" separator=" "/>
     </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div//h4" position="replace" mode="inner">
-        Tony Fred, <small><b>CEO</b></small>
-    </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div//p" position="replace">
-        <small>Founder and chief visionary, Tony is the driving force behind the company. He loves to keep his hands full by participating in the development of the software, marketing, and customer experience strategies.</small>
-    </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//h4" position="replace" mode="inner">
-        Mich Stark, <small><b>COO</b></small>
-    </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//p" position="replace" mode="inner">
-        <small>Mich loves taking on challenges. With his multi-year experience as Commercial Director in the software industry, Mich has helped the company to get where it is today. Mich is among the best minds.</small>
-    </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//h4" position="replace" mode="inner">
-        Aline Turner, <small><b>CTO</b></small>
-    </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//p" position="replace" mode="inner">
-        <small>Aline is one of the iconic people in life who can say they love what they do. She mentors 100+ in-house developers and looks after the community of thousands of developers.</small>
-    </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[4]//h4" position="replace" mode="inner">
-        Iris Joe, <small><b>CFO</b></small>
-    </xpath>
-    <xpath expr="//div[hasclass('s_nb_column_fixed')]/div[4]//p" position="replace" mode="inner">
-        <small>Iris, with her international experience, helps us easily understand the numbers and improves them. She is determined to drive success and delivers her professional acumen to bring the company to the next level.</small>
-    </xpath>
 </template>
 
 <!-- ======== 3 COLUMNS ======== -->
diff --git a/theme_notes/views/snippets/s_company_team.xml b/theme_notes/views/snippets/s_company_team.xml
index 45c021966..bafe19792 100644
--- a/theme_notes/views/snippets/s_company_team.xml
+++ b/theme_notes/views/snippets/s_company_team.xml
@@ -7,31 +7,35 @@
         <attribute name="class" add="o_cc o_cc2 pb128" remove="pb48" separator=" "/>
     </xpath>
     <!-- Member #1 -->
-    <xpath expr="//div[hasclass('col-lg-8')]//h4" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('col-lg-9')]//h4" position="replace" mode="inner">
         Tony
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-8')]//p" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('col-lg-9')]//p" position="replace" mode="inner"/>
+    <xpath expr="//div[hasclass('col-lg-9')]//p[2]" position="replace" mode="inner">
         Tony is praised for the quality of his flow and beats but often criticised because of the controversial nature of his lyrics. He has also established a label, and developed a line of jewellery.
     </xpath>
     <!-- Member #2 -->
-    <xpath expr="(//div[hasclass('col-lg-8')])[2]//h4" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[2]//h4" position="replace" mode="inner">
         Aline
     </xpath>
-    <xpath expr="(//div[hasclass('col-lg-8')])[2]//p" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[2]//p" position="replace" mode="inner"/>
+    <xpath expr="(//div[hasclass('col-lg-9')])[2]//p[2]" position="replace" mode="inner">
         Aline is a French singer, songwriter and producer. In 2016, she was ranked as the most powerful and influential French person by Vanity Fair, who noticed her radiance of French genius.
     </xpath>
     <!-- Member #3 -->
-    <xpath expr="(//div[hasclass('col-lg-8')])[3]//h4" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[3]//h4" position="replace" mode="inner">
         Mich Starck
     </xpath>
-    <xpath expr="(//div[hasclass('col-lg-8')])[3]//p" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[3]//p" position="replace" mode="inner"/>
+    <xpath expr="(//div[hasclass('col-lg-9')])[3]//p[2]" position="replace" mode="inner">
         Mich Starck is a French DJ, record producer and songwriter. He has sold over nine million albums and thirty million singles worldwide. In 2011, he was voted as the number one DJ in the DJ Mag Top 100 DJs poll.
     </xpath>
     <!-- Member #4 -->
-    <xpath expr="(//div[hasclass('col-lg-8')])[4]//h4" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[4]//h4" position="replace" mode="inner">
         Joseris
     </xpath>
-    <xpath expr="(//div[hasclass('col-lg-8')])[4]//p" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[4]//p" position="replace" mode="inner"/>
+    <xpath expr="(//div[hasclass('col-lg-9')])[4]//p[2]" position="replace" mode="inner">
         Joseris is a Belgian band that formed in October 1995. Though originally categorised as a trip hop group, they quickly expanded their sound to the point where they could no longer be described as a lone genre, but rather encompass alternative, electronica, electro-pop, rock, and a mixture of others.
     </xpath>
 </template>
diff --git a/theme_yes/views/snippets/s_company_team.xml b/theme_yes/views/snippets/s_company_team.xml
index 8db52cbc5..e229aa94f 100644
--- a/theme_yes/views/snippets/s_company_team.xml
+++ b/theme_yes/views/snippets/s_company_team.xml
@@ -3,20 +3,24 @@
 
 <template id="s_company_team" inherit_id="website.s_company_team">
     <!-- Row #1 - Col #1 -->
-    <xpath expr="//h4" position="replace" mode="inner">
+    <xpath expr="//div[hasclass('col-lg-9')]//h4" position="replace" mode="inner">
         Livia Sailor
     </xpath>
-    <xpath expr="//p" position="replace">
-        <p><font style="font-weight: bolder;" class="text-o-color-1">The Founder &amp; Planner</font></p>
-        <p>Livia is our head wedding coordinator and stylist, she'll turn any of your ideas into reality, making sure your wedding day is smooth and looks better than anything you have ever seen on Pinterest.</p>
+    <xpath expr="//div[hasclass('col-lg-9')]//p" position="replace" mode="inner">
+        <font style="font-weight: bolder;" class="text-o-color-1">The Founder &amp; Planner</font>
+    </xpath>
+    <xpath expr="//div[hasclass('col-lg-9')]//p[2]" position="replace" mode="inner">
+        Livia is our head wedding coordinator and stylist, she'll turn any of your ideas into reality, making sure your wedding day is smooth and looks better than anything you have ever seen on Pinterest.
     </xpath>
     <!-- Row #1 - Col #2 -->
-    <xpath expr="(//h4)[2]" position="replace" mode="inner">
+    <xpath expr="(//div[hasclass('col-lg-9')])[2]//h4" position="replace" mode="inner">
         Clair Stark
     </xpath>
-    <xpath expr="(//p)[3]" position="replace">
-        <p><font style="font-weight: bolder;" class="text-o-color-1">The Designer</font></p>
-        <p>As a passionate wedding designer with a romantic soul, Clair adores celebrating the special moments in life in magical places and creating an authentic experience for couples. </p>
+    <xpath expr="(//div[hasclass('col-lg-9')])[2]//p" position="replace" mode="inner">
+        <font style="font-weight: bolder;" class="text-o-color-1">The Designer</font>
+    </xpath>
+    <xpath expr="(//div[hasclass('col-lg-9')])[2]//p[2]" position="replace" mode="inner">
+        Livia is our head wedding coordinator and stylist, she'll turn any of your ideas into reality, making sure your wedding day is smooth and looks better than anything you have ever seen on Pinterest.
     </xpath>
     <!-- Row -->
     <xpath expr="//*[hasclass('col-lg-6')][4]" position="replace"/>