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_graphene/views/customizations.xml
+4 -9
View File
@@ -278,6 +278,10 @@
<template id="s_picture" inherit_id="website.s_picture" name="Graphene s_picture">
<xpath expr="//section" position="attributes">
<attribute name="class" add="pb0 pt48" remove="pb24 pt48" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/01_001","flip":[]}</attribute>
</xpath>
<xpath expr="//section/div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Zigs_01_001"/>
</xpath>
<!-- Content -->
<xpath expr="//h2" position="replace" mode="inner">
@@ -291,13 +295,4 @@
</xpath>
</template>
<template id="configurator_s_picture" inherit_id="website.configurator_s_picture" name="Graphene s_picture">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/01_001","flip":[]}</attribute>
</xpath>
<xpath expr="//section/div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Zigs_01_001"/>
</xpath>
</template>
</odoo>
theme_graphene/views/new_page_template.xml
+27 -9
View File
@@ -20,8 +20,26 @@
</xpath>
</template>
<template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<!-- Snippet customization Basic Pages -->
<template id="new_page_template_basic_s_picture" inherit_id="website.new_page_template_basic_s_picture">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<!-- Snippet customization About Pages -->
<template id="new_page_template_about_s_company_team" inherit_id="website.new_page_template_about_s_company_team">
@@ -42,15 +60,6 @@
</xpath>
</template>
<template id="new_page_template_about_s_picture" inherit_id="website.new_page_template_about_s_picture">
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/01_001","flip":[]}</attribute>
</xpath>
<xpath expr="//section/div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Zigs_01_001"/>
</xpath>
</template>
<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">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2" separator=" "/>
@@ -158,6 +167,15 @@
<!-- Snippet customization Team Pages -->
<template id="new_page_template_team_s_picture" inherit_id="website.new_page_template_team_s_picture">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<template id="new_page_template_team_s_text_block_h1" inherit_id="website.new_page_template_team_s_text_block_h1">
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc2" separator=" "/>