[IMP] theme_*: adapt s_image_text templates

chgo-odoo · chgo-odoo · commit c3bee925070f · 2024-07-26T09:53:51.000Z
This commit aims to review all the occurrences of the `s_image_text` snippet across the themes in order to fix broken selectors. task-3665301 closes #830 Related: odoo/odoo#173311 Signed-off-by: Robin Lejeune (role) <role@odoo.com>
diff --git a/theme_artists/views/snippets/s_image_text.xml b/theme_artists/views/snippets/s_image_text.xml
@@ -4,11 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt128" remove="pt32" separator=" "/>
-    </xpath>
-    <!-- Text wrapper -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
-        <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pt128" remove="pt80" separator=" "/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_avantgarde/views/customizations.xml b/theme_avantgarde/views/customizations.xml
@@ -144,11 +144,11 @@
 
 <!-- ======== IMAGE-TEXT ======== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Avantgarde s_image_text">
-    <xpath expr="//div[hasclass('col-lg-6')][1]" position="attributes">
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
         <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-6')][1]" position="attributes">
-        <attribute name="class" add="col-lg-4 offset-lg-1" remove="col-lg-6" separator=" "/>
+    <xpath expr="//div[hasclass('col-lg-5')]" position="attributes">
+        <attribute name="class" add="col-lg-4" remove="col-lg-5" separator=" "/>
     </xpath>
     <xpath expr="//a[hasclass('btn')]" position="attributes">
         <attribute name="class" add="btn-lg" separator=" "/>
diff --git a/theme_aviato/views/snippets/s_image_text.xml b/theme_aviato/views/snippets/s_image_text.xml
@@ -7,7 +7,7 @@
         <attribute name="class" add="container-fluid" remove="container" separator=" "/>
     </xpath>
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb72" remove="pb32" separator=" "/>
+        <attribute name="class" add="pb72" remove="pb80" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
@@ -16,7 +16,7 @@
     </xpath>
     <!-- layout -->
     <xpath  expr="//div[hasclass('row')]/div[2]" position="attributes">
-        <attribute name="class" add="col-lg-4" remove="col-lg-6" separator=" "/>
+        <attribute name="class" add="col-lg-4" remove="col-lg-5 offset-lg-1" separator=" "/>
     </xpath>    
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
@@ -60,11 +60,11 @@
 
 <!-- ======== IMAGE-TEXT ======== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Be Wise s_image_text">
-    <xpath expr="//div[hasclass('col-lg-6')][1]" position="attributes">
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
         <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-6')][1]" position="attributes">
-        <attribute name="class" add="col-lg-4 offset-lg-1" remove="col-lg-6" separator=" "/>
+    <xpath expr="//div[hasclass('col-lg-5')]" position="attributes">
+        <attribute name="class" add="col-lg-4" remove="col-lg-5" separator=" "/>
     </xpath>
     <xpath expr="//h2" position="replace" mode="inner">
         What makes us different?
diff --git a/theme_bistro/views/snippets/s_image_text.xml b/theme_bistro/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt64 pb64" remove="pt80 pb80" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
diff --git a/theme_bookstore/views/snippets/s_image_text.xml b/theme_bookstore/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc2 pt112 pb112" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc2 pt112 pb112" remove="pt80 pb80" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
diff --git a/theme_buzzy/views/snippets/s_image_text.xml b/theme_buzzy/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc2 pt72 pb72" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc2 pt72 pb72" remove="pt80 pb80" separator=" "/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_clean/views/snippets/s_image_text.xml b/theme_clean/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc4 pt72 pb72" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc4 pt72 pb72" remove="pt80 pb80" separator=" "/>
     </xpath>
     <!-- Add space after title -->
     <xpath expr="//h2" position="after">
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
@@ -59,11 +59,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text" name="Cobalt s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt152 pb128" remove="pt32 pb32" separator=" "/>
-    </xpath>
-    <!-- Layout -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
-        <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
+        <attribute name="class" add="pt152 pb128" remove="pt80 pb80" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="replace">
diff --git a/theme_graphene/views/customizations.xml b/theme_graphene/views/customizations.xml
@@ -77,11 +77,11 @@
 
 <!-- ======== IMAGE-TEXT ======== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Graphene s_image_text">
-    <xpath expr="//div[hasclass('col-lg-6')][1]" position="attributes">
+    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
         <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-6')][1]" position="attributes">
