Skip to content

Commit 8de909e

Browse files
bso-odooxlu-odoo
bso-odoo
authored and
xlu-odoo
committed
[FIX] theme_*: remove duplicate and conflicting classes from new pages
Given that the duplicate and conflicting classes resolved by the previous commit did still exist at the time new page templates were introduced in [1], they could not be avoided for new page templates snippets. This commit removes those from the new page templates snippets now that they have been removed from the base snippets. [1]: odoo@80cbee6 task-3562147 X-original-commit: 9984745 Part-of: odoo#744
1 parent 62a87d6 commit 8de909e

File tree

26 files changed

+1353
-164
lines changed

26 files changed

+1353
-164
lines changed

‎theme_anelusia/views/new_page_template.xml‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,9 @@
2727

2828
<!-- Snippet customization About Pages -->
2929

30-
<template id="new_page_template_about_s_text_block_h1" inherit_id="website.new_page_template_about_s_text_block_h1">
31-
<xpath expr="//section" position="attributes">
32-
<attribute name="class" add="pb0" remove="pb40" separator=" "/>
33-
</xpath>
34-
</template>
35-
3630
<template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
3731
<xpath expr="//section" position="attributes">
38-
<attribute name="class" add="pb0 pb0 pt40" remove="pb40 pt40" separator=" "/>
32+
<attribute name="class" add="pb0" remove="pb40" separator=" "/>
3933
</xpath>
4034
</template>
4135

@@ -51,9 +45,21 @@
5145
</xpath>
5246
</template>
5347

48+
<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
49+
<xpath expr="//section" position="attributes">
50+
<attribute name="class" remove="pt40 pb40" separator=" "/>
51+
</xpath>
52+
</template>
53+
54+
<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
55+
<xpath expr="//section" position="attributes">
56+
<attribute name="class" remove="o_cc3" separator=" "/>
57+
</xpath>
58+
</template>
59+
5460
<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
5561
<xpath expr="//section" position="attributes">
56-
<attribute name="class" remove="o_half_screen_height" separator=" "/>
62+
<attribute name="class" remove="o_cc3 o_half_screen_height" separator=" "/>
5763
</xpath>
5864
</template>
5965

@@ -65,15 +71,22 @@
6571

6672
<!-- Snippet customization Landing Pages -->
6773

68-
<template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
74+
<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
6975
<xpath expr="//section" position="attributes">
70-
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
76+
<attribute name="class" remove="pt128 pb128" separator=" "/>
77+
</xpath>
78+
</template>
79+
80+
<template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
81+
<xpath expr="//section" position="attributes">
82+
<!-- Added by both theme and new page template -->
83+
<attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
7184
</xpath>
7285
</template>
7386

7487
<template id="new_page_template_landing_2_s_three_columns" inherit_id="website.new_page_template_landing_2_s_three_columns">
7588
<xpath expr="//section" position="attributes">
76-
<attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
89+
<attribute name="class" add="o_cc2" remove="o_cc1" separator=" "/>
7790
</xpath>
7891
</template>
7992

@@ -85,22 +98,10 @@
8598

8699
<!-- Snippet customization Gallery Pages -->
87100

88-
<template id="new_page_template_gallery_s_cover" inherit_id="website.new_page_template_gallery_s_cover">
89-
<xpath expr="//section" position="attributes">
90-
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
91-
</xpath>
92-
</template>
93-
94101
<!-- Snippet customization Services Pages -->
95102

96103
<!-- Snippet customization Pricing Pages -->
97104

98-
<template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
99-
<xpath expr="//section" position="attributes">
100-
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
101-
</xpath>
102-
</template>
103-
104105
<template id="new_page_template_pricing_s_showcase" inherit_id="website.new_page_template_pricing_s_showcase">
105106
<!-- Remove shape option -->
106107
<xpath expr="//section" position="attributes">

‎theme_artists/views/new_page_template.xml‎

Lines changed: 70 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,24 @@
4242
</xpath>
4343
</template>
4444

45+
<template id="new_page_template_s_comparisons" inherit_id="website.new_page_template_s_comparisons">
46+
<xpath expr="(//div[hasclass('card')])[3]" position="attributes">
47+
<attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
48+
</xpath>
49+
</template>
50+
51+
<template id="new_page_template_s_features_grid" inherit_id="website.new_page_template_s_features_grid">
52+
<xpath expr="(//i)[4]" position="attributes">
53+
<attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
54+
</xpath>
55+
<xpath expr="(//i)[5]" position="attributes">
56+
<attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
57+
</xpath>
58+
<xpath expr="(//i)[6]" position="attributes">
59+
<attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
60+
</xpath>
61+
</template>
62+
4563
<template id="new_page_template_s_numbers" inherit_id="website.new_page_template_s_numbers">
4664
<!-- Shape option -->
4765
<xpath expr="//section" position="attributes">
@@ -76,13 +94,13 @@
7694

