Skip to content

Commit 12edb75

Browse files
jcha-odoojcha-odoo
authored
Merge branch 'odoo:18.0' into 18.0-sale_discount_recompute-jcha
2 parents b165cee + dd31619 commit 12edb75

20 files changed

+253
-70
lines changed

‎website_airproof/__manifest__.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@
99
'data': [
1010
# Options
1111
'data/presets.xml',
12+
'data/website.xml',
1213
# Menu
1314
'data/menu.xml',
15+
# Gradients
16+
'data/gradients.xml',
1417
# Shapes
1518
'data/shapes.xml',
1619
# Pages
1720
'data/pages/home.xml',
1821
'data/pages/contact.xml',
1922
# Frontend
23+
'views/new_page_template_templates.xml',
2024
'views/website_templates.xml',
2125
'views/website_sale_templates.xml',
2226
'views/website_sale_wishlist_templates.xml',
@@ -35,6 +39,7 @@
3539
],
3640
'web.assets_frontend': [
3741
# SCSS
42+
'website_airproof/static/src/scss/font.scss',
3843
'website_airproof/static/src/scss/components/mouse_follower.scss',
3944
'website_airproof/static/src/scss/layout/header.scss',
4045
'website_airproof/static/src/scss/pages/product_page.scss',
@@ -46,4 +51,9 @@
4651
'website_airproof/static/src/js/mouse_follower.js',
4752
],
4853
},
54+
'new_page_templates': {
55+
'airproof': {
56+
'services': ['s_parallax', 's_airproof_key_benefits_h2', 's_call_to_action', 's_airproof_carousel']
57+
}
58+
},
4959
}

‎website_airproof/airproof-shop-page.jpg

-512 Bytes
Loading

‎website_airproof/data/gradients.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<odoo>
3+
<record id="colorpicker" model="ir.ui.view">
4+
<field name="key">website_airproof.colorpicker</field>
5+
<field name="name">Custom Gradients</field>
6+
<field name="type">qweb</field>
7+
<field name="inherit_id" ref="web_editor.colorpicker"/>
8+
<field name="arch" type="xml">
9+
<xpath expr="//div[@data-name='predefined_gradients']/t[@t-set='gradients']" position="after">
10+
<t t-set="gradients" t-value="gradients + ['linear-gradient(0deg, rgb(41, 128, 187) 0%, rgb(11, 142, 230) 100%)']"/>
11+
</xpath>
12+
</field>
13+
</record>
14+
</odoo>

‎website_airproof/data/images.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<odoo>
33
<!-- Branding -->
4-
<!-- Set as the logo of the website -->
5-
<record id="website.default_website" model="website">
6-
<field name="logo" type="base64" file="website_airproof/static/src/img/content/branding/airproof-logo.svg"/>
7-
</record>
84
<!-- Record the image of the logo -->
95
<record id="logo" model="ir.attachment">
106
<field name="name">Logo Airproof</field>

