Skip to content

Commit f1b15e0

Browse files
Brieuc-brdBrieuc-brd
committed
[IMP] theme_artists,* : s_quotes_carousel adaptations
This commit removes the `s_quotes_carousel` customization since this snippets has been redesigned in PR[1]. task-3658347 [1]: odoo/odoo#172723 closes #828 Related: odoo/odoo#172723 Signed-off-by: Benoit Socias (bso) <[email protected]>
1 parent 903b6a1 commit f1b15e0

File tree

10 files changed

+74
-126
lines changed

10 files changed

+74
-126
lines changed

‎theme_artists/views/snippets/s_quotes_carousel.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
</xpath>
99
<!-- Icons -->
1010
<xpath expr="//i" position="attributes">
11-
<attribute name="class" add="bg-o-color-5" remove="bg-o-color-2" separator=" "/>
11+
<attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
1212
</xpath>
1313
<xpath expr="(//i)[2]" position="attributes">
14-
<attribute name="class" add="bg-o-color-5" remove="bg-o-color-2" separator=" "/>
14+
<attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
1515
</xpath>
1616
<xpath expr="(//i)[3]" position="attributes">
17-
<attribute name="class" add="bg-o-color-5" remove="bg-o-color-2" separator=" "/>
17+
<attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
1818
</xpath>
1919
<!-- Carousel items - Remove background images -->
2020
<xpath expr="//div[hasclass('carousel-item')]" position="attributes">

‎theme_aviato/views/snippets/s_quotes_carousel.xml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,34 @@
33

44
<template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
55
<!-- Quote 1 -->
6-
<xpath expr="(//div[hasclass('s_blockquote_content')])[1]/p" position="replace" mode="inner">
6+
<xpath expr="(//p[hasclass('s_blockquote_quote')])[1]" position="replace" mode="inner">
77
It's difficult to describe how awesome the trip was. I feel like my life has changed forever. It would take too long to describe day by day the sights, sounds, architecture, art, food, history, and people that we came across. Ireland was fantastic.
88
</xpath>
9-
<xpath expr="(//span[hasclass('s_blockquote_author')])[1]" position="replace" mode="inner">
10-
<b>Linda and Paulo</b> • From Italy
9+
<xpath expr="(//div[hasclass('s_blockquote_author')])[1]//strong" position="replace" mode="inner">
10+
Linda and Paulo
11+
</xpath>
12+
<xpath expr="(//div[hasclass('s_blockquote_author')])[1]//span//span" position="replace" mode="inner">
13+
From Italy
1114
</xpath>
1215
<!-- Quote 2 -->
13-
<xpath expr="(//div[hasclass('s_blockquote_content')])[2]/p" position="replace" mode="inner">
16+
<xpath expr="(//p[hasclass('s_blockquote_quote')])[2]" position="replace" mode="inner">
1417
As always, Odoo Travel has delivered a truly wonderful travel experience for us. Norway was a great travel destination. The parts of the country we visited were beautiful, people were friendly, everything we ate was delicious, and there were many fun things to see and do.
1518
</xpath>
16-
<xpath expr="(//span[hasclass('s_blockquote_author')])[2]" position="replace" mode="inner">
17-
<b>Jacques and Marie</b> • From France
19+
<xpath expr="(//div[hasclass('s_blockquote_author')])[2]//strong" position="replace" mode="inner">
20+
Jacques and Marie
21+
</xpath>
22+
<xpath expr="(//div[hasclass('s_blockquote_author')])[2]//span//span" position="replace" mode="inner">
23+
From France
1824
</xpath>
1925
<!-- Quote 3 -->
20-
<xpath expr="(//div[hasclass('s_blockquote_content')])[3]/p" position="replace" mode="inner">
26+
<xpath expr="(//p[hasclass('s_blockquote_quote')])[3]" position="replace" mode="inner">
2127
We would like to thank Odoo Travel for organising wonderful tour for us in Delhi, Agra and Rajasthan. Everything was very well organised. Thank you very much for everything!
2228
</xpath>
23-
<xpath expr="(//span[hasclass('s_blockquote_author')])[3]" position="replace" mode="inner">
24-
<b>Rose and Peter</b> • From United Kingdom
29+
<xpath expr="(//div[hasclass('s_blockquote_author')])[3]//strong" position="replace" mode="inner">
30+
Rose and Peter
31+
</xpath>
32+
<xpath expr="(//div[hasclass('s_blockquote_author')])[3]//span//span" position="replace" mode="inner">
33+
From United Kingdom
2534
</xpath>
2635
</template>
2736

