[IMP] website, *: prepare theme snippets addition in website

* website_blog, website_event, website_form, website_mail_channel,
  website_mass_mailing, website_sale, website_twitter

+ Reorganize the order.
+ Do not promote apps via snippets when they already are promoted via
  the "New" menu. Also do not promote apps in the same snippet section
  more than once.

Part of https://github.com/odoo/odoo/pull/42937
task-2088157

16 files changed, 66 insertions, 49 deletions

diff --git a/addons/website/views/snippets/s_company_team.xml b/addons/website/views/snippets/s_company_team.xml
index 2522d052d31..aa3a54bed4e 100644
--- a/addons/website/views/snippets/s_company_team.xml
+++ b/addons/website/views/snippets/s_company_team.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-<template id="s_company_team" name="Company Team">
+<template id="s_company_team" name="Team">
     <section class="s_company_team pt48 pb48">
         <div class="container">
             <h1 style="text-align: center;">Meet the Executive Team</h1>
diff --git a/addons/website/views/snippets/s_facebook_page.xml b/addons/website/views/snippets/s_facebook_page.xml
index ba4cb5d960a..e603b28e9b0 100644
--- a/addons/website/views/snippets/s_facebook_page.xml
+++ b/addons/website/views/snippets/s_facebook_page.xml
@@ -2,7 +2,7 @@
 <odoo>
 
 <!-- Snippet template -->
-<template id="s_facebook_page" name="Facebook Page">
+<template id="s_facebook_page" name="Facebook">
     <div class="o_facebook_page"/>
 </template>
 
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index b3de737207f..2440dda3a1e 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -26,10 +26,17 @@
                     <t t-snippet="website.s_image_text" t-thumbnail="/website/static/src/img/snippets_thumbs/s_image_text.png"/>
                     <t t-snippet="website.s_title" t-thumbnail="/website/static/src/img/snippets_thumbs/s_title.png"/>
                     <t t-snippet="website.s_text_block" t-thumbnail="/website/static/src/img/snippets_thumbs/s_text_block.png"/>
+                    <!-- Numbers -->
                     <t t-snippet="website.s_picture" t-thumbnail="/website/static/src/img/snippets_thumbs/s_picture.png"/>
-                    <t t-snippet="website.s_carousel" t-thumbnail="/website/static/src/img/snippets_thumbs/s_carousel.png"/>
-                    <t t-snippet="website.s_features" t-thumbnail="/website/static/src/img/snippets_thumbs/s_features.png"/>
                     <t t-snippet="website.s_three_columns" t-thumbnail="/website/static/src/img/snippets_thumbs/s_three_columns.png"/>
+                    <!-- Big Boxes -->
+                    <t t-snippet="website.s_features" t-thumbnail="/website/static/src/img/snippets_thumbs/s_features.png"/>
+                    <!-- Masonry -->
+                    <t t-snippet="website.s_image_gallery" t-thumbnail="/website/static/src/img/snippets_thumbs/s_image_gallery.png"/>
+                    <t t-snippet="website.s_carousel" t-thumbnail="/website/static/src/img/snippets_thumbs/s_carousel.png"/>
+                    <!-- Media List -->
+                    <!-- Showcase -->
+                    <t t-snippet="website.s_parallax" t-thumbnail="/website/static/src/img/snippets_thumbs/s_parallax.png"/>
                 </div>
             </div>
 
@@ -38,27 +45,40 @@
                     <i class="fa fa-diamond"/> Features
                 </div>
                 <div class="o_panel_body">