‎website_airproof/data/pages/home.xml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<field name="key">website_airproof.page_home</field>
1212
<field name="url">/</field>
1313
<field name="type">qweb</field>
14+
<field name="header_overlay" eval="True"/>
1415
<field name="arch" type="xml">
1516
<t t-name="website_airproof.page_home">
1617
<t t-call="website.layout">
@@ -27,14 +28,14 @@
2728
</ol>
2829
<div class="carousel-inner">
2930
<!-- Slide 01 -->
30-
<div class="carousel-item pt24 pb64 o_colored_level active" data-name="Slide">
31+
<div class="carousel-item pt64 pb64 o_colored_level active" data-name="Slide">
3132
<div class="oe_unremovable container">
3233
<div class="row content">
3334
<div class="carousel-content col-lg-6 pt88 position-relative o_colored_level">
3435
<!-- Image animation -->
3536
<img src="/web/image/website_airproof.img_sticker" class="img img-fluid position-absolute x_sticker o_animate o_anim_rotate_in o_visible" style="animation-delay: 0.8s; --wanim-intensity: 30;"/>
3637
<!-- Text animation -->
37-
<h1 class="x_carousel_title position-relative z-index-1">
38+
<h1 class="x_carousel_title position-relative display-1 z-index-1">
3839
<span class="o_animated_text o_animate o_anim_fade_in o_anim_from_bottom o_visible">One step</span><br/>
3940
<span class="o_animated_text o_animate o_anim_fade_in o_anim_from_bottom o_visible" style="animation-delay: 0.2s;">beyond</span><br/>
4041
<span class="o_animated_text o_animate o_anim_fade_in o_anim_from_bottom o_visible" style="animation-delay: 0.4s;">the horizon</span>
@@ -49,11 +50,11 @@
4950
<!-- Image animation -->
5051
<img src="/web/image/website_airproof.img_drone" class="img img-fluid o_animate o_anim_zoom_out o_visible" alt="Drone"/>
5152
<div class="x_bubble row justify-content-center justify-content-lg-end position-static position-lg-absolute">
52-
<div class="col-5 col-lg-5 offset-lg-7 z-index-1 x_bubble1 bg-white mb-3 pt24 pb24 px-4">
53+
<div class="col-5 col-lg-5 offset-lg-7 z-index-1 x_bubble_item x_bubble1 o_cc o_cc1 mb-3 pt24 pb24 px-4">
5354
<p class="fw-bold pb8 m-0">Best drone of the year</p>
5455
<p class="m-0 small">GQ France</p>
5556
</div>
56-
<div class="col-5 col-lg-5 offset-lg-7 z-index-1 x_bubble2 bg-white mb-3 pt24 pb24 px-4">
57+
<div class="col-5 col-lg-5 offset-lg-7 z-index-1 x_bubble_item x_bubble2 o_cc o_cc1 mb-3 pt24 pb24 px-4">
5758
<div class="s_rating_icons pb8">
5859
<span class="s_rating_active_icons">
5960
<i class="fa fa-star"/>
@@ -73,7 +74,7 @@
7374
</div>
7475
</div>
7576
<!-- Slide 02 -->
76-
<div class="carousel-item o_colored_level pt24 pb64" data-name="Slide">
77+
<div class="carousel-item o_colored_level pt64 pb64" data-name="Slide">
7778
<div class="oe_unremovable container">
7879
<div class="row content">
7980
<div class="carousel-content col-lg-6 pt88 position-relative">
@@ -88,11 +89,11 @@
8889
<div class="carousel-content col-lg-6">
8990
<img src="/web/image/website_airproof.img_drone" class="img img-fluid" alt="Drone"/>
9091
<div class="x_bubble row justify-content-center justify-content-lg-end position-static position-lg-absolute">
91-
<div class="col-5 col-lg-5 offset-lg-7 z-index-1 x_bubble1 bg-white mb-3 pt24 pb24 px-4">
92+
<div class="col-5 col-lg-5 offset-lg-7 z-index-1 x_bubble_item x_bubble1 o_cc o_cc1 mb-3 pt24 pb24 px-4">
9293
<p class="fw-bold pb8 m-0">Best drone of the year</p>
9394
<p class="m-0 small">GQ France</p>
9495
</div>
95-
<div class="col-5 col-lg-5 offset-lg-7 z-index-1 x_bubble2 bg-white mb-3 pt24 pb24 px-4">
96+
<div class="col-5 col-lg-5 offset-lg-7 z-index-1 x_bubble_item x_bubble2 o_cc o_cc1 mb-3 pt24 pb24 px-4">
9697
<div class="s_rating_icons pb8">
9798
<span class="s_rating_active_icons">
9899
<i class="fa fa-star"/>
@@ -174,25 +175,23 @@
174175
</div>
175176
</section>
176177
<!-- Latest products section -->
177-
<section class="s_parallax o_colored_level o_cc o_cc5 s_parallax_no_overflow_hidden pt40 pb32" data-scroll-background-ratio="0" data-snippet="s_parallax" data-name="Parallax" style="background-image: linear-gradient(0deg, rgb(41, 128, 187) 0%, rgb(11, 142, 230) 100%) !important;">
178-
<div class="oe_structure oe_empty" data-editor-message-default="true" data-editor-message="DRAG BUILDING BLOCKS HERE">
179-
<!-- Products title -->
180-
<section class="s_title pb40 o_colored_level" data-vcss="001" data-snippet="s_title" data-name="Title">
181-
<div class="s_allow_columns container">
182-
<h2>Our latest products</h2>
183-
</div>
184-
</section>
185-
<!-- Products dynamic snippet : custom template & Background gradient -->
186-
<section data-snippet="s_dynamic_snippet_products" class="s_product_product_airproof s_dynamic_snippet_products s_dynamic o_colored_level o_dynamic_empty" data-name="Products" data-filter-id="3" data-template-key="website_airproof.dynamic_filter_template_product_product_airproof" data-product-category-id="all" data-number-of-records="16" data-carousel-interval="5000">
187-
<div class="container o_not_editable">
178+
<section data-snippet="s_dynamic_snippet_products" class="s_dynamic_snippet_products s_dynamic s_dynamic_empty pt32 pb32 o_colored_level s_product_product_airproof o_dynamic_snippet_empty o_cc o_cc5" data-custom-template-data="{}" data-name="Produits" data-product-category-id="all" data-show-variants="" data-number-of-records="16" data-filter-id="3" data-carousel-interval="5000" data-template-key="website_airproof.dynamic_filter_template_product_product_airproof" style="background-image: linear-gradient(0deg, rgb(41, 128, 187) 0%, rgb(11, 142, 230) 100%) !important;">
179+
<div class="container">
180+
<div class="row s_nb_column_fixed">
181+
<section class="s_dynamic_snippet_title oe_unremovable oe_unmovable d-flex flex-column flex-md-row mb-5 mb-lg-1 pb-5 pb-md-4 o_colored_level justify-content-between">
182+
<div>
183+
<h2>Our latest products</h2>
184+
</div>
185+
</section>
186+
<section class="s_dynamic_snippet_content oe_unremovable oe_unmovable o_not_editable col o_colored_level">
188187
<div class="css_non_editable_mode_hidden">
189-
<div class="missing_option_warning alert alert-info rounded-0 fade show d-none d-print-none">
190-
Your Dynamic Snippet will be displayed here... This message is displayed because you did not provided both a filter and a template to use.<br/>
188+
<div class="missing_option_warning alert alert-info fade show d-none d-print-none rounded-0 o_default_snippet_text">
189+
Your Dynamic Snippet will be displayed here... This message is displayed because you did not provide both a filter and a template to use.<br/>
191190
</div>
192191
</div>
193192
<div class="dynamic_snippet_template"/>
194-
</div>
195-
</section>
193+
</section>
194+
</div>
196195
</div>
197196
</section>
198197
<!-- Text-image block & Background shape -->

