Skip to content

Commit 88b0639

Browse files
dery-odooqsm-odoo
authored andcommitted
[FIX] theme_anelusia, *: update xpath to removed s_nb_column_fixed
*: theme_bewise, theme_cobalt, theme_kiddo, theme_loftspace, theme_monglia, theme_nano, theme_notes, theme_odoo_experts, theme_orchid, theme_paptic, theme_yes, theme_zap Multiple snippet template where changed to ensure that the title is not considered as a column and allowing changing the nb of columns again. This commit adapts all the xpath that were impacted by those changes. task-4310468 closes #1047 Related: odoo/odoo#195409 Signed-off-by: Quentin Smetz (qsm) <[email protected]>
1 parent f121597 commit 88b0639

File tree

20 files changed

+80
-87
lines changed

20 files changed

+80
-87
lines changed

theme_anelusia/views/snippets/s_company_team_basic.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
<template id="s_company_team_basic" inherit_id="website.s_company_team_basic">
55
<!-- Team #01 - Title -->
6-
<xpath expr="//div[hasclass('o_grid_mode')]/div[2]/h4" position="replace" mode="inner">
6+
<xpath expr="//h4" position="replace" mode="inner">
77
Tony Fred
88
</xpath>
99
<!-- Team #01 - Work Description -->
10-
<xpath expr="//div[hasclass('o_grid_mode')]/div[2]/p[last()]" position="replace" mode="inner">
10+
<xpath expr="//p[hasclass('o_small-fs')]" position="replace" mode="inner">
1111
Editor-in-chief
1212
</xpath>
1313
<!-- Team #01 - Img -->
@@ -21,11 +21,11 @@
2121
</xpath>
2222

2323
<!-- Team #02 - Title -->
24-
<xpath expr="//div[hasclass('o_grid_mode')]/div[3]/h4" position="replace" mode="inner">
24+
<xpath expr="(//h4)[2]" position="replace" mode="inner">
2525
Mich Stark
2626
</xpath>
2727
<!-- Team #02 - Work Description -->
28-
<xpath expr="//div[hasclass('o_grid_mode')]/div[3]/p[last()]" position="replace" mode="inner">
28+
<xpath expr="(//p[hasclass('o_small-fs')])[2]" position="replace" mode="inner">
2929
Sports Reporter
3030
</xpath>
3131
<!-- Team #02 - Img -->
@@ -39,11 +39,11 @@
3939
</xpath>
4040

4141
<!-- Team #03 - Title -->
42-
<xpath expr="//div[hasclass('o_grid_mode')]/div[4]/h4" position="replace" mode="inner">
42+
<xpath expr="(//h4)[3]" position="replace" mode="inner">
4343
Aline Turner
4444
</xpath>
4545
<!-- Team #03 - Work Description -->
46-
<xpath expr="//div[hasclass('o_grid_mode')]/div[4]/p[last()]" position="replace" mode="inner">
46+
<xpath expr="(//p[hasclass('o_small-fs')])[3]" position="replace" mode="inner">
4747
Photograph
4848
</xpath>
4949
<!-- Team #03 - Img -->
@@ -57,11 +57,11 @@
5757
</xpath>
5858

5959
<!-- Team #04 - Title -->
60-
<xpath expr="//div[hasclass('o_grid_mode')]/div[5]/h4" position="replace" mode="inner">
60+
<xpath expr="(//h4)[4]" position="replace" mode="inner">
6161
Iris Joe
6262
</xpath>
6363
<!-- Team #04 - Work Description -->
64-
<xpath expr="//div[hasclass('o_grid_mode')]/div[5]/p[last()]" position="replace" mode="inner">
64+
<xpath expr="(//p[hasclass('o_small-fs')])[4]" position="replace" mode="inner">
6565
Political Reporter
6666
</xpath>
6767
<!-- Team #04 - Img -->

