NextERP/design-themes
2
0
Fork 0
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/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>