-                    <t t-snippet="website.s_image_gallery" t-thumbnail="/website/static/src/img/snippets_thumbs/s_image_gallery.png"/>
                     <t t-snippet="website.s_comparisons" t-thumbnail="/website/static/src/img/snippets_thumbs/s_comparison.png"/>
                     <t t-snippet="website.s_company_team" t-thumbnail="/website/static/src/img/snippets_thumbs/s_company_team.png"/>
                     <t t-snippet="website.s_call_to_action" t-thumbnail="/website/static/src/img/snippets_thumbs/s_call_to_action.png"/>
                     <t t-snippet="website.s_references" t-thumbnail="/website/static/src/img/snippets_thumbs/s_references.png"/>
                     <t t-snippet="website.s_faq_collapse" t-thumbnail="/website/static/src/img/snippets_thumbs/s_faq.png"/>
                     <t t-snippet="website.s_features_grid" t-thumbnail="/website/static/src/img/snippets_thumbs/s_features_grid.png"/>
-                    <t t-snippet="website.s_popup" t-thumbnail="/website/static/src/img/snippets_thumbs/s_popup.png"/>
-                    <t t-snippet="website.s_tabs" t-thumbnail="/website/static/src/img/snippets_thumbs/s_tabs.png"/>
-                    <t t-snippet="website.s_countdown" t-thumbnail="/website/static/src/img/snippets_thumbs/s_countdown.png"/>
                     <t t-snippet="website.s_product_catalog" t-thumbnail="/website/static/src/img/snippets_thumbs/s_product_catalog.png"/>
+                    <!-- Product list -->
+                    <t t-snippet="website.s_tabs" t-thumbnail="/website/static/src/img/snippets_thumbs/s_tabs.png"/>
+                    <!-- Timeline -->
+                    <!-- Steps -->
+                    <t t-snippet="website.s_quotes_carousel" t-thumbnail="/website/static/src/img/snippets_thumbs/s_quotes_carousel.png"/>
                 </div>
             </div>
 
             <div id="snippet_effect" class="o_panel">
                 <div class="o_panel_header">
-                    <i class="fa fa-magic icon-fix"/> Effects
+                    <i class="fa fa-magic icon-fix"/> Dynamic Content
                 </div>
                 <div class="o_panel_body">
-                    <t t-snippet="website.s_parallax" t-thumbnail="/website/static/src/img/snippets_thumbs/s_parallax.png"/>
-                    <t t-snippet="website.s_quotes_carousel" t-thumbnail="/website/static/src/img/snippets_thumbs/s_quotes_carousel.png"/>
+                    <t id="form_form_hook"/>
+                    <t id="sale_recently_viewed_product_hook"/>
+                    <t id="sale_product_search_section_hook"/>
+                    <t id="blog_latest_posts_list_hook"/>
+                    <t id="blog_latest_posts_big_hook"/>
+                    <t id="event_local_events_hook"/>
+                    <t id="snippet_google_map_hook"/>
+                    <t id="mass_mailing_newsletter_block_hook"/>
+                    <t id="mass_mailing_newsletter_popup_hook"/>
+                    <t t-snippet="website.s_popup" t-thumbnail="/website/static/src/img/snippets_thumbs/s_popup.png"/>
+                    <t t-snippet="website.s_facebook_page" t-thumbnail="/website/static/src/img/snippets_thumbs/s_facebook_page.png"/>
+                    <t t-snippet="website.s_countdown" t-thumbnail="/website/static/src/img/snippets_thumbs/s_countdown.png"/>
+                    <t id="mail_channel_discussion_group_hook"/>
+                    <t id="twitter_favorite_tweets_hook"/>
                 </div>
             </div>
 
@@ -69,11 +89,17 @@
                 <div class="o_panel_body">
                     <t t-snippet="website.s_hr" t-thumbnail="/website/static/src/img/snippets_thumbs/s_separator.png"/>
                     <t t-snippet="website.s_alert" t-thumbnail="/website/static/src/img/snippets_thumbs/s_alert.png"/>
+                    <t t-snippet="website.s_rating" t-thumbnail="/website/static/src/img/snippets_thumbs/s_rating.png"/>
                     <t t-snippet="website.s_card" t-thumbnail="/website/static/src/img/snippets_thumbs/s_card.png"/>
                     <t t-snippet="website.s_share" t-thumbnail="/website/static/src/img/snippets_thumbs/s_share.png"/>
