From 4e564b4ffdeec331c9cd6ae852cb1b36f6281529 Mon Sep 17 00:00:00 2001
From: "Guillaume (gdi)" <gdi@odoo.com>
Date: Mon, 28 Feb 2022 09:22:44 +0000
Subject: [PATCH] [FIX] website: move s_share options to standard options

As the s_share options are now shared options between s_share and
s_social_media, the XML option code has to be in a shared file.

task-2739937

Part-of: odoo/odoo#85476
---
 addons/website/views/snippets/s_share.xml  | 26 ----------------------
 addons/website/views/snippets/snippets.xml | 21 +++++++++++++++++
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/addons/website/views/snippets/s_share.xml b/addons/website/views/snippets/s_share.xml
index 168f44d8023..2eac792bb74 100644
--- a/addons/website/views/snippets/s_share.xml
+++ b/addons/website/views/snippets/s_share.xml
@@ -25,32 +25,6 @@
     </div>
 </template>
 
-<template id="s_share_options" inherit_id="website.snippet_options">
-    <xpath expr="." position="inside">
-        <!-- TODO: Now that it is shared with social media, move elsewhere? -->
-        <div data-selector=".s_share, .s_social_media">
-            <we-select string="Title Position" data-apply-to=".s_share_title, .s_social_media_title">
-                <we-button data-select-class="d-block">Top</we-button>
-                <we-button data-select-class="">Left</we-button>
-                <we-button data-select-class="d-none">None</we-button>
-            </we-select>
-            <we-select string="Layout" data-apply-to=".fa">
-                <we-button data-select-class="rounded shadow-sm">Square</we-button>
-                <we-button data-select-class="rounded-empty-circle shadow-sm">Circle</we-button>
-                <we-button data-select-class="rounded-circle shadow-sm">Disk</we-button>
-                <we-button data-select-class="m-1">None</we-button>
-            </we-select>
-            <we-select string="Size" data-apply-to=".fa">
-                <we-button data-select-class="">Small</we-button>
-                <we-button data-select-class="fa-2x">Medium</we-button>
-                <we-button data-select-class="fa-3x">Big</we-button>
-            </we-select>
-            <!-- Compatibility, keep reverse logical, don't use `icon_color` -->
-            <we-checkbox string="Color" data-select-class="no_icon_color|"/>
-        </div>
-    </xpath>
-</template>
-
 <record id="website.s_share_000_scss" model="ir.asset">
     <field name="name">Share 000 SCSS</field>
     <field name="bundle">web.assets_frontend</field>
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index 78e432b7632..0e628163ab3 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -363,6 +363,27 @@
         </we-button-group>
     </div>
 
+    <div data-selector=".s_share, .s_social_media">
+        <we-select string="Title Position" data-apply-to=".s_share_title, .s_social_media_title">
+            <we-button data-select-class="d-block">Top</we-button>
+            <we-button data-select-class="">Left</we-button>
+            <we-button data-select-class="d-none">None</we-button>
+        </we-select>
+        <we-select string="Layout" data-apply-to=".fa">
+            <we-button data-select-class="rounded shadow-sm">Square</we-button>
+            <we-button data-select-class="rounded-empty-circle shadow-sm">Circle</we-button>
+            <we-button data-select-class="rounded-circle shadow-sm">Disk</we-button>
+            <we-button data-select-class="m-1">None</we-button>
+        </we-select>
+        <we-select string="Size" data-apply-to=".fa">
+            <we-button data-select-class="">Small</we-button>
+            <we-button data-select-class="fa-2x">Medium</we-button>
+            <we-button data-select-class="fa-3x">Big</we-button>
+        </we-select>
+        <!-- Compatibility, keep reverse logical, don't use `icon_color` -->
+        <we-checkbox string="Color" data-select-class="no_icon_color|"/>
+    </div>
+
     <div id="so_width" data-selector=".s_alert, .s_card, .s_blockquote, .s_text_highlight">
         <we-select string="Width">
             <we-button data-select-class="w-25">25%</we-button>