From 2b3b8b49b494a2abbcd255ecd0bbbb7e9b43e7fb Mon Sep 17 00:00:00 2001 From: Benjamin Vray Date: Thu, 4 Jul 2024 16:03:09 +0200 Subject: [PATCH] [IMP] test_themes, theme_* : Adapts tours for new dragNDrop system Following the change in the way of dragging and dropping a snippet onto the page (by selecting it from a dialog displaying the actual previews of snippets). The themes tours have been adapted to this change in this commit. task-3919405 closes odoo/design-themes#817 Related: odoo/odoo#166967 Related: odoo/enterprise#66150 Signed-off-by: Robin Lejeune (role) --- test_themes/tests/test_new_page_templates.py | 1 + theme_anelusia/static/src/js/tour.js | 7 +++++++ theme_artists/static/src/js/tour.js | 8 +++++++- theme_avantgarde/static/src/js/tour.js | 5 +++++ theme_aviato/static/src/js/tour.js | 6 ++++++ theme_beauty/static/src/js/tour.js | 6 ++++++ theme_bewise/static/src/js/tour.js | 9 ++++++++- theme_bistro/static/src/js/tour.js | 6 ++++++ theme_bookstore/static/src/js/tour.js | 6 ++++++ theme_buzzy/static/src/js/tour.js | 6 ++++++ theme_clean/static/src/js/tour.js | 8 ++++++++ theme_cobalt/static/src/js/tour.js | 6 ++++++ theme_enark/static/src/js/tour.js | 8 +++++++- theme_graphene/static/src/js/tour.js | 5 +++++ theme_kea/static/src/js/tour.js | 6 ++++++ theme_kiddo/static/src/js/tour.js | 5 +++++ theme_loftspace/static/src/js/tour.js | 5 +++++ theme_monglia/static/src/js/tour.js | 10 +++++++++- theme_nano/static/src/js/tour.js | 6 ++++++ theme_notes/static/src/js/tour.js | 6 ++++++ theme_odoo_experts/static/src/js/tour.js | 7 +++++++ theme_orchid/static/src/js/tour.js | 6 ++++++ theme_paptic/static/src/js/tour.js | 6 ++++++ theme_real_estate/static/src/js/tour.js | 12 +++++++++++- theme_treehouse/static/src/js/tour.js | 5 +++++ theme_vehicle/static/src/js/tour.js | 6 ++++++ theme_yes/static/src/js/tour.js | 6 ++++++ theme_zap/static/src/js/tour.js | 6 ++++++ 28 files changed, 174 insertions(+), 5 deletions(-) diff --git a/test_themes/tests/test_new_page_templates.py b/test_themes/tests/test_new_page_templates.py index fe6772e56..2a999ac92 100644 --- a/test_themes/tests/test_new_page_templates.py +++ b/test_themes/tests/test_new_page_templates.py @@ -90,6 +90,7 @@ CONFLICTUAL_CLASSES_RE = { 's_table_of_content_vertical_navbar', 's_table_of_content_navbar_sticky', 's_table_of_content_navbar_wrap', 's_timeline_card', 's_website_form_custom', 's_website_form_dnone', 's_website_form_field', 's_website_form_input', 's_website_form_mark', + 's_donation_btn', 's_donation_custom_btn', ], # Text re.compile(r'^text-(?!(center|end|start|bg-|lg-)).*$'): [ diff --git a/theme_anelusia/static/src/js/tour.js b/theme_anelusia/static/src/js/tour.js index 717711549..05a6708c3 100644 --- a/theme_anelusia/static/src/js/tour.js +++ b/theme_anelusia/static/src/js/tour.js @@ -6,30 +6,37 @@ const snippets = [ { id: 's_text_cover', name: 'Text Cover', + groupName: "Intro", }, { id: 's_images_wall', name: 'Images Wall', + groupName: "Images", }, { id: 's_color_blocks_2', name: 'Big Boxes', + groupName: "Content", }, { id: 's_references', name: 'References', + groupName: "People", }, { id: 's_media_list', name: 'Media List', + groupName: "Content", }, { id: 's_company_team', name: 'Team', + groupName: "People", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_artists/static/src/js/tour.js b/theme_artists/static/src/js/tour.js index 42079ff49..927291626 100644 --- a/theme_artists/static/src/js/tour.js +++ b/theme_artists/static/src/js/tour.js @@ -4,28 +4,34 @@ import wTourUtils from '@website/js/tours/tour_utils'; const snippets = [ { - id: 's_carousel_wrapper', + id: 's_carousel', name: 'Carousel', + groupName: "Intro", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_images_wall', name: 'Images Wall', + groupName: "Images", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_avantgarde/static/src/js/tour.js b/theme_avantgarde/static/src/js/tour.js index 1bd2dd77b..bc0f50405 100644 --- a/theme_avantgarde/static/src/js/tour.js +++ b/theme_avantgarde/static/src/js/tour.js @@ -5,22 +5,27 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_picture', name: 'Title - Image', + groupName: "Images", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_aviato/static/src/js/tour.js b/theme_aviato/static/src/js/tour.js index 80d705117..177f1bd27 100644 --- a/theme_aviato/static/src/js/tour.js +++ b/theme_aviato/static/src/js/tour.js @@ -7,26 +7,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_picture', name: 'Title - Image', + groupName: "Images", }, ]; diff --git a/theme_beauty/static/src/js/tour.js b/theme_beauty/static/src/js/tour.js index 403ec9f23..7277bacd1 100644 --- a/theme_beauty/static/src/js/tour.js +++ b/theme_beauty/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_product_list', name: 'Items', + groupName: "Content", }, { id: 's_company_team', name: 'Team', + groupName: "People", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_bewise/static/src/js/tour.js b/theme_bewise/static/src/js/tour.js index 47b883dda..ec64a8822 100644 --- a/theme_bewise/static/src/js/tour.js +++ b/theme_bewise/static/src/js/tour.js @@ -6,30 +6,37 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_numbers', name: 'Numbers', + groupName: "Content", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { - id: 's_quotes_carousel_wrapper', + id: 's_quotes_carousel', name: 'Quotes', + groupName: "People", }, { id: 's_color_blocks_2', name: 'Big Boxes', + groupName: "Content", }, ]; diff --git a/theme_bistro/static/src/js/tour.js b/theme_bistro/static/src/js/tour.js index eca1000eb..6d58fc5d9 100644 --- a/theme_bistro/static/src/js/tour.js +++ b/theme_bistro/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_features', name: 'Features', + groupName: "Content", }, { id: 's_picture', name: 'Title - Image', + groupName: "Images", }, { id: 's_product_catalog', name: 'Pricelist', + groupName: "Content", }, { id: 's_text_block', name: 'Text', + groupName: "Text", }, { id: 's_quotes_carousel', name: 'Quotes', + groupName: "People", }, ]; diff --git a/theme_bookstore/static/src/js/tour.js b/theme_bookstore/static/src/js/tour.js index 1733f1720..abd4c1a95 100644 --- a/theme_bookstore/static/src/js/tour.js +++ b/theme_bookstore/static/src/js/tour.js @@ -7,26 +7,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_masonry_block', name: 'Masonry', + groupName: "Images", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { id: 's_picture', name: 'Title - Image', + groupName: "Images", }, { id: 's_product_list', name: 'Items', + groupName: "Content", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_buzzy/static/src/js/tour.js b/theme_buzzy/static/src/js/tour.js index eab721f78..4944fdbe7 100644 --- a/theme_buzzy/static/src/js/tour.js +++ b/theme_buzzy/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_banner', name: 'Banner', + groupName: "Intro", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { id: 's_numbers', name: 'Numbers', + groupName: "Content", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_clean/static/src/js/tour.js b/theme_clean/static/src/js/tour.js index 66bb12451..c814a7396 100644 --- a/theme_clean/static/src/js/tour.js +++ b/theme_clean/static/src/js/tour.js @@ -7,34 +7,42 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_features', name: 'Features', + groupName: "Content", }, { id: 's_carousel', name: 'Carousel', + groupName: "Intro", }, { id: 's_numbers', name: 'Numbers', + groupName: "Content", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_cobalt/static/src/js/tour.js b/theme_cobalt/static/src/js/tour.js index 6bf27268d..5944920b9 100644 --- a/theme_cobalt/static/src/js/tour.js +++ b/theme_cobalt/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_banner', name: 'Banner', + groupName: "Intro", }, { id: 's_references', name: 'References', + groupName: "People", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_color_blocks_2', name: 'Big Boxes', + groupName: "Content", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_image_gallery', name: 'Images Wall', + groupName: "Images", }, ]; diff --git a/theme_enark/static/src/js/tour.js b/theme_enark/static/src/js/tour.js index d9f597596..2137c7afa 100644 --- a/theme_enark/static/src/js/tour.js +++ b/theme_enark/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_banner', name: 'Banner', + groupName: "Intro", }, { id: 's_picture', name: 'Title - Image', + groupName: "Images", }, { id: 's_numbers', name: 'Numbers', + groupName: "Content", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { - id: 's_image_wall', + id: 's_images_wall', name: 'Images Wall', + groupName: "Images", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_graphene/static/src/js/tour.js b/theme_graphene/static/src/js/tour.js index 91a96bea0..dc6daf7d5 100644 --- a/theme_graphene/static/src/js/tour.js +++ b/theme_graphene/static/src/js/tour.js @@ -6,22 +6,27 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_numbers', name: 'Numbers', + groupName: "Content", }, { id: 's_picture', name: 'Title - Image', + groupName: "Images", }, { id: 's_comparisons', name: 'Comparisons', + groupName: "Content", }, ]; diff --git a/theme_kea/static/src/js/tour.js b/theme_kea/static/src/js/tour.js index a03ceb625..b670e24f3 100644 --- a/theme_kea/static/src/js/tour.js +++ b/theme_kea/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_picture', name: 'Title - Image', + groupName: "Images", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { id: 's_color_blocks_2', name: 'Big Boxes', + groupName: "Content", }, { id: 's_media_list', name: 'Media List', + groupName: "Content", }, ]; diff --git a/theme_kiddo/static/src/js/tour.js b/theme_kiddo/static/src/js/tour.js index 8894a57ee..9466352d3 100644 --- a/theme_kiddo/static/src/js/tour.js +++ b/theme_kiddo/static/src/js/tour.js @@ -6,22 +6,27 @@ const snippets = [ { id: 's_banner', name: 'Banner', + groupName: "Intro", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_product_list', name: 'Items', + groupName: "Content", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_loftspace/static/src/js/tour.js b/theme_loftspace/static/src/js/tour.js index 3b2eda4a2..522cc6bd6 100644 --- a/theme_loftspace/static/src/js/tour.js +++ b/theme_loftspace/static/src/js/tour.js @@ -6,22 +6,27 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_images_wall', name: 'Images Wall', + groupName: "Images", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_monglia/static/src/js/tour.js b/theme_monglia/static/src/js/tour.js index 37edeb394..2ca133892 100644 --- a/theme_monglia/static/src/js/tour.js +++ b/theme_monglia/static/src/js/tour.js @@ -6,34 +6,42 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_text_block', name: 'Text', + groupName: "Text", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { - id: 's_image_wall', + id: 's_images_wall', name: 'Images Wall', + groupName: "Images", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_media_list', name: 'Media List', + groupName: "Content", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, ]; diff --git a/theme_nano/static/src/js/tour.js b/theme_nano/static/src/js/tour.js index 5f372b7fd..710b43ce7 100644 --- a/theme_nano/static/src/js/tour.js +++ b/theme_nano/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_features', name: 'Features', + groupName: "Content", }, { id: 's_text_block', name: 'Text', + groupName: "Text", }, { id: 's_images_wall', name: 'Images Wall', + groupName: "Images", }, { id: 's_parallax', name: 'Parallax', + groupName: "Images", }, { id: 's_references', name: 'References', + groupName: "People", }, ]; diff --git a/theme_notes/static/src/js/tour.js b/theme_notes/static/src/js/tour.js index 9dc2001c8..de350e5c7 100644 --- a/theme_notes/static/src/js/tour.js +++ b/theme_notes/static/src/js/tour.js @@ -7,26 +7,32 @@ const snippets = [ { id: 's_carousel', name: 'Carousel', + groupName: "Intro", }, { id: 's_masonry_block', name: 'Masonry', + groupName: "Images", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_product_catalog', name: 'Pricelist', + groupName: "Content", }, { id: 's_media_list', name: 'Media List', + groupName: "Content", }, { id: 's_company_team', name: 'Team', + groupName: "People", }, ]; diff --git a/theme_odoo_experts/static/src/js/tour.js b/theme_odoo_experts/static/src/js/tour.js index 392a03f29..24346889a 100644 --- a/theme_odoo_experts/static/src/js/tour.js +++ b/theme_odoo_experts/static/src/js/tour.js @@ -7,30 +7,37 @@ const snippets = [ { id: 's_picture', name: 'Title - Image', + groupName: "Images", }, { id: 's_references', name: 'References', + groupName: "People", }, { id: 's_text_image', name: 'Image - Text', + groupName: "Content", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_comparisons', name: 'Comparisons', + groupName: "Content", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_orchid/static/src/js/tour.js b/theme_orchid/static/src/js/tour.js index fdacb7e26..0ab9bd536 100644 --- a/theme_orchid/static/src/js/tour.js +++ b/theme_orchid/static/src/js/tour.js @@ -7,26 +7,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_quotes_carousel', name: 'Quotes', + groupName: "People", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_paptic/static/src/js/tour.js b/theme_paptic/static/src/js/tour.js index f219b0e07..f30bfffe5 100644 --- a/theme_paptic/static/src/js/tour.js +++ b/theme_paptic/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { id: 's_references', name: 'References', + groupName: "People", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_comparisons', name: 'Comparisons', + groupName: "Content", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_real_estate/static/src/js/tour.js b/theme_real_estate/static/src/js/tour.js index bad4859e1..b2a6ea498 100644 --- a/theme_real_estate/static/src/js/tour.js +++ b/theme_real_estate/static/src/js/tour.js @@ -6,42 +6,52 @@ const snippets = [ { id: 's_banner', name: 'Banner', + groupName: "Intro", }, { id: 's_text_block', name: 'Text', + groupName: "Text", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { - id: 's_title:last-child', + id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_masonry_block', name: 'Masonry', + groupName: "Images", }, { id: 's_numbers', name: 'Numbers', + groupName: "Content", }, { id: 's_quotes_carousel', name: 'Quotes', + groupName: "People", }, ]; diff --git a/theme_treehouse/static/src/js/tour.js b/theme_treehouse/static/src/js/tour.js index 854f53b03..0f55f6c68 100644 --- a/theme_treehouse/static/src/js/tour.js +++ b/theme_treehouse/static/src/js/tour.js @@ -6,22 +6,27 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_vehicle/static/src/js/tour.js b/theme_vehicle/static/src/js/tour.js index c33a947d9..66fdfb466 100644 --- a/theme_vehicle/static/src/js/tour.js +++ b/theme_vehicle/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_text_image', name: 'Text - Image', + groupName: "Content", }, { id: 's_image_text', name: 'Image - Text', + groupName: "Content", }, { id: 's_picture', name: 'Title - Image', + groupName: "Images", }, { id: 's_masonry_block', name: 'Masonry', + groupName: "Images", }, { id: 's_call_to_action', name: 'Call to Action', + groupName: "Content", }, ]; diff --git a/theme_yes/static/src/js/tour.js b/theme_yes/static/src/js/tour.js index 15ef02ce7..e1e4b7bf0 100644 --- a/theme_yes/static/src/js/tour.js +++ b/theme_yes/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_cover', name: 'Cover', + groupName: "Intro", }, { id: 's_title', name: 'Title', + groupName: "Text", }, { id: 's_company_team', name: 'Team', + groupName: "People", }, { id: 's_media_list', name: 'Media List', + groupName: "Content", }, { id: 's_images_wall', name: 'Images Wall', + groupName: "Images", }, { id: 's_quotes_carousel', name: 'Quotes', + groupName: "People", }, ]; diff --git a/theme_zap/static/src/js/tour.js b/theme_zap/static/src/js/tour.js index c9b0ac4c7..e3db5892d 100644 --- a/theme_zap/static/src/js/tour.js +++ b/theme_zap/static/src/js/tour.js @@ -6,26 +6,32 @@ const snippets = [ { id: 's_banner', name: 'Banner', + groupName: "Intro", }, { id: 's_three_columns', name: 'Columns', + groupName: "Content", }, { id: 's_color_blocks_2', name: 'Big Boxes', + groupName: "Content", }, { id: 's_features', name: 'Features', + groupName: "Content", }, { id: 's_masonry_block', name: 'Masonry', + groupName: "Images", }, { id: 's_references', name: 'References', + groupName: "People", }, ];