‎theme_bewise/views/customizations.xml‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,11 @@
135135
<xpath expr="//blockquote" position="attributes">
136136
<attribute name="class" add="w-75" remove="w-50" separator=" "/>
137137
</xpath>
138-
<xpath expr="//blockquote//i" position="attributes">
139-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
140-
</xpath>
141138
<xpath expr="//blockquote//p" position="replace" mode="inner">
142139
I have learned a lot, and I have realised professional projects thanks to the support of the mentors! The team is always at the top and always looking for solutions to problems, I felt accompanied and supported! It's not easy every day, but it's a great adventure!
143140
</xpath>
144-
<xpath expr="//span[hasclass('s_blockquote_author')]" position="replace" mode="inner">
145-
<b>Iris DOE</b> • Graduated in 2019
141+
<xpath expr="//div[hasclass('s_blockquote_author')]//span//span" position="replace" mode="inner">
142+
Graduated in 2019
146143
</xpath>
147144
<!-- Slide #2 -->
148145
<xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
@@ -152,16 +149,13 @@
152149
</xpath>
153150
<!-- Slide #2 - blockquote -->
154151
<xpath expr="(//blockquote)[2]" position="attributes">
155-
<attribute name="class" add="w-75 mx-auto" remove="w-50 me-auto" separator=" "/>
156-
</xpath>
157-
<xpath expr="(//blockquote)[2]//i" position="attributes">
158-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
152+
<attribute name="class" add="w-75" remove="w-50" separator=" "/>
159153
</xpath>
160154
<xpath expr="(//blockquote)[2]//p" position="replace" mode="inner">
161155
Thanks to its innovative system, the school offers an academic training during which we are followed by a "mentor", a sort of "tutor"!
162156
</xpath>
163-
<xpath expr="(//span[hasclass('s_blockquote_author')])[2]" position="replace" mode="inner">
164-
<b>Jane DOE</b> • Graduated in 2017
157+
<xpath expr="(//div[hasclass('s_blockquote_author')])[2]//span//span" position="replace" mode="inner">
158+
Graduated in 2017
165159
</xpath>
166160
<!-- Slide #3 -->
167161
<xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
@@ -171,16 +165,13 @@
171165
</xpath>
172166
<!-- Slide #3 - blockquote -->
173167
<xpath expr="(//blockquote)[3]" position="attributes">
174-
<attribute name="class" add="w-75 mx-auto" remove="w-50 ms-auto" separator=" "/>
175-
</xpath>
176-
<xpath expr="(//blockquote)[3]//i" position="attributes">
177-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
168+
<attribute name="class" add="w-75" remove="w-50" separator=" "/>
178169
</xpath>
179170
<xpath expr="(//blockquote)[3]//p" position="replace" mode="inner">
180171
Great support and quality courses! A mentor helps you move forward and can be contacted through flexible schedules. Everything you need to start your career on the web.
181172
</xpath>
182-
<xpath expr="(//span[hasclass('s_blockquote_author')])[3]" position="replace" mode="inner">
183-
<b>John DOE</b> • Graduated in 2016
173+
<xpath expr="(//div[hasclass('s_blockquote_author')])[3]//span//span" position="replace" mode="inner">
174+
Graduated in 2016
184175
</xpath>
185176
</template>
186177

‎theme_bistro/views/snippets/s_quotes_carousel.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
<attribute name="class" add="pt120 pb120" remove="pt80 pb80" separator=" "/>
2121
<attribute name="style">background-image: none;</attribute>
2222
</xpath>
23-
<xpath expr="(//blockquote)[2]" position="attributes">
24-
<attribute name="class" add="mx-auto" remove="me-auto" separator=" "/>
25-
</xpath>
2623
<xpath expr="(//p)[2]" position="replace" mode="inner">
2724
This place is perfect for groups or a casual date night.
2825
</xpath>
@@ -31,9 +28,6 @@
3128
<attribute name="class" add="pt120 pb120" remove="pt80 pb80" separator=" "/>
3229
<attribute name="style">background-image: none;</attribute>
3330
</xpath>
34-
<xpath expr="(//blockquote)[3]" position="attributes">
35-
<attribute name="class" add="mx-auto" remove="ms-auto" separator=" "/>
36-
</xpath>
3731
<xpath expr="(//p)[3]" position="replace" mode="inner">
3832
A truly exquisite dining experience. I highly recommend the Mustard Sauce, out of this world.
3933
</xpath>