7795
<template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_s_cover">
7896
<xpath expr="//section" position="attributes">
79-
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
97+
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height pt40 pb40" separator=" "/>
8098
</xpath>
8199
</template>
82100

83101
<template id="new_page_template_about_s_text_block_h1" inherit_id="website.new_page_template_about_s_text_block_h1">
84102
<xpath expr="//section" position="attributes">
85-
<attribute name="class" add="pb0 o_cc5" remove="pb40" separator=" "/>
103+
<attribute name="class" add="o_cc5" separator=" "/>
86104
</xpath>
87105
</template>
88106

@@ -92,9 +110,27 @@
92110
</xpath>
93111
</template>
94112

113+
<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
114+
<xpath expr="//section" position="attributes">
115+
<attribute name="class" remove="pt48" separator=" "/>
116+
</xpath>
117+
</template>
118+
119+
<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
120+
<xpath expr="//section" position="attributes">
121+
<attribute name="class" remove="o_cc3" separator=" "/>
122+
</xpath>
123+
</template>
124+
125+
<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
126+
<xpath expr="//section" position="attributes">
127+
<attribute name="class" remove="pb56" separator=" "/>
128+
</xpath>
129+
</template>
130+
95131
<template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
96132
<xpath expr="//section" position="attributes">
97-
<attribute name="class" add="pb0 o_cc4" remove="pb40 o_cc5" separator=" "/>
133+
<attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
98134
</xpath>
99135
</template>
100136

@@ -116,9 +152,15 @@
116152
</xpath>
117153
</template>
118154

155+
<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
156+
<xpath expr="//section" position="attributes">
157+
<attribute name="class" remove="o_cc3 pt0" separator=" "/>
158+
</xpath>
159+
</template>
160+
119161
<template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
120162
<xpath expr="//section" position="attributes">
121-
<attribute name="class" add="o_cc5" separator=" "/>
163+
<attribute name="class" add="o_cc5" remove="o_cc3" separator=" "/>
122164
</xpath>
123165
</template>
124166

@@ -130,15 +172,21 @@
130172
</xpath>
131173
</template>
132174

133-
<template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
175+
<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
134176
<xpath expr="//section" position="attributes">
135-
<attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
177+
<attribute name="class" remove="pb56" separator=" "/>
136178
</xpath>
137179
</template>
138180

139-
<template id="new_page_template_landing_2_s_three_columns" inherit_id="website.new_page_template_landing_2_s_three_columns">
181+
<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
140182
<xpath expr="//section" position="attributes">
141-
<attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
183+
<attribute name="class" remove="pt200 pb200" separator=" "/>
184+
</xpath>
185+
</template>
186+
187+
<template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
188+
<xpath expr="//section" position="attributes">
189+
<attribute name="class" add="o_cc4" remove="o_cc2" separator=" "/>
142190
</xpath>
143191
</template>
144192

@@ -178,6 +226,12 @@
178226
</xpath>
179227
</template>
180228

229+
<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
230+
<xpath expr="//section" position="attributes">
231+
<attribute name="class" remove="pt48" separator=" "/>
232+
</xpath>
233+
</template>
234+
181235
<template id="new_page_template_gallery_s_text_block_2nd" inherit_id="website.new_page_template_gallery_s_text_block_2nd">
182236
<xpath expr="//section" position="attributes">
183237
<attribute name="class" add="o_cc5" separator=" "/>
@@ -206,6 +260,7 @@
206260
<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
207261
<!-- Shape option -->
208262
<xpath expr="//section" position="attributes">
263+
<attribute name="class" remove="pb56" separator=" "/>
209264
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04"}</attribute>
210265
</xpath>
211266
<!-- Shape -->
@@ -229,6 +284,12 @@
229284
</xpath>
230285
</template>
231286

287+
<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
288+
<xpath expr="//section" position="attributes">
289+
<attribute name="class" remove="pt48" separator=" "/>
290+
</xpath>
291+
</template>
292+
232293
<template id="new_page_template_pricing_s_text_block_h1" inherit_id="website.new_page_template_pricing_s_text_block_h1">
233294
<xpath expr="//section" position="attributes">
234295
<attribute name="class" add="pb40" remove="pb0" separator=" "/>
@@ -263,6 +324,7 @@
263324
<template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
264325
<!-- Shape option -->
265326
<xpath expr="//section" position="attributes">
327+
<attribute name="class" remove="pb56" separator=" "/>
266328
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/04"}</attribute>
267329
</xpath>
268330
<!-- Shape -->