theme_anelusia/views/snippets/s_references_social.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
Every style for everybody.
1212
</xpath>
1313
<!-- Partners -->
14-
<xpath expr="//div[hasclass('row')]/div[2]/p" position="replace" mode="inner">
14+
<xpath expr="//div[hasclass('row')]/div/p" position="replace" mode="inner">
1515
Redefining elegance since 2009
1616
</xpath>
17-
<xpath expr="//div[hasclass('row')]/div[3]/p" position="replace" mode="inner">
17+
<xpath expr="//div[hasclass('row')]/div[2]/p" position="replace" mode="inner">
1818
Disrupting fashion since 2013
1919
</xpath>
20-
<xpath expr="//div[hasclass('row')]/div[4]/p" position="replace" mode="inner">
20+
<xpath expr="//div[hasclass('row')]/div[3]/p" position="replace" mode="inner">
2121
Shaping your style since 2015
2222
</xpath>
23-
<xpath expr="//div[hasclass('row')]/div[5]/p" position="replace" mode="inner">
23+
<xpath expr="//div[hasclass('row')]/div[4]/p" position="replace" mode="inner">
2424
Transforming trends since 2018
2525
</xpath>
2626
</template>

theme_bewise/views/customizations.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -282,40 +282,40 @@
282282
<!-- ======== TEAM ======== -->
283283
<template id="s_company_team" inherit_id="website.s_company_team" name="Be Wise s_company_team">
284284
<!-- Profile #1 -->
285-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div//h4" position="replace" mode="inner">
285+
<xpath expr="//div[hasclass('row')]/div//h4" position="replace" mode="inner">
286286
<b>Tony Fred</b>
287287
</xpath>
288-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div//p" position="replace" mode="inner">
288+
<xpath expr="//div[hasclass('row')]/div//p" position="replace" mode="inner">
289289
Faculty Head of IT
290290
</xpath>
291-
<xpath expr="//div[hasclass('col-lg-6')]//p[2]" position="replace" mode="inner">
291+
<xpath expr="//div[hasclass('container')]/div[hasclass('row')]/div//p[2]" position="replace" mode="inner">
292292
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.
293293
</xpath>
294294
<!-- Profile #2 -->
295-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//h4" position="replace" mode="inner">
295+
<xpath expr="//div[hasclass('row')]/div[2]//h4" position="replace" mode="inner">
296296
<b>Mich Stark</b>
297297
</xpath>
298-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//p" position="replace" mode="inner">
298+
<xpath expr="//div[hasclass('row')]/div[2]//p" position="replace" mode="inner">
299299
IT Officer
300300
</xpath>
301-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div[2]//p[2]" position="replace" mode="inner">
301+
<xpath expr="//div[hasclass('row')]/div[2]//p[2]" position="replace" mode="inner">
302302
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.
303303
</xpath>
304304
<!-- Profile #3 -->
305-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//h4" position="replace" mode="inner">
305+
<xpath expr="//div[hasclass('row')]/div[3]//h4" position="replace" mode="inner">
306306
<b>Aline Turner</b>
307307
</xpath>
308-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//p" position="replace" mode="inner">
308+
<xpath expr="//div[hasclass('row')]/div[3]//p" position="replace" mode="inner">
309309
Law professor
310310
</xpath>
311-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div[3]//p[2]" position="replace" mode="inner">
311+
<xpath expr="//div[hasclass('row')]/div[3]//p[2]" position="replace" mode="inner">
312312
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.
313313
</xpath>
314314
<!-- Profile #4 -->
315-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div[4]//h4" position="replace" mode="inner">
315+
<xpath expr="//div[hasclass('row')]/div[4]//h4" position="replace" mode="inner">
316316
<b>Iris Joe</b>
317317
</xpath>
318-
<xpath expr="//div[hasclass('s_nb_column_fixed')]/div[4]//p" position="replace" mode="inner">
318+
<xpath expr="//div[hasclass('row')]/div[4]//p" position="replace" mode="inner">
319319
Team leader professor
320320
</xpath>
321321
</template>