‎theme_buzzy/views/snippets/s_quotes_carousel.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@
1111
<xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
1212
<div class="o_we_shape o_web_editor_Rainy_10"/>
1313
</xpath>
14-
<!-- Icons quote -->
15-
<xpath expr="//i" position="attributes">
16-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
17-
</xpath>
18-
<xpath expr="(//i)[2]" position="attributes">
19-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
20-
</xpath>
21-
<xpath expr="(//i)[3]" position="attributes">
22-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
23-
</xpath>
2414
<!-- Carousel items - Remove background image -->
2515
<xpath expr="//div[hasclass('carousel-item')]" position="attributes">
2616
<attribute name="style"/>
@@ -31,6 +21,16 @@
3121
<xpath expr="(//div[hasclass('carousel-item')])[3]" position="attributes">
3222
<attribute name="style"/>
3323
</xpath>
24+
<!-- Authors -->
25+
<xpath expr="(//div[hasclass('s_blockquote_author')])[1]//span//span" position="attributes">
26+
<attribute name="class" add="text-o-color-2" remove="text-muted"/>
27+
</xpath>
28+
<xpath expr="(//div[hasclass('s_blockquote_author')])[2]//span//span" position="attributes">
29+
<attribute name="class" add="text-o-color-2" remove="text-muted"/>
30+
</xpath>
31+
<xpath expr="(//div[hasclass('s_blockquote_author')])[3]//span//span" position="attributes">
32+
<attribute name="class" add="text-o-color-2" remove="text-muted"/>
33+
</xpath>
3434
</template>
3535

3636
</odoo>

‎theme_kiddo/views/snippets/s_quotes_carousel.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
<xpath expr="(//div[hasclass('carousel-item')])[2]" position="attributes">
1515
<attribute name="class" add="pt128 pb128" remove="pt80 pb80" separator=" "/>
1616
</xpath>
17-
<xpath expr="(//blockquote)[2]" position="attributes">
18-
<attribute name="class" add="mx-auto" remove="me-auto" separator=" "/>
19-
</xpath>
2017
<xpath expr="(//i)[2]" position="attributes">
2118
<attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
2219
</xpath>
@@ -25,9 +22,6 @@
2522
<xpath expr="(//div[hasclass('carousel-item')])[3]" position="attributes">
2623
<attribute name="class" add="pt128 pb128" remove="pt80 pb80" separator=" "/>
2724
</xpath>
28-
<xpath expr="(//blockquote)[3]" position="attributes">
29-
<attribute name="class" add="mx-auto" remove="ms-auto" separator=" "/>
30-
</xpath>
3125
<xpath expr="(//i)[3]" position="attributes">
3226
<attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
3327
</xpath>

‎theme_odoo_experts/views/snippets/s_quotes_carousel.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,14 @@
66
<xpath expr="//div[hasclass('carousel-item')]//div[hasclass('container')]" position="before">
77
<div class="o_we_bg_filter bg-black-50"/>
88
</xpath>
9-
<!-- Carousel item #1 - icon -->
10-
<xpath expr="//i" position="attributes">
11-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
12-
</xpath>
139
<!-- Carousel item #2 - filter -->
1410
<xpath expr="//div[hasclass('carousel-item')][2]//div[hasclass('container')]" position="before">
1511
<div class="o_we_bg_filter bg-black-50"/>
1612
</xpath>
17-
<!-- Carousel item #2 - icon -->
18-
<xpath expr="(//i)[2]" position="attributes">
19-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
20-
</xpath>
21-
<!-- Carousel item #2 - blockquote -->
22-
<xpath expr="//div[hasclass('carousel-item')][2]//blockquote" position="attributes">
23-
<attribute name="class" add="mx-auto" remove="me-auto" separator=" "/>
24-
</xpath>
2513
<!-- Carousel item #3 - filter -->
2614
<xpath expr="//div[hasclass('carousel-item')][3]//div[hasclass('container')]" position="before">
2715
<div class="o_we_bg_filter bg-black-50"/>
2816
</xpath>
29-
<!-- Carousel item #3 - icon -->
30-
<xpath expr="(//i)[3]" position="attributes">
31-
<attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
32-
</xpath>
33-
<!-- Carousel item #3 - blockquote -->
34-
<xpath expr="//div[hasclass('carousel-item')][3]//blockquote" position="attributes">
35-
<attribute name="class" add="mx-auto" remove="ms-auto" separator=" "/>
36-
</xpath>
3717
</template>
3818

3919
</odoo>

‎theme_orchid/views/snippets/s_quotes_carousel.xml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,42 @@
77
<attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
88
</xpath>
99
<!-- Quote 1 -->
10-
<xpath expr="(//div[hasclass('s_blockquote_content')])[1]/p" position="replace" mode="inner">
10+
<xpath expr="(//p[hasclass('s_blockquote_quote')])[1]" position="replace" mode="inner">
1111
A wide range of high quality products and a warm welcome! I recommend this shop 200%!
1212
</xpath>
1313
<xpath expr="//div[hasclass('carousel-item')]" position="attributes">
1414
<attribute name="class" add="pt200 pb200" remove="pt80 pb80" separator=" "/>
1515
<!-- Remove background image -->
1616
<attribute name="style"/>
1717
</xpath>
18+
<xpath expr="(//i[hasclass('s_blockquote_icon')])[1]" position="attributes">
19+
<attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
20+
</xpath>
1821