-        <attribute name="class" add="col-lg-4 offset-lg-1" remove="col-lg-6" separator=" "/>
+    <xpath expr="//div[hasclass('col-lg-5')]" position="attributes">
+        <attribute name="class" add="col-lg-4" remove="col-lg-5" separator=" "/>
     </xpath>
     <xpath expr="//h2" position="after">
         <div class="s_hr pt16 pb0" data-snippet="s_hr" data-name="Separator">
diff --git a/theme_kea/views/new_page_template.xml b/theme_kea/views/new_page_template.xml
@@ -22,7 +22,7 @@
 
 <template id="new_page_template_s_image_text" inherit_id="website.new_page_template_s_image_text">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt32" remove="pt232" separator=" "/>
+        <attribute name="class" remove="pt232" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_kea/views/snippets/s_image_text.xml b/theme_kea/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc2 pt232" remove="pt32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc2 pt232" remove="pt80" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
diff --git a/theme_kiddo/views/snippets/s_image_text.xml b/theme_kiddo/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc2 pb64 pt64" remove="pb32 pt32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc2 pb64 pt64" remove="pb80 pt80" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["x"]}</attribute>
     </xpath>
 
@@ -13,11 +13,6 @@
         <div class="o_we_shape o_web_editor_Floats_13" style="background-image: url('/web_editor/shape/web_editor/Floats/13.svg?c1=o-color-1&amp;c2=o-color-2&amp;c5=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 
-    <!-- Last column -->
-    <xpath expr="(//div[hasclass('col-lg-6')])[2]" position="attributes">
-        <attribute name="class" add="offset-lg-1 col-lg-5" remove="col-lg-6" separator=" "/>
-    </xpath>
-
     <!-- Title & Paragraphs -->
     <xpath expr="//h2" position="replace" mode="inner">
         Activities
diff --git a/theme_loftspace/views/snippets/s_image_text.xml b/theme_loftspace/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt64 pb64" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt64 pb64" remove="pt80 pb80" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/10","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -15,10 +15,6 @@
     <xpath expr="//div[hasclass('row')]//div" position="attributes">
         <attribute name="class" add="col-lg-5" remove="col-lg-6" separator=" "/>
     </xpath>
-    <!-- Column text -->
-    <xpath expr="//div[hasclass('row')]//div[2]" position="attributes">
-        <attribute name="class" add="offset-lg-1" separator=" "/>
-    </xpath>
 </template>
 
 </odoo>
diff --git a/theme_monglia/views/customizations.xml b/theme_monglia/views/customizations.xml
@@ -128,10 +128,7 @@
 <!-- ======== IMAGE - TEXT ======== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Monglia s_image_text">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc2 pt104 pb104" remove="pt32 pb32" separator=" "/>
-    </xpath>
-    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
-        <attribute name="class" remove="col-lg-6" add="col-lg-5 offset-lg-1" separator=" "/>
+        <attribute name="class" add="o_cc o_cc2 pt104 pb104" remove="pt80 pb80" separator=" "/>
     </xpath>
     <xpath expr="//h2" position="replace" mode="inner">
         <font style="background-image: linear-gradient(135deg, var(--o-color-1) 25%, var(--o-color-2) 100%);" class="text-gradient">Mixology</font>
diff --git a/theme_nano/views/snippets/s_image_text.xml b/theme_nano/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt48 pb48" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pt48 pb48" remove="pt80 pb80" separator=" "/>
     </xpath>
     <xpath expr="//*[hasclass('container')]" position="attributes">
         <attribute name="class" add="container-fluid" remove="container" separator=" "/>
@@ -18,7 +18,7 @@
     </xpath>
     <!-- Column #02 -->
     <xpath expr="//*[hasclass('row')]/*[2]" position="attributes">
-        <attribute name="class" add="col-lg-5 offset-lg-1 pt48 pb32" remove="col-lg-6 pt16 pb16" separator=" "/>
+        <attribute name="class" add="pt48 pb32" remove="pt16 pb16" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_image_text.xml b/theme_notes/views/snippets/s_image_text.xml
@@ -4,12 +4,12 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pt80 pb80" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5" remove="pt80 pb80" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":[]}</attribute>
     </xpath>
     <!-- Text wrapper -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
-        <attribute name="class" add="offset-lg-2" separator=" "/>
+    <xpath expr="//div[hasclass('col-lg-5')]" position="attributes">
+        <attribute name="class" add="offset-lg-2" remove="offset-lg-1" separator=" "/>
     </xpath>
     <!-- Title & Paragraph -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_odoo_experts/views/snippets/s_image_text.xml b/theme_odoo_experts/views/snippets/s_image_text.xml
