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_notes/views/new_page_template.xml
+33 -59
View File
@@ -11,37 +11,13 @@
<!-- General customizations -->
<template id="new_page_template_s_call_to_action" inherit_id="website.new_page_template_s_call_to_action">
<!-- Shape option -->
<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/Floats/12","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_12"/>
</xpath>
</template>
<template id="new_page_template_s_call_to_action_about" inherit_id="website.new_page_template_s_call_to_action_about">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_12"/>
</xpath>
</template>
<template id="new_page_template_s_call_to_action_menu" inherit_id="website.new_page_template_s_call_to_action_menu">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_12"/>
<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_carousel" inherit_id="website.new_page_template_s_carousel">
@@ -71,22 +47,29 @@
</xpath>
</template>
<template id="new_page_template_s_parallax" inherit_id="website.new_page_template_s_parallax">
<!-- Shape option -->
<template id="new_page_template_s_comparisons" inherit_id="website.new_page_template_s_comparisons">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
<div class="o_we_shape o_web_editor_Rainy_08_001"/>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<template id="new_page_template_s_image_text" inherit_id="website.new_page_template_s_image_text">
<!-- Remove shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data"/>
</xpath>
</template>
<template id="new_page_template_s_text_image" inherit_id="website.new_page_template_s_text_image">
<!-- Shape option -->
<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/Wavy/11","flip":["x"]}</attribute>
<attribute name="data-oe-shape-data"/>
</xpath>
<!-- Remove shape -->
<xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
</template>
<!-- Snippet customization Basic Pages -->
@@ -101,14 +84,8 @@
<!-- Snippet customization About Pages -->
<template id="new_page_template_about_s_banner" inherit_id="website.new_page_template_about_s_banner">
<!-- Shape option -->
<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/Floats/08","flip":["x","y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_08" style="background-image: url('/web_editor/shape/web_editor/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
</xpath>
</template>
@@ -181,14 +158,8 @@
</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">
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/08","flip":["x","y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_08" style="background-image: url('/web_editor/shape/web_editor/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
</xpath>
</template>
@@ -212,17 +183,20 @@
<xpath expr="//section" position="replace"/>
</template>
<template id="new_page_template_landing_5_s_banner" inherit_id="website.new_page_template_landing_5_s_banner">
<!-- 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 Gallery Pages -->
<template id="new_page_template_gallery_s_banner" inherit_id="website.new_page_template_gallery_s_banner">
<!-- Shape option -->
<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/Floats/08","flip":["x","y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_08" style="background-image: url('/web_editor/shape/web_editor/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
<attribute name="class" add="o_half_screen_height" remove="o_full_screen_height" separator=" "/>
</xpath>
</template>
theme_notes/views/snippets/s_banner.xml
+5 -11
View File
@@ -5,6 +5,11 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc o_cc5" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/08","flip":["x","y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_08" style="background-image: url('/web_editor/shape/web_editor/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
</xpath>
<!-- Title -->
<xpath expr="//h1" position="replace" mode="inner">
@@ -12,15 +17,4 @@
</xpath>
</template>
<template id="configurator_s_banner" inherit_id="website.configurator_s_banner">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/08","flip":["x","y"]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_08" style="background-image: url('/web_editor/shape/web_editor/Floats/08.svg?c1=o-color-1&amp;c2=o-color-2&amp;c3=o-color-3&amp;c5=o-color-1&amp;flip=xy'); background-position: 100% 100%;"/>
</xpath>
</template>
</odoo>
theme_notes/views/snippets/s_call_to_action.xml
+3 -12
View File
@@ -5,11 +5,13 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="pb72 pt96 oe_img_bg o_bg_img_center" remove="pt48 pb24" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
<attribute name="style">background-image: url('/web/image/website.s_call_to_action_default_image'); background-position: 50% 34%;</attribute>
</xpath>
<!-- Filter -->
<!-- Shape & filter -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_bg_filter bg-black-50"/>
<div class="o_we_shape o_web_editor_Floats_12"/>
</xpath>
<!-- Title -->
<xpath expr="//h3" position="replace">
@@ -28,15 +30,4 @@
</xpath>
</template>
<template id="configurator_s_call_to_action" inherit_id="website.configurator_s_call_to_action">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/12","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//div[hasclass('container')]" position="before">
<div class="o_we_shape o_web_editor_Floats_12"/>
</xpath>
</template>
</odoo>
theme_notes/views/snippets/s_comparisons.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="configurator_s_comparisons" inherit_id="website.configurator_s_comparisons">
<template id="s_comparisons" inherit_id="website.s_comparisons">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/05","flip":[]}</attribute>
theme_notes/views/snippets/s_image_text.xml
+1 -7
View File
@@ -5,6 +5,7 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc o_cc5 pt80 pb80" remove="pt32 pb32" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":[]}</attribute>
</xpath>
<!-- Text wrapper -->
<xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
@@ -26,11 +27,4 @@
</xpath>
</template>
<template id="configurator_s_image_text" inherit_id="website.configurator_s_image_text">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":[]}</attribute>
</xpath>
</template>
</odoo>
theme_notes/views/snippets/s_parallax.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="configurator_s_parallax" inherit_id="website.configurator_s_parallax">
<template id="s_parallax" inherit_id="website.s_parallax">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/08_001","flip":[]}</attribute>
theme_notes/views/snippets/s_product_catalog.xml
+3 -12
View File
@@ -5,11 +5,13 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc o_cc5 pb160 pt160 parallax s_parallax_is_fixed s_parallax_no_overflow_hidden o_full_screen_height" remove="pb32 pt48" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","flip":[]}</attribute>
<attribute name="data-scroll-background-ratio">1</attribute>
</xpath>
<!-- Background image -->
<!-- Shape & Background image -->
<xpath expr="//section/*" position="before">
<span class="s_parallax_bg oe_img_bg o_bg_img_center" style="background-image: url('/web/image/website.s_product_catalog_default_image');"/>
<div class="o_we_shape o_web_editor_Wavy_10"/>
</xpath>
<!-- Title & subtitles -->
<xpath expr="//h2" position="replace">
@@ -67,15 +69,4 @@
</xpath>
</template>
<template id="configurator_s_product_catalog" inherit_id="website.configurator_s_product_catalog">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/10","flip":[]}</attribute>
</xpath>
<!-- Shape -->
<xpath expr="//section/*" position="before">
<div class="o_we_shape o_web_editor_Wavy_10"/>
</xpath>
</template>
</odoo>
theme_notes/views/snippets/s_text_image.xml
+1 -7
View File
@@ -5,6 +5,7 @@
<!-- Section -->
<xpath expr="//section" position="attributes">
<attribute name="class" add="o_cc o_cc1 pt80 pb80" remove="pt32 pb32" separator=" "/>
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
</xpath>
<!-- Title & Paragraph -->
<xpath expr="//h2" position="replace" mode="inner">
@@ -25,11 +26,4 @@
</xpath>
</template>
<template id="configurator_s_text_image" inherit_id="website.configurator_s_text_image">
<!-- Shape option -->
<xpath expr="//section" position="attributes">
<attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["x"]}</attribute>
</xpath>
</template>
</odoo>