1922
<!-- Quote 2 -->
20-
<xpath expr="(//div[hasclass('s_blockquote_content')])[2]/p" position="replace" mode="inner">
23+
<xpath expr="(//p[hasclass('s_blockquote_quote')])[2]" position="replace" mode="inner">
2124
Very nice, colorful shop with many choices in the heart of a very pretty town.
2225
</xpath>
2326
<xpath expr="//div[hasclass('carousel-item')][2]" position="attributes">
2427
<attribute name="class" add="pt200 pb200" remove="pt80 pb80" separator=" "/>
2528
<!-- Remove background image -->
2629
<attribute name="style"/>
2730
</xpath>
28-
<!-- Center the blockquote -->
29-
<xpath expr="(//blockquote)[2]" position="attributes">
30-
<attribute name="class" add="mx-auto" remove="me-auto" separator=" "/>
31+
<xpath expr="(//i[hasclass('s_blockquote_icon')])[2]" position="attributes">
32+
<attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
3133
</xpath>
3234

3335
<!-- Quote 3 -->
34-
<xpath expr="(//div[hasclass('s_blockquote_content')])[3]/p" position="replace" mode="inner">
36+
<xpath expr="(//p[hasclass('s_blockquote_quote')])[3]" position="replace" mode="inner">
3537
A small shop with a very large selection of roses. Nice prices and above all a very professional and friendly welcome.
3638
</xpath>
3739
<xpath expr="//div[hasclass('carousel-item')][3]" position="attributes">
3840
<attribute name="class" add="pt200 pb200" remove="pt80 pb80" separator=" "/>
3941
<!-- Remove background image -->
4042
<attribute name="style"/>
4143
</xpath>
42-
<!-- Center the blockquote -->
43-
<xpath expr="(//blockquote)[3]" position="attributes">
44-
<attribute name="class" add="mx-auto" remove="ms-auto" separator=" "/>
44+
<xpath expr="(//i[hasclass('s_blockquote_icon')])[3]" position="attributes">
45+
<attribute name="class" add="bg-o-color-5" remove="bg-o-color-1" separator=" "/>
4546
</xpath>
4647
</template>
4748

‎theme_real_estate/views/snippets/s_quotes_carousel.xml‎

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

44
<template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel">
55
<!-- Quote 1 -->
6-
<xpath expr="(//div[hasclass('s_blockquote_content')])[1]/p" position="replace" mode="inner">
6+
<xpath expr="(//p[hasclass('s_blockquote_quote')])[1]" position="replace" mode="inner">
77
Amazing team! smiling, always nice to talk with, they always have the best advices for you, adapted to your needs!
88
</xpath>
9-
<xpath expr="(//span[hasclass('s_blockquote_author')])[1]" position="replace" mode="inner">
10-
<b>Jane Doe</b> • Customer, bought a house
9+
<xpath expr="(//div[hasclass('s_blockquote_author')])[1]//span//span" position="replace" mode="inner">
10+
Customer, bought a house
1111
</xpath>
1212
<!-- Quote 2 -->
13-
<xpath expr="(//div[hasclass('s_blockquote_content')])[2]/p" position="replace" mode="inner">
13+
<xpath expr="(//p[hasclass('s_blockquote_quote')])[2]" position="replace" mode="inner">
1414
From start to finish, they were extremely professional, friendly, helpful and easy to do business with. Very happy with the experience and the company.
1515
</xpath>
16-
<xpath expr="(//span[hasclass('s_blockquote_author')])[2]" position="replace" mode="inner">
17-
<b>John Doe</b> • Customer, bought an appartement
16+
<xpath expr="(//div[hasclass('s_blockquote_author')])[2]//span//span" position="replace" mode="inner">
17+
Customer, bought an appartement
1818
</xpath>
1919
<!-- Quote 3 -->
20-
<xpath expr="(//div[hasclass('s_blockquote_content')])[3]/p" position="replace" mode="inner">
20+
<xpath expr="(//p[hasclass('s_blockquote_quote')])[3]" position="replace" mode="inner">
2121
Positive energy, great team spirit, hard workers and awesome people! I warmly recommend them!
2222
</xpath>
23-
<xpath expr="(//span[hasclass('s_blockquote_author')])[3]" position="replace" mode="inner">
24-
<b>Iris Doe</b> • Customer, sold an appartement
23+
<xpath expr="(//div[hasclass('s_blockquote_author')])[3]//span//span" position="replace" mode="inner">
24+
Customer, sold an appartement
2525
</xpath>
2626
</template>
2727

0 commit comments

Comments
 (0)