@@ -15,10 +15,6 @@
         <attribute name="data-shape-colors">;;;;o-color-5</attribute>
         <attribute name="style">padding: 48px !important;</attribute>
     </xpath>
-    <!-- Column #2 -->
-    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-        <attribute name="class" add="offset-lg-1" separator=" "/>
-    </xpath>
     <!-- Column #2 - Title -->
     <xpath expr="//h2" position="replace" mode="inner">
         A solution for <br/>every need
diff --git a/theme_orchid/views/snippets/s_image_text.xml b/theme_orchid/views/snippets/s_image_text.xml
@@ -4,11 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc2 pb104" remove="pb32" separator=" "/>
-    </xpath>
-    <!-- Text wrapper -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
-        <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
+        <attribute name="class" add="o_cc o_cc2 pb104" remove="pb80" separator=" "/>
     </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
@@ -73,17 +73,13 @@
 <!-- ==== Image-Text ===== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Paptic s_image_text">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt160 pb16 o_cc o_cc3" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="pt160 pb16 o_cc o_cc3" remove="pt80 pb80" separator=" "/>
     </xpath>
 
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web_editor/shape/theme_paptic/s_image_text.svg?c1=o-color-1</attribute>
     </xpath>
 
-    <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
-        <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
-    </xpath>
-
     <xpath expr="//h2" position="replace" mode="inner">
         <font style="background-image: linear-gradient(135deg, var(--o-color-1) 0%, var(--o-color-3) 100%);" class="text-gradient">Help you grow</font>
     </xpath>
diff --git a/theme_real_estate/views/snippets/s_image_text.xml b/theme_real_estate/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc1 pb48 pt48" remove="pb32 pt32" separator=" "/>
+        <attribute name="class" add="o_cc o_cc1 pb48 pt48" remove="pb80 pt80" separator=" "/>
     </xpath>
 
     <!-- Title -->
diff --git a/theme_treehouse/views/snippets/s_image_text.xml b/theme_treehouse/views/snippets/s_image_text.xml
@@ -2,10 +2,6 @@
 <odoo>
 
 <template id="s_image_text" inherit_id="website.s_image_text">
-    <!-- Section -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt80 pb80" remove="pt32 pb32" separator=" "/>
-    </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
         <attribute name="class" add="img-thumbnail" separator=" "/>
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
@@ -49,7 +49,7 @@
 <!-- ======== IMAGE - TEXT ======== -->
 <template id="s_image_text" inherit_id="website.s_image_text" name="Vehicle s_image_text">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb56 pt24 o_cc o_cc1" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="pb56 pt24 o_cc o_cc1" remove="pt80 pb80" separator=" "/>
     </xpath>
     <xpath expr="//img" position="attributes">
         <attribute name="src">/web_editor/image_shape/website.s_image_text_default_image/web_editor/composition/composition_square_2.svg?c2=o-color-1&amp;c5=o-color-5</attribute>
@@ -58,9 +58,6 @@
         <attribute name="data-file-name">s_image_text.svg</attribute>
         <attribute name="data-shape-colors">;o-color-1;;;o-color-5</attribute>
     </xpath>
-    <xpath expr="//div[hasclass('row')]/div[2]" position="attributes">
-        <attribute name="class" add="col-lg-5 offset-lg-1" remove="col-lg-6" separator=" "/>
-    </xpath>
     <xpath expr="//h2" position="before">
         <h4 class="text-o-color-1"><b>A greener lifestyle</b></h4>
     </xpath>
diff --git a/theme_yes/views/snippets/s_image_text.xml b/theme_yes/views/snippets/s_image_text.xml
@@ -2,10 +2,6 @@
 <odoo>
 
 <template id="s_image_text" inherit_id="website.s_image_text">
-    <!-- Image -->
-    <xpath expr="//img" position="attributes">
-        <attribute name="class" add="rounded" separator=" "/>
-    </xpath>
     <!-- Title -->
     <xpath expr="//h2" position="replace" mode="inner">
         Find a venue
diff --git a/theme_zap/views/snippets/s_image_text.xml b/theme_zap/views/snippets/s_image_text.xml
@@ -4,7 +4,7 @@
 <template id="s_image_text" inherit_id="website.s_image_text">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt80 pb80 o_colored_level o_cc o_cc2" remove="pt32 pb32" separator=" "/>
+        <attribute name="class" add="o_colored_level o_cc o_cc2" separator=" "/>
     </xpath>
     <!-- Image -->
     <xpath expr="//img" position="attributes">
