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

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>

theme_buzzy/views/snippets/s_call_to_action.xml

@@ -5,6 +5,11 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc5 pt88 pb48" remove="o_cc3 pt48 pb24" 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>
     <!-- Container -->
     <xpath expr="//div[hasclass('container')]" position="attributes">
@@ -28,15 +33,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/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>
-
 </odoo>

theme_buzzy/views/snippets/s_cover.xml

@@ -5,11 +5,16 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc5 pt112 pb112" remove="pt96 pb96 bg-black-50" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
     </xpath>
     <!-- Filter -->
     <xpath expr="//div[hasclass('o_we_bg_filter')]" position="replace">
         <div class="o_we_bg_filter" style="background-color: rgba(52,54,67,0.75) !important;"/>
     </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
+        <div class="o_we_shape o_web_editor_Airy_03_001"/>
+    </xpath>
     <!-- Title -->
     <xpath expr="//h1" position="replace" mode="inner">
         Faster, lighter and more powerful
@@ -23,14 +28,4 @@
     </xpath>
 </template>
 
-<template id="configurator_s_cover" inherit_id="website.configurator_s_cover">
-    <!-- Shape option -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/03_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('o_we_bg_filter')]" position="after">
-        <div class="o_we_shape o_web_editor_Airy_03_001"/>
-    </xpath>
-</template>
 </odoo>

theme_buzzy/views/snippets/s_features.xml

@@ -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/Rainy/09_001","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//div[hasclass('container')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_09_001"/>
     </xpath>
     <!-- Feature #2 - Icon -->
     <xpath expr="//div[hasclass('row')]//div[2]//i" position="attributes">
@@ -16,15 +21,4 @@
     </xpath>
 </template>
 
-<template id="configurator_s_features" inherit_id="website.configurator_s_features">
-    <!-- Shape option -->
-    <xpath expr="//section" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/09_001","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//div[hasclass('container')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_09_001"/>
-    </xpath>
-</template>
-
 </odoo>

theme_buzzy/views/snippets/s_numbers.xml

@@ -5,12 +5,6 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc4 pt96 pb96" remove="o_cc2 pt24 pb24" separator=" "/>
-    </xpath>
-</template>
-
-<template id="configurator_s_numbers" inherit_id="website.configurator_s_numbers">
-    <!-- Shape option -->
-    <xpath expr="//section" position="attributes">
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Zigs/02_001","flip":[]}</attribute>
     </xpath>
     <!-- Shape -->

theme_buzzy/views/snippets/s_process_steps.xml

@@ -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/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>
     <!-- Icon #2 -->
     <xpath expr="(//i)[2]" position="attributes">

theme_buzzy/views/snippets/s_product_catalog.xml

@@ -5,16 +5,10 @@
     <!-- Section -->
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc o_cc4 pb88 pt88" remove="pb32 pt48" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Airy/07","flip":[]}</attribute>
         <!-- Enable SVG dynamic color functionality -->
         <attribute name="style">background-image: url('/web_editor/shape/theme_buzzy/s_product_catalog.svg?c1=o-color-1'); background-position: 50% 0%;</attribute>
     </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/Airy/07","flip":[]}</attribute>
-    </xpath>
     <!-- Shape -->
     <xpath expr="//section/*" position="before">
         <div class="o_we_shape o_web_editor_Airy_07"/>

theme_buzzy/views/snippets/s_quotes_carousel.xml

@@ -5,6 +5,11 @@
     <!-- Carousel -->
     <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
         <attribute name="class" add="s_carousel_rounded o_cc5" remove="s_carousel_default o_cc2" separator=" "/>
+        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10","flip":[]}</attribute>
+    </xpath>
+    <!-- Shape -->
+    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
+        <div class="o_we_shape o_web_editor_Rainy_10"/>
     </xpath>
     <!-- Icons quote -->
     <xpath expr="//i" position="attributes">
@@ -28,15 +33,4 @@
     </xpath>
 </template>
 
-<template id="configurator_s_quotes_carousel" inherit_id="website.configurator_s_quotes_carousel">
-    <!-- Shape option -->
-    <xpath expr="//div[hasclass('s_quotes_carousel')]" position="attributes">
-        <attribute name="data-oe-shape-data">{"shape":"web_editor/Rainy/10","flip":[]}</attribute>
-    </xpath>
-    <!-- Shape -->
-    <xpath expr="//ol[hasclass('carousel-indicators')]" position="before">
-        <div class="o_we_shape o_web_editor_Rainy_10"/>
-    </xpath>
-</template>
-
 </odoo>