theme_cobalt/views/customizations.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,9 @@
165165
<xpath expr="//section" position="attributes">
166166
<attribute name="class" remove="pt80 pb80" separator=" "/>
167167
</xpath>
168-
<xpath expr="//div[hasclass('col-lg-12')]" position="replace"/>
168+
<xpath expr="//h2" position="replace"/>
169+
<xpath expr="//p" position="replace"/>
170+
<xpath expr="//p" position="replace"/>
169171
</template>
170172

171173
<!-- ==== Three Columns ===== -->

theme_kiddo/views/snippets/s_company_team_shapes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<template id="s_company_team_shapes" inherit_id="website.s_company_team_shapes">
55
<xpath expr="//section" position="attributes">
6-
<attribute name="class" add="pb104" remove="pb48" separator=" "/>
6+
<attribute name="class" add="pb128" remove="pb48" separator=" "/>
77
<attribute name="data-oe-shape-data">{'shape':'web_editor/Connections/10','colors':{'c5':'o-color-1'},'flip':[],'showOnMobile':false,'shapeAnimationSpeed':'0'}</attribute>
88
</xpath>
99
<xpath expr="//div[hasclass('o_container_small')]" position="before">

theme_loftspace/views/snippets/s_features.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<xpath expr="//section" position="attributes">
77
<attribute name="class" add="pt72 pb128" remove="pt64 pb64" separator=" "/>
88
</xpath>
9-
<xpath expr="//div[hasclass('col-lg-12')]/h3" position="replace" mode="inner">
9+
<xpath expr="//div[hasclass('container')]/h3" position="replace" mode="inner">
1010
Customer benefits
1111
</xpath>
12-
<xpath expr="//div[hasclass('col-lg-12')]/p" position="replace" mode="inner">
12+
<xpath expr="//div[hasclass('container')]/p" position="replace" mode="inner">
1313
Enjoy these added advantages with every purchase
1414
</xpath>
1515
<!-- Column #01 -->

theme_loftspace/views/snippets/s_striped.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<attribute name="data-row-count">14</attribute>
1313
</xpath>
1414
<!-- Remove the title -->
15-
<xpath expr="//div[hasclass('col-lg-12')]" position="replace"/>
15+
<xpath expr="//h2" position="replace"/>
16+
<xpath expr="//p" position="replace"/>
1617

1718
<xpath expr="//div[hasclass('row')]/div" position="attributes">
1819
<attribute name="class" add="o_grid_item o_grid_item_image g-col-lg-8 g-height-12" remove="pt24 pb24" separator=" "/>

theme_monglia/views/customizations.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,17 +1039,14 @@
10391039
<xpath expr="//section" position="attributes">
10401040
<attribute name="class" add="pt56 pb56" remove="pb80 pt80" separator=" "/>
10411041
</xpath>
1042-
<!-- Layout -->
1043-
<xpath expr="//div[hasclass('col-lg-12')]" position="attributes">
1044-
<attribute name="class" add="pb0" remove="pb24" separator=" "/>
1045-
</xpath>
10461042
<!-- Title -->
10471043
<xpath expr="//h2" position="replace" mode="inner">
10481044
OUR SPONSORS
10491045
</xpath>
10501046
<!-- Remove Subtitle and Link -->
10511047
<xpath expr="//p" position="replace"/>
10521048
<xpath expr="//p" position="replace"/>
1049+
<xpath expr="//p" position="replace"/>
10531050
</template>
10541051

10551052
<!-- ======== COMPARISONS HORIZONTAL ======== -->

theme_nano/views/snippets/s_company_team_basic.xml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,16 @@
66
<xpath expr="//section" position="attributes">
77
<attribute name="class" add="o_cc5" remove="o_cc1" separator=" "/>
88
</xpath>
9-
<!-- Row - remove grid mode -->
10-
<xpath expr="//div[hasclass('row')]" position="attributes">
11-
<attribute name="class" remove="o_grid_mode" separator=" "/>
12-
<attribute name="data-row-count"/>
13-
</xpath>
149
<xpath expr="//h3" position="replace">
1510
<h2 style="text-align: center;">Our talented crew</h2>
1611
</xpath>
1712
<xpath expr="//h2" position="after">
1813
<p class="lead" style="text-align: center;">Meet the masterminds behind our agency. With them, your project is in good hands for sure.</p>
1914
</xpath>
2015

