NextERP/design-themes
2
0
Fork 0
mirror of https://github.com/odoo/design-themes.git synced 2025-10-07 01:18:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] theme_*: restore base snippet shapes that do not connect blocks

Browse Source 
In [1] all shapes were moved from the base snippet to the specific
configurator snippet. This was a bit overkill.

This commit reverts this partially so that only shapes that connect
with each other are specific to the configurator, but "intra-block"
shapes are restored onto the base snippet.
The "New page from template" snippets are adapted accordingly in order
to produce the same output as before this commit.

Restored shapes are: (label (image))
- Origins: 12 (18)
- Blob: 11 (11)
- Airy: 03 (03_001), 04 (04_001), 07 (07), 10 (10), 11 (11), 14 (14)
- Zigs: 01 (01_001), 02 (02_001)
- Wavy: 04 (10), 15 (11)
- Blocks: 02 (01_001)
- Rainy: 03 (06), 05 (10), 09 (08_001), 10 (09_001)
- Floats: all

[1]: https://github.com/odoo/design-themes/commit/d206c119720d557c11320ebb3d7339890b8f9efa

task-3555325

closes odoo/design-themes#726

Related: odoo/odoo#138748
Signed-off-by: Romain Derie (rde) <rde@odoo.com>
This commit is contained in:
Benoit Socias
2023-10-17 14:52:06 +02:00
parent 1aa6700c98
commit 796da67b29
74 changed files with 689 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme_bewise/views/customizations.xml
+27 -49
View File
@@ -6,8 +6,13 @@
<xpath expr="//section" position="attributes">
<attribute name="class" add="pt200 pb200 o_cc o_cc5 oe_img_bg o_bg_img_center" remove="bg-black-50 s_parallax_is_fixed parallax pt96 pb96" separator=" "/>
<attribute name="style">background-image: url('/web/image/website.s_cover_default_image'); background-position: 50% 50%;</attribute>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
<attribute name="data-scroll-background-ratio">0</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_08_001"/>
</xpath>
<!-- Remove the background image for parallax -->
<xpath expr="//span[hasclass('s_parallax_bg')]" position="replace"/>
<!-- Button -->
@@ -27,16 +32,6 @@
</xpath>
</template>
<template id="configurator_s_cover" inherit_id="website.configurator_s_cover" name="Be Wise s_cover">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_08_001"/>
</xpath>
</template>
<!-- ======== TEXT-IMAGE ======== -->
<template id="s_text_image" inherit_id="website.s_text_image" name="Be Wise s_text_image">
<xpath expr="//h2" position="replace" mode="inner">
@@ -93,6 +88,10 @@
<template id="s_numbers" inherit_id="website.s_numbers" name="Be Wise s_numbers">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc3" remove="o_cc2" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":["x"]}</attribute>
</xpath>
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_11" style="background-image: url('/web_editor/shape/web_editor/Blobs/11.svg?c1=o-color-1&amp;flip=x'); background-position: 50% 50%;"/>
</xpath>
<xpath expr="//h6" position="replace" mode="inner">
Faculties
@@ -111,15 +110,6 @@
</xpath>
</template>
<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers" name="Be Wise s_numbers">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":["x"]}</attribute>
</xpath>
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_11" style="background-image: url('/web_editor/shape/web_editor/Blobs/11.svg?c1=o-color-1&amp;flip=x'); background-position: 50% 50%;"/>
</xpath>
</template>
<!-- ======== QUOTES ======== -->
<template id="s_quotes_carousel" inherit_id="website.s_quotes_carousel" name="Be Wise s_quotes_carousel">
<!-- Section : Add a main background to the carousel -->
@@ -207,6 +197,14 @@
<!-- ======== CALL TO ACTION ======== -->
<template id="s_call_to_action" inherit_id="website.s_call_to_action" name="Be Wise s_call_to_action">
<!-- Shape options -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_11"/>
</xpath>
<!-- Title -->
<xpath expr="//h3" position="replace">
<h4><b>3,000 students</b> graduate each year and find a job within 2 months</h4>
@@ -221,16 +219,6 @@
</xpath>
</template>
<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action" name="Be Wise s_call_to_action">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_11"/>
</xpath>
</template>
<!-- ======== TEAM ======== -->
<template id="s_company_team" inherit_id="website.s_company_team" name="Be Wise s_company_team">
<!-- Profile #1 -->
@@ -366,6 +354,14 @@
<!-- ======== MEDIA LIST ======== -->
<template id="s_media_list" inherit_id="website.s_media_list" name="Be Wise s_media_list">
<!-- Shape options -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/04_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_04_001"/>
</xpath>
<!-- Item #1 -->
<xpath expr="//div[hasclass('s_media_list_item')]" position="attributes">
<attribute name="class" add="col-lg-10" remove="col-lg-12" separator=" "/>
@@ -410,16 +406,6 @@
</xpath>
</template>
<template id="configurator_s_media_list" inherit_id="website.configurator_s_media_list" name="Be Wise s_media_list">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/04_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Airy_04_001"/>
</xpath>
</template>
<!-- ======== COMPARISONS ======== -->
<template id="s_comparisons" inherit_id="website.s_comparisons" name="Be Wise s_comparisons">
<xpath expr="//div[hasclass('card')]//li[hasclass('list-group-item')]" position="replace" mode="inner">
@@ -454,19 +440,11 @@
<template id="s_product_catalog" inherit_id="website.s_product_catalog" name="Be Wise s_product_catalog">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc o_cc5 pt120 pb120" remove="pt48 pb32" separator=" "/>
</xpath>
<!-- Filter -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_bg_filter bg-black-75"/>
</xpath>
</template>
<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog" name="Be Wise s_product_catalog">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/06","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<!-- Filter & shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_bg_filter bg-black-75"/>
<div class="o_we_shape o_web_editor_Floats_06"/>
</xpath>
</template>
theme_bewise/views/new_page_template.xml
+20 -72
View File
@@ -3,34 +3,31 @@
<!-- General customizations -->
<template id="new_page_template_s_call_to_action" inherit_id="website.new_page_template_s_call_to_action">
<template id="new_page_template_s_call_to_action_digital" inherit_id="website.new_page_template_s_call_to_action_digital">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_11"/>
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<template id="new_page_template_s_call_to_action_about" inherit_id="website.new_page_template_s_call_to_action_about">
<template id="new_page_template_s_media_list" inherit_id="website.new_page_template_s_media_list">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_11"/>
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<template id="new_page_template_s_call_to_action_menu" inherit_id="website.new_page_template_s_call_to_action_menu">
<template id="new_page_template_s_product_catalog" inherit_id="website.new_page_template_s_product_catalog">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_11"/>
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<!-- Snippet customization Basic Pages -->
@@ -51,44 +48,20 @@
<template id="new_page_template_about_s_cover" inherit_id="website.new_page_template_about_s_cover">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_08_001"/>
</xpath>
</template>
<template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
<template id="new_page_template_about_personal_s_numbers" inherit_id="website.new_page_template_about_personal_s_numbers">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":["x"]}</attribute>
</xpath>
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_11" style="background-image: url('/web_editor/shape/web_editor/Blobs/11.svg?c1=o-color-1&amp;flip=x'); background-position: 50% 50%;"/>
</xpath>
</template>
<template id="new_page_template_about_map_s_numbers" inherit_id="website.new_page_template_about_map_s_numbers">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Blobs/11","flip":["x"]}</attribute>
</xpath>
<xpath expr="//section/div" position="before">
<div class="o_we_shape o_web_editor_Blobs_11" style="background-image: url('/web_editor/shape/web_editor/Blobs/11.svg?c1=o-color-1&amp;flip=x'); background-position: 50% 50%;"/>
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<!-- Snippet customization Landing Pages -->
<template id="new_page_template_landing_0_s_cover" inherit_id="website.new_page_template_landing_0_s_cover">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_08_001"/>
</xpath>
</template>
<template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
@@ -103,21 +76,6 @@
<template id="new_page_template_landing_2_s_cover" inherit_id="website.new_page_template_landing_2_s_cover">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_08_001"/>
</xpath>
</template>
<template id="new_page_template_landing_4_s_cover" inherit_id="website.new_page_template_landing_4_s_cover">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_08_001"/>
</xpath>
</template>
@@ -126,11 +84,6 @@
<template id="new_page_template_gallery_s_cover" inherit_id="website.new_page_template_gallery_s_cover">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_08_001"/>
</xpath>
</template>
@@ -147,11 +100,6 @@
<template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Rainy_08_001"/>
</xpath>
</template>