-                    <t t-snippet="website.s_facebook_page" t-thumbnail="/website/static/src/img/snippets_thumbs/s_facebook_page.png"/>
-                    <t t-snippet="website.s_rating" t-thumbnail="/website/static/src/img/snippets_thumbs/s_rating.png"/>
+                    <t id="sale_product_search_input_hook"/>
+                    <t id="mass_mailing_newsletter_hook"/>
+                    <!-- Text Highlight -->
                     <t t-snippet="website.s_chart" t-thumbnail="/website/static/src/img/snippets_thumbs/s_chart.png"/>
+                    <!-- Progress Bar -->
+                    <!-- Tags -->
+                    <!-- Quote -->
+                    <t id="event_speaker_bio_hook"/>
                 </div>
             </div>
         </t>
@@ -85,19 +111,14 @@
 </template>
 
 <template id="external_snippets" inherit_id="website.snippets" priority="8">
-    <xpath expr="//div[@id='snippet_feature']//t[@t-snippet][last()]" position="after">
+    <xpath expr="//div[@id='snippet_effect']//t[@t-snippet][last()]" position="after">
+        <t t-install="website_form" string="Form Builder" t-thumbnail="/website/static/src/img/s_website_form.png"/>
         <t id="newsletter_popup_snippet" t-install="mass_mailing" string="Newsletter Popup" t-thumbnail="/website/static/src/img/snippets_thumbs/newsletter_subscribe_popup.png"/>
-        <t id="newsletter_block_snippet" t-install="mass_mailing" string="Newsletter Block" t-thumbnail="/website/static/src/img/snippets_thumbs/s_newsletter_block.png"/>
+        <t t-install="website_mail_channel" string="Discussion Group" t-thumbnail="/website/static/src/img/snippets_thumbs/s_channel.png"/>
         <t t-install="website_twitter" string="Twitter Scroller" t-thumbnail="/website/static/src/img/snippets_thumbs/s_twitter_scroll.png"/>
-        <t t-install="website_form" string="Form Builder" t-thumbnail="/website/static/src/img/s_website_form.png"/>
-        <t id="s_products_searchbar" t-install="website_sale" string="Products Search" t-thumbnail="/website/static/src/img/snippets_thumbs/s_products_searchbar.png"/>
-        <t id="s_products_recently_viewed" t-install="website_sale" string="Products Recently Viewed" t-thumbnail="/website/static/src/img/snippets_thumbs/s_products_recently_viewed.png"/>
     </xpath>
     <xpath expr="//div[@id='snippet_content']//t[@t-snippet][last()]" position="after">
-        <t t-install="website_event" string="Local Events" t-thumbnail="/website/static/src/img/snippets_thumbs/s_local_events.png"/>
-        <t t-install="website_mail_channel" string="Discussion Group" t-thumbnail="/website/static/src/img/snippets_thumbs/s_channel.png"/>
         <t id="newsletter_snippet" t-install="mass_mailing" string="Newsletter" t-thumbnail="/website/static/src/img/snippets_thumbs/s_newsletter_subscribe_form.png"/>
-        <t id="s_products_searchbar_input" t-install="website_sale" string="Products Search Input" t-thumbnail="/website/static/src/img/snippets_thumbs/s_products_searchbar.png"/>
     </xpath>
 </template>
 
diff --git a/addons/website_blog/views/snippets.xml b/addons/website_blog/views/snippets.xml
index 3fe49ad3912..1e809f0c877 100644
--- a/addons/website_blog/views/snippets.xml
+++ b/addons/website_blog/views/snippets.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 <template id="website_blog" inherit_id="website.snippets" name="Snippet Blog">
-    <xpath expr="//div[@id='snippet_feature']/div[hasclass('o_panel_body')]/t" position="before">
+    <xpath expr="//t[@id='blog_latest_posts_list_hook']" position="replace">
         <t t-snippet="website_blog.s_latest_posts" t-thumbnail="/website_blog/static/src/img/s_latest_posts.jpg"/>