21-
<!-- Title -->
22-
<xpath expr="//div[hasclass('col-lg-12')]" position="attributes">
23-
<attribute name="class" add="pb40" remove="o_grid_item g-col-lg-12 g-height-2" separator=" "/>
24-
<attribute name="style" remove="grid-area: 1 / 1 / 3 / 13; --grid-item-padding-y: 32px; --grid-item-padding-x: 32px; z-index: 1;" separator=";"/>
25-
</xpath>
26-
2716
<!-- Profile #1 -->
2817
<xpath expr="//div[hasclass('col-lg-3')]" position="attributes">
29-
<attribute name="class" remove="o_grid_item g-col-6 g-col-lg-3 g-height-8" separator=" "/>
30-
<attribute name="style" remove="grid-area: 3 / 1 / 11 / 4; --grid-item-padding-y: 16px; --grid-item-padding-x: 32px; z-index: 2;" separator=";"/>
18+
<attribute name="class" add="pt40" remove="pt16" separator=" "/>
3119
</xpath>
3220
<xpath expr="(//img)[1]" position="attributes">
3321
<attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
@@ -40,8 +28,7 @@
4028
</xpath>
4129
<!-- Profile #2 -->
4230
<xpath expr="//div[hasclass('col-lg-3')][2]" position="attributes">
43-
<attribute name="class" remove="o_grid_item g-col-6 g-col-lg-3 g-height-8" separator=" "/>
44-
<attribute name="style" remove="grid-area: 3 / 4 / 11 / 7; --grid-item-padding-y: 16px; --grid-item-padding-x: 32px; z-index: 3;" separator=";"/>
31+
<attribute name="class" add="pt40" remove="pt16" separator=" "/>
4532
</xpath>
4633
<xpath expr="(//img)[2]" position="attributes">
4734
<attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
@@ -54,8 +41,7 @@
5441
</xpath>
5542
<!-- Profile #3 -->
5643
<xpath expr="//div[hasclass('col-lg-3')][3]" position="attributes">
57-
<attribute name="class" remove="o_grid_item g-col-6 g-col-lg-3 g-height-8" separator=" "/>
58-
<attribute name="style" remove="grid-area: 3 / 7 / 11 / 10; --grid-item-padding-y: 16px; --grid-item-padding-x: 32px; z-index: 4;" separator=";"/>
44+
<attribute name="class" add="pt40" remove="pt16" separator=" "/>
5945
</xpath>
6046
<xpath expr="(//img)[3]" position="attributes">
6147
<attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
@@ -68,8 +54,7 @@
6854
</xpath>
6955
<!-- Profile #4 -->
7056
<xpath expr="//div[hasclass('col-lg-3')][4]" position="attributes">
71-
<attribute name="class" remove="o_grid_item g-col-6 g-col-lg-3 g-height-8" separator=" "/>
72-
<attribute name="style" remove="grid-area: 3 / 10 / 11 / 13; --grid-item-padding-y: 16px; --grid-item-padding-x: 32px; z-index: 5;" separator=";"/>
57+
<attribute name="class" add="pt40" remove="pt16" separator=" "/>
7358
</xpath>
7459
<xpath expr="(//img)[4]" position="attributes">
7560
<attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>

theme_nano/views/snippets/s_references.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
<xpath expr="//section" position="attributes">
77
<attribute name="class" add="o_cc5" remove="o_cc1" separator=" "/>
88
</xpath>
9-
<xpath expr="//div[hasclass('col-lg-12')]" position="replace" mode="inner">
9+
<xpath expr="//h2" position="replace">
1010
<h2 style="text-align: center;">Trusted by industry leaders</h2>
1111
</xpath>
12+
<xpath expr="//p" position="replace"/>
13+
<xpath expr="//p" position="replace"/>
1214
<xpath expr="//div[hasclass('col-lg-2')]" position="attributes">
1315
<attribute name="class" add="offset-lg-1" separator=" "/>
1416
</xpath>

0 commit comments

Comments
 (0)