‎theme_aviato/views/new_page_template.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,24 @@
2828
</xpath>
2929
</template>
3030

31+
<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
32+
<xpath expr="//section" position="attributes">
33+
<attribute name="class" remove="pb56" separator=" "/>
34+
</xpath>
35+
</template>
36+
3137
<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
3238
<xpath expr="//section" position="attributes">
3339
<attribute name="class" remove="o_cc2" separator=" "/>
3440
</xpath>
3541
</template>
3642

43+
<template id="new_page_template_about_mini_s_cover" inherit_id="website.new_page_template_about_mini_s_cover">
44+
<xpath expr="//section" position="attributes">
45+
<attribute name="class" remove="pb40 pt40" separator=" "/>
46+
</xpath>
47+
</template>
48+
3749
<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
3850
<xpath expr="//section" position="attributes">
3951
<attribute name="class" remove="o_cc2" separator=" "/>
@@ -42,6 +54,12 @@
4254

4355
<!-- Snippet customization Landing Pages -->
4456

57+
<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
58+
<xpath expr="//section" position="attributes">
59+
<attribute name="class" remove="pt192 pb192" separator=" "/>
60+
</xpath>
61+
</template>
62+
4563
<template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
4664
<xpath expr="//section" position="attributes">
4765
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
@@ -90,6 +108,12 @@
90108
</xpath>
91109
</template>
92110

111+
<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
112+
<xpath expr="//section" position="attributes">
113+
<attribute name="class" remove="pb56" separator=" "/>
114+
</xpath>
115+
</template>
116+
93117
<!-- Snippet customization Services Pages -->
94118

95119
<!-- Snippet customization Pricing Pages -->
@@ -103,6 +127,12 @@
103127
</xpath>
104128
</template>
105129

130+
<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
131+
<xpath expr="//section" position="attributes">
132+
<attribute name="class" remove="pb56" separator=" "/>
133+
</xpath>
134+
</template>
135+
106136
<!-- Snippet customization Team Pages -->
107137

108138
<template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">

‎theme_beauty/views/new_page_template.xml‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<template id="new_page_template_s_cover" inherit_id="website.new_page_template_s_cover">
4343
<xpath expr="//section" position="attributes">
44-
<attribute name="class" add="o_half_screen_height o_cc5" remove="o_full_screen_height" separator=" "/>
44+
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
4545
</xpath>
4646
</template>
4747

@@ -60,12 +60,6 @@
6060
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
6161
</template>
6262

63-
<template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only" primary="True">
64-
<xpath expr="//section" position="attributes">
65-
<attribute name="class" add="o_cc3" remove="o_cc1" separator=" "/>
66-
</xpath>
67-
</template>
68-
6963
<!-- Snippet customization Basic Pages -->
7064

7165
<template id="new_page_template_basic_2_s_text_block_h1" inherit_id="website.new_page_template_basic_2_s_text_block_h1">
@@ -76,9 +70,9 @@
7670

7771
<!-- Snippet customization About Pages -->
7872

79-
<template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_s_cover">
73+
<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
8074
<xpath expr="//section" position="attributes">
81-
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
75+
<attribute name="class" remove="o_cc3" separator=" "/>
8276
</xpath>
8377
</template>
8478

@@ -88,9 +82,9 @@
8882
</xpath>
8983
</template>
9084

91-
<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
85+
<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
9286
<xpath expr="//section" position="attributes">
93-
<attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
87+
<attribute name="class" remove="o_cc3" separator=" "/>
9488
</xpath>
9589
</template>
9690

@@ -105,12 +99,6 @@
10599
</xpath>
106100
</template>
107101

108-
<template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
109-
<xpath expr="//section" position="attributes">
110-
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
111-
</xpath>
112-
</template>
113-
114102
<template id="new_page_template_landing_3_s_call_to_action" inherit_id="website.new_page_template_landing_3_s_call_to_action">
115103
<xpath expr="//section" position="attributes">
116104
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/05_001","flip":[]}</attribute>
@@ -120,6 +108,13 @@
120108
</xpath>
121109
</template>
122110

111+
<template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
112+
<xpath expr="//section" position="attributes">
113+
<!-- Added on all new page template s_cover by theme and on generic landing 4 -->
114+
<attribute name="class" add="o_half_screen_height" remove="o_half_screen_height" separator=" "/>
115+
</xpath>
116+
</template>
117+
123118
<!-- Snippet customization Gallery Pages -->
124119

125120
<!-- Snippet customization Services Pages -->

0 commit comments

Comments
 (0)