+    </xpath>
+    <xpath expr="//t[@id='blog_latest_posts_big_hook']" position="replace">
         <t t-snippet="website_blog.s_latest_posts_big_picture" t-thumbnail="/website_blog/static/src/img/s_latest_posts_big_picture.jpg"/>
     </xpath>
 </template>
diff --git a/addons/website/static/src/img/snippets_thumbs/s_local_events.png b/addons/website_event/static/src/img/snippets_thumbs/s_country_events.png
index 9b5a57ef49b..9b5a57ef49b 100644
--- a/addons/website/static/src/img/snippets_thumbs/s_local_events.png
+++ b/addons/website_event/static/src/img/snippets_thumbs/s_country_events.png
diff --git a/addons/website_event/static/src/img/s_country_events.png b/addons/website_event/static/src/img/snippets_thumbs/s_speaker_bio.png
index 7fa595bc280..7fa595bc280 100755
--- a/addons/website_event/static/src/img/s_country_events.png
+++ b/addons/website_event/static/src/img/snippets_thumbs/s_speaker_bio.png
diff --git a/addons/website_event/static/src/img/world_map.jpg b/addons/website_event/static/src/img/world_map.jpg
deleted file mode 100644
index 2813f53f4c3..00000000000
--- a/addons/website_event/static/src/img/world_map.jpg
+++ /dev/null
diff --git a/addons/website_event/views/event_snippets.xml b/addons/website_event/views/event_snippets.xml
index fb890988102..9523a6b82df 100644
--- a/addons/website_event/views/event_snippets.xml
+++ b/addons/website_event/views/event_snippets.xml
@@ -46,15 +46,13 @@
     </div>
 </template>
 
-<!-- Replace snippet demo with actual snippet and options -->
-<template id="remove_external_snippets" inherit_id="website.external_snippets">
-    <xpath expr="//t[@t-install='website_event']" position="replace"/>
-</template>
-
+<!-- Snippets and options -->
 <template id="snippets" inherit_id="website.snippets">
-    <xpath expr="//div[@id='snippet_content']//t[@t-snippet][last()]" position="after">
-        <t t-snippet="website_event.s_country_events" t-thumbnail="/website_event/static/src/img/world_map.jpg"/>
-        <t t-snippet="website_event.s_speaker_bio" t-thumbnail="/website_event/static/src/img/s_country_events.png"/>
+    <xpath expr="//t[@id='event_local_events_hook']" position="replace">
+        <t t-snippet="website_event.s_country_events" t-thumbnail="/website_event/static/src/img/snippets_thumbs/s_country_events.png"/>
+    </xpath>
+    <xpath expr="//t[@id='event_speaker_bio_hook']" position="replace">
+        <t t-snippet="website_event.s_speaker_bio" t-thumbnail="/website_event/static/src/img/snippets_thumbs/s_speaker_bio.png"/>
     </xpath>
 </template>
 
diff --git a/addons/website_form/views/snippets.xml b/addons/website_form/views/snippets.xml
index 4f96ac66f4e..f362505387b 100644
--- a/addons/website_form/views/snippets.xml
+++ b/addons/website_form/views/snippets.xml
@@ -18,7 +18,7 @@
         </template>
 
         <template id="register_s_website_form" inherit_id="website.snippets" name="Snippet Form Builder">
-            <xpath expr="//div[@id='snippet_feature']//t[@t-snippet][last()]" position="after">
+            <xpath expr="//t[@id='form_form_hook']" position="replace">
                 <t t-snippet="website_form.s_website_form" t-thumbnail="/website/static/src/img/s_website_form.png"/>
             </xpath>
         </template>