‎website_airproof/data/presets.xml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,14 @@
5757
<record id="website_sale.products_categories_top" model="ir.ui.view">
5858
<field name="active" eval="False"/>
5959
</record>
60-
<!-- Collapse products categories -->
60+
<!-- Enable Collapse products categories -->
6161
<record id="website_sale.option_collapse_products_categories" model="ir.ui.view">
6262
<field name="active" eval="True"/>
6363
</record>
64+
<!-- Disable Collapse categories recursive -->
65+
<record id="website_sale.option_collapse_products_categories" model="ir.ui.view">
66+
<field name="active" eval="False"/>
67+
</record>
6468
<!-- Enable Product Attributes filtring -->
6569
<record id="website_sale.products_attributes" model="ir.ui.view">
6670
<field name="active" eval="True"/>
@@ -79,7 +83,7 @@
7983
<record id="website_sale_wishlist.product_add_to_wishlist" model="ir.ui.view">
8084
<field name="active" eval="True"/>
8185
</record>
82-
<!-- Disable quantity -->
86+
<!-- Disable Quantity -->
8387
<record id="website_sale.product_quantity" model="ir.ui.view">
8488
<field name="active" eval="False"/>
8589
</record>
@@ -91,4 +95,8 @@
9195
<record id="website_sale.product_share_buttons" model="ir.ui.view">
9296
<field name="active" eval="False"/>
9397
</record>
94-
</odoo>
98+
<!-- Enable More information -->
99+
<record id="website_sale.accordion_more_information" model="ir.ui.view">
100+
<field name="active" eval="True"/>
101+
</record>
102+
</odoo>

‎website_airproof/data/shapes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
<field name="url">/web_editor/shape/illustration/airproof/waves.svg</field>
88
<field name="public" eval="True"/>
99
</record>
10-
</odoo>
10+
</odoo>

‎website_airproof/data/website.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<odoo noupdate="1">
3+
<record id="website.default_website" model="website">
4+
<field name="name">Airproof</field>
5+
<field name="logo" type="base64" file="website_airproof/static/src/img/content/branding/airproof-logo.svg"/>
6+
<field name="favicon" type="base64" file="website_airproof/static/description/airproof-favicon.png" />
7+
<field name="shop_ppr">3</field>
8+
</record>
9+
</odoo>

‎website_airproof/static/description/airproof-favicon.png

28.8 KB
Loading

‎website_airproof/static/fonts/lato.woff

36.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)