diff --git a/addons/website_mail_channel/views/snippets/snippets.xml b/addons/website_mail_channel/views/snippets/snippets.xml
index 0ba2167f9ac..5dfb3ad01fa 100644
--- a/addons/website_mail_channel/views/snippets/snippets.xml
+++ b/addons/website_mail_channel/views/snippets/snippets.xml
@@ -6,7 +6,7 @@
 </template>
 
 <template id="snippets" inherit_id="website.snippets" name="Snippet Subscribe">
-    <xpath expr="//div[@id='snippet_content']//t[@t-snippet][last()]" position="after">
+    <xpath expr="//t[@id='mail_channel_discussion_group_hook']" position="replace">
         <t t-snippet="website_mail_channel.s_channel" t-thumbnail="/website/static/src/img/snippets_thumbs/s_channel.png"/>
     </xpath>
 </template>
diff --git a/addons/website/static/src/img/snippets_thumbs/s_newsletter_block.png b/addons/website_mass_mailing/static/src/img/snippets_thumbs/s_newsletter_block.png
index 828d39b3cf2..828d39b3cf2 100644
--- a/addons/website/static/src/img/snippets_thumbs/s_newsletter_block.png
+++ b/addons/website_mass_mailing/static/src/img/snippets_thumbs/s_newsletter_block.png
diff --git a/addons/website_mass_mailing/views/snippets_templates.xml b/addons/website_mass_mailing/views/snippets_templates.xml
index 1411f42e89e..60ccdb414b8 100644
--- a/addons/website_mass_mailing/views/snippets_templates.xml
+++ b/addons/website_mass_mailing/views/snippets_templates.xml
@@ -10,16 +10,16 @@
 <template id="remove_external_snippets" inherit_id="website.external_snippets">
     <xpath expr="//t[@id='newsletter_snippet']" position="replace"/>
     <xpath expr="//t[@id='newsletter_popup_snippet']" position="replace"/>
-    <xpath expr="//t[@id='newsletter_block_snippet']" position="replace"/>
 </template>
 
 <template id="snippets" inherit_id="website.snippets">
-    <xpath expr="//div[@id='snippet_feature']//t[@t-snippet][last()]" position="after">
+    <xpath expr="//t[@id='mass_mailing_newsletter_block_hook']" position="replace">
+        <t t-snippet="website_mass_mailing.s_newsletter_block" t-thumbnail="/website_mass_mailing/static/src/img/snippets_thumbs/s_newsletter_block.png"/>
+    </xpath>
+    <xpath expr="//t[@id='mass_mailing_newsletter_popup_hook']" position="replace">
         <t t-snippet="website_mass_mailing.s_newsletter_subscribe_popup" t-thumbnail="/website/static/src/img/snippets_thumbs/newsletter_subscribe_popup.png"/>
-        <t t-snippet="website_mass_mailing.s_newsletter_block" t-thumbnail="/website/static/src/img/snippets_thumbs/s_newsletter_block.png"/>
     </xpath>
-
-    <xpath expr="//div[@id='snippet_content']//t[@t-snippet][last()]" position="after">
+    <xpath expr="//t[@id='mass_mailing_newsletter_hook']" position="replace">
         <t t-snippet="website_mass_mailing.s_newsletter_subscribe_form" t-thumbnail="/website/static/src/img/snippets_thumbs/s_newsletter_subscribe_form.png"/>
     </xpath>
 </template>
diff --git a/addons/website/static/src/img/snippets_thumbs/s_products_recently_viewed.png b/addons/website_sale/static/src/img/snippets_thumbs/s_products_recently_viewed.png
index c55ad28b628..c55ad28b628 100644
--- a/addons/website/static/src/img/snippets_thumbs/s_products_recently_viewed.png
+++ b/addons/website_sale/static/src/img/snippets_thumbs/s_products_recently_viewed.png
diff --git a/addons/website/static/src/img/snippets_thumbs/s_products_searchbar.png b/addons/website_sale/static/src/img/snippets_thumbs/s_products_searchbar.png
index 4f24bb529cf..4f24bb529cf 100644
--- a/addons/website/static/src/img/snippets_thumbs/s_products_searchbar.png
+++ b/addons/website_sale/static/src/img/snippets_thumbs/s_products_searchbar.png
diff --git a/addons/website_sale/views/snippets.xml b/addons/website_sale/views/snippets.xml
index 430cdf4e5e6..2072ea2c5e5 100644
--- a/addons/website_sale/views/snippets.xml
+++ b/addons/website_sale/views/snippets.xml
@@ -40,19 +40,15 @@
 </template>
 
 <template id="snippets" inherit_id="website.snippets" name="e-commerce snippets">
-    <xpath expr="//div[@id='snippet_feature']//t[@t-snippet][last()]" position="after">
-        <t t-snippet="website_sale.s_products_searchbar" t-thumbnail="/website/static/src/img/snippets_thumbs/s_products_searchbar.png"/>
-        <t t-snippet="website_sale.s_products_recently_viewed" t-thumbnail="/website/static/src/img/snippets_thumbs/s_products_recently_viewed.png"/>
+    <xpath expr="//t[@id='sale_recently_viewed_product_hook']" position="replace">
+        <t t-snippet="website_sale.s_products_recently_viewed" t-thumbnail="/website_sale/static/src/img/snippets_thumbs/s_products_recently_viewed.png"/>
     </xpath>
-    <xpath expr="//div[@id='snippet_content']//t[@t-snippet][last()]" position="after">
-        <t t-snippet="website_sale.s_products_searchbar_input" t-thumbnail="/website/static/src/img/snippets_thumbs/s_products_searchbar.png"/>
+    <xpath expr="//t[@id='sale_product_search_section_hook']" position="replace">
+        <t t-snippet="website_sale.s_products_searchbar" t-thumbnail="/website_sale/static/src/img/snippets_thumbs/s_products_searchbar.png"/>
+    </xpath>
+    <xpath expr="//t[@id='sale_product_search_input_hook']" position="replace">
+        <t t-snippet="website_sale.s_products_searchbar_input" t-thumbnail="/website_sale/static/src/img/snippets_thumbs/s_products_searchbar.png"/>
     </xpath>
-</template>
-
-<template id="remove_external_snippets" inherit_id="website.external_snippets">
-    <xpath expr="//t[@t-install='website_sale'][@id='s_products_searchbar']" position="replace"/>
-    <xpath expr="//t[@t-install='website_sale'][@id='s_products_searchbar_input']" position="replace"/>
-    <xpath expr="//t[@t-install='website_sale'][@id='s_products_recently_viewed']" position="replace"/>
 </template>
 
 <template id="snippet_options" inherit_id="website.snippet_options" name="e-commerce snippet options">
diff --git a/addons/website_twitter/views/website_twitter_snippet_templates.xml b/addons/website_twitter/views/website_twitter_snippet_templates.xml
index e0038689b9b..fd1f9f01674 100644
--- a/addons/website_twitter/views/website_twitter_snippet_templates.xml
+++ b/addons/website_twitter/views/website_twitter_snippet_templates.xml
@@ -10,7 +10,7 @@
         <xpath expr="//t[@t-install='website_twitter']" position="replace"/>
     </template>
      <template id="website_twitter_snippet" inherit_id="website.snippets">
-        <xpath expr="//div[@id='snippet_feature']//t[@t-snippet][last()]" position="after">
+        <xpath expr="//t[@id='twitter_favorite_tweets_hook']" position="replace">
             <t t-snippet="website_twitter.s_twitter" t-thumbnail="/website/static/src/img/blocks/twitter_scroll.png"/>
         </xpath>
     </template>