From f66833de41f757c65ecf660f7bbc033b6dc64d6a Mon Sep 17 00:00:00 2001 From: Brieuc-brd Date: Wed, 17 Jul 2024 20:52:53 +0200 Subject: [PATCH] [IMP] test_themes, *: carousels adaptations *: theme_anelusia, theme_artists, theme_avantgarde, theme_cobalt, theme_cobalt, theme_enark, theme_loftspace, theme_notes, theme_odoo_experts, theme_bewise, theme_bistro, theme_buzzy, theme_clean, theme_graphene, theme_nano, theme_treehouse, theme_yes, theme_aviato, theme_beauty, theme_bookstore, theme_kea, theme_kiddo, theme_monglia, theme_orchid, theme_paptic, theme_real_estate, theme_vehicle, theme_zap This commit adapts the customizations related to `s_carousel`, s_image_gallery` and `s_quotes_carousel` since these snippets has been redesigned in PR[1]. task-3654328 Part of task-3619705 [1]: https://github.com/odoo/odoo/pull/172727 closes odoo/design-themes#836 Related: odoo/odoo#172727 Signed-off-by: Benoit Socias (bso) --- test_themes/tests/test_new_page_templates.py | 10 ++- theme_anelusia/__manifest__.py | 1 + theme_anelusia/views/snippets/s_carousel.xml | 16 ++++ .../views/snippets/s_image_gallery.xml | 8 +- .../views/snippets/s_quotes_carousel.xml | 6 +- theme_artists/views/snippets/s_carousel.xml | 10 +-- .../views/snippets/s_image_gallery.xml | 6 +- .../src/img/pictures/library_image_02.jpg | Bin 0 -> 52063 bytes .../src/img/pictures/library_image_03.jpg | Bin 0 -> 33699 bytes .../src/img/pictures/library_image_08.jpg | Bin 0 -> 36134 bytes theme_avantgarde/views/customizations.xml | 34 ++++++-- theme_avantgarde/views/images_library.xml | 15 ++++ theme_aviato/__manifest__.py | 1 + theme_aviato/views/snippets/s_carousel.xml | 10 +++ .../views/snippets/s_quotes_carousel.xml | 9 +- theme_beauty/__manifest__.py | 1 + theme_beauty/views/snippets/s_carousel.xml | 10 +++ theme_bewise/views/customizations.xml | 23 +++-- theme_bistro/__manifest__.py | 1 + theme_bistro/views/snippets/s_carousel.xml | 16 ++++ theme_bookstore/__manifest__.py | 1 + theme_bookstore/views/snippets/s_carousel.xml | 16 ++++ .../views/snippets/s_quotes_carousel.xml | 3 + theme_buzzy/__manifest__.py | 1 + .../img/photos/s_carousel_default_image_3.jpg | Bin 66862 -> 66877 bytes theme_buzzy/views/snippets/s_carousel.xml | 16 ++++ .../views/snippets/s_image_gallery.xml | 2 +- .../views/snippets/s_quotes_carousel.xml | 4 +- .../src/img/content/image_content_39.jpg | Bin 0 -> 48308 bytes theme_clean/views/image_content.xml | 10 +-- theme_clean/views/snippets/s_carousel.xml | 81 ++++++++---------- theme_cobalt/views/customizations.xml | 15 ++-- theme_enark/__manifest__.py | 1 + theme_enark/views/snippets/s_carousel.xml | 16 ++++ .../views/snippets/s_image_gallery.xml | 6 +- .../static/src/img/pictures/content_26.jpg | Bin 0 -> 31132 bytes .../static/src/img/pictures/content_27.jpg | Bin 0 -> 32207 bytes theme_graphene/views/customizations.xml | 12 +++ theme_graphene/views/images_library.xml | 11 +++ theme_kea/__manifest__.py | 2 + theme_kea/views/snippets/s_carousel.xml | 10 +++ .../views/snippets/s_quotes_carousel.xml | 10 +++ theme_kiddo/__manifest__.py | 1 + .../static/src/img/content/content_img_22.jpg | Bin 111081 -> 89020 bytes theme_kiddo/views/snippets/s_carousel.xml | 13 +++ theme_loftspace/__manifest__.py | 1 + .../src/img/snippets/s_images_gallery_1.jpg | Bin 0 -> 49869 bytes .../src/img/snippets/s_images_gallery_2.jpg | Bin 0 -> 32941 bytes theme_loftspace/views/images_content.xml | 10 +++ theme_loftspace/views/snippets/s_carousel.xml | 16 ++++ .../views/snippets/s_image_gallery.xml | 8 +- .../src/img/snippets/s_images_gallery_1.jpg | Bin 0 -> 22606 bytes .../src/img/snippets/s_images_gallery_2.jpg | Bin 0 -> 20301 bytes .../src/img/snippets/s_quotes_carousel_0.jpg | Bin 0 -> 91723 bytes theme_monglia/views/customizations.xml | 9 ++ theme_monglia/views/images_content.xml | 21 +++++ .../src/img/snippets/s_images_gallery_01.jpg | Bin 0 -> 50620 bytes .../src/img/snippets/s_images_gallery_02.jpg | Bin 0 -> 20719 bytes theme_nano/views/images_library.xml | 10 +++ theme_nano/views/snippets/s_carousel.xml | 2 +- theme_notes/views/snippets/s_carousel.xml | 15 ++-- .../views/snippets/s_image_gallery.xml | 6 +- .../views/snippets/s_quotes_carousel.xml | 7 +- theme_odoo_experts/__manifest__.py | 1 + .../views/snippets/s_carousel.xml | 16 ++++ .../views/snippets/s_image_gallery.xml | 6 +- .../views/snippets/s_quotes_carousel.xml | 6 +- .../static/src/img/snippets/s_carousel_3.jpg | Bin 46855 -> 56195 bytes .../views/snippets/s_quotes_carousel.xml | 2 +- .../src/img/pictures/s_images_gallery_1.jpg | Bin 0 -> 21718 bytes .../src/img/pictures/s_images_gallery_2.jpg | Bin 0 -> 29559 bytes .../src/img/pictures/s_images_gallery_3.jpg | Bin 0 -> 39754 bytes theme_paptic/views/customizations.xml | 16 ++-- theme_paptic/views/images.xml | 17 ++++ theme_real_estate/__manifest__.py | 1 + .../src/img/snippets/s_images_gallery_1.jpg | Bin 0 -> 32582 bytes .../src/img/snippets/s_images_gallery_2.jpg | Bin 0 -> 38936 bytes theme_real_estate/views/images.xml | 10 +++ .../views/snippets/s_carousel.xml | 13 +++ theme_treehouse/views/snippets/s_carousel.xml | 8 +- .../src/img/snippets/s_quotes_carousel_0.jpg | Bin 0 -> 97348 bytes theme_vehicle/views/customizations.xml | 14 +++ theme_vehicle/views/images.xml | 5 ++ theme_yes/views/snippets/s_carousel.xml | 25 +----- theme_yes/views/snippets/s_image_gallery.xml | 7 +- .../views/snippets/s_quotes_carousel.xml | 7 +- .../img/backgrounds/s_images_gallery_1.jpg | Bin 0 -> 48841 bytes .../img/backgrounds/s_images_gallery_2.jpg | Bin 0 -> 29919 bytes theme_zap/views/images_library.xml | 10 +++ 89 files changed, 495 insertions(+), 182 deletions(-) create mode 100644 theme_anelusia/views/snippets/s_carousel.xml create mode 100644 theme_avantgarde/static/src/img/pictures/library_image_02.jpg create mode 100644 theme_avantgarde/static/src/img/pictures/library_image_03.jpg create mode 100644 theme_avantgarde/static/src/img/pictures/library_image_08.jpg create mode 100644 theme_aviato/views/snippets/s_carousel.xml create mode 100644 theme_beauty/views/snippets/s_carousel.xml create mode 100644 theme_bistro/views/snippets/s_carousel.xml create mode 100644 theme_bookstore/views/snippets/s_carousel.xml create mode 100644 theme_buzzy/views/snippets/s_carousel.xml create mode 100644 theme_clean/static/src/img/content/image_content_39.jpg create mode 100644 theme_enark/views/snippets/s_carousel.xml create mode 100644 theme_graphene/static/src/img/pictures/content_26.jpg create mode 100644 theme_graphene/static/src/img/pictures/content_27.jpg create mode 100644 theme_kea/views/snippets/s_carousel.xml create mode 100644 theme_kea/views/snippets/s_quotes_carousel.xml create mode 100644 theme_kiddo/views/snippets/s_carousel.xml create mode 100644 theme_loftspace/static/src/img/snippets/s_images_gallery_1.jpg create mode 100644 theme_loftspace/static/src/img/snippets/s_images_gallery_2.jpg create mode 100644 theme_loftspace/views/snippets/s_carousel.xml create mode 100644 theme_monglia/static/src/img/snippets/s_images_gallery_1.jpg create mode 100644 theme_monglia/static/src/img/snippets/s_images_gallery_2.jpg create mode 100644 theme_monglia/static/src/img/snippets/s_quotes_carousel_0.jpg create mode 100644 theme_nano/static/src/img/snippets/s_images_gallery_01.jpg create mode 100644 theme_nano/static/src/img/snippets/s_images_gallery_02.jpg create mode 100644 theme_odoo_experts/views/snippets/s_carousel.xml create mode 100644 theme_paptic/static/src/img/pictures/s_images_gallery_1.jpg create mode 100644 theme_paptic/static/src/img/pictures/s_images_gallery_2.jpg create mode 100644 theme_paptic/static/src/img/pictures/s_images_gallery_3.jpg create mode 100644 theme_real_estate/static/src/img/snippets/s_images_gallery_1.jpg create mode 100644 theme_real_estate/static/src/img/snippets/s_images_gallery_2.jpg create mode 100644 theme_real_estate/views/snippets/s_carousel.xml create mode 100644 theme_vehicle/static/src/img/snippets/s_quotes_carousel_0.jpg create mode 100644 theme_zap/static/src/img/backgrounds/s_images_gallery_1.jpg create mode 100644 theme_zap/static/src/img/backgrounds/s_images_gallery_2.jpg diff --git a/test_themes/tests/test_new_page_templates.py b/test_themes/tests/test_new_page_templates.py index 4915d6dab..f270040d3 100644 --- a/test_themes/tests/test_new_page_templates.py +++ b/test_themes/tests/test_new_page_templates.py @@ -29,7 +29,7 @@ CONFLICTUAL_CLASSES = [ ['o_spc-medium', 'o_spc-none', 'o_spc-small'], ['oi-arrows-h', 'oi-arrows-v', 'oi-chevron-left', 'oi-chevron-right', 'oi-search'], ['position-absolute', 'position-relative'], - ['s_carousel_bordered', 's_carousel_default', 's_carousel_rounded'], + ['s_carousel_default', 's_carousel_rounded'], ['s_image_gallery_indicators_arrows_boxed', 's_image_gallery_indicators_arrows_rounded'], ['text-center', 'text-end', 'text-start'], ] @@ -76,13 +76,15 @@ CONFLICTUAL_CLASSES_RE = { re.compile(r'^s_.*'): [ 's_alert_md', 's_blockquote_with_icon', 's_blockquote', - 's_carousel_bordered', 's_carousel_default', 's_carousel_rounded', + 's_carousel_default', 's_carousel_rounded', 's_carousel_boxed', + 's_carousel_indicators_dots', 's_carousel_indicators_hidden', 's_carousel_controllers_indicators_outside', + 's_quotes_carousel', 's_dynamic', 's_dynamic_empty', 's_dynamic_snippet_blog_posts', 's_blog_posts_effect_marley', 's_blog_post_big_picture', 's_col_no_bgcolor', 's_col_no_resize', 's_event_upcoming_snippet', - 's_image_gallery_cover', 's_image_gallery_indicators_arrows_boxed', 's_image_gallery_indicators_arrows_rounded', - 's_image_gallery_indicators_dots', 's_image_gallery_indicators_rounded', 's_image_gallery_show_indicators', + 's_image_gallery', 's_image_gallery_indicators_arrows_boxed', 's_image_gallery_indicators_arrows_rounded', + 's_image_gallery_indicators_dots', 's_image_gallery_indicators_squared', 's_image_gallery_indicators_rounded', 's_image_gallery_indicators_hidden', 's_image_gallery_indicators_bars', 's_image_gallery_indicators_outside','s_image_gallery_controllers_outside_arrows_right', 's_image_gallery_controllers_outside', 's_newsletter_list', 's_newsletter_subscribe_form', 's_parallax_is_fixed', 's_parallax_no_overflow_hidden', 's_process_steps_connector_line', diff --git a/theme_anelusia/__manifest__.py b/theme_anelusia/__manifest__.py index d7dfd7b14..6611b1529 100644 --- a/theme_anelusia/__manifest__.py +++ b/theme_anelusia/__manifest__.py @@ -16,6 +16,7 @@ 'views/snippets/s_company_team.xml', 'views/snippets/s_cover.xml', 'views/snippets/s_image_gallery.xml', + 'views/snippets/s_carousel.xml', 'views/snippets/s_media_list.xml', 'views/snippets/s_text_cover.xml', 'views/snippets/s_color_blocks_2.xml', diff --git a/theme_anelusia/views/snippets/s_carousel.xml b/theme_anelusia/views/snippets/s_carousel.xml new file mode 100644 index 000000000..e3e48f666 --- /dev/null +++ b/theme_anelusia/views/snippets/s_carousel.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/theme_anelusia/views/snippets/s_image_gallery.xml b/theme_anelusia/views/snippets/s_image_gallery.xml index a632758f2..0efd933cc 100644 --- a/theme_anelusia/views/snippets/s_image_gallery.xml +++ b/theme_anelusia/views/snippets/s_image_gallery.xml @@ -15,18 +15,14 @@ diff --git a/theme_anelusia/views/snippets/s_quotes_carousel.xml b/theme_anelusia/views/snippets/s_quotes_carousel.xml index e7d7ac45b..5a3f1a7da 100644 --- a/theme_anelusia/views/snippets/s_quotes_carousel.xml +++ b/theme_anelusia/views/snippets/s_quotes_carousel.xml @@ -3,15 +3,15 @@ diff --git a/theme_artists/views/snippets/s_carousel.xml b/theme_artists/views/snippets/s_carousel.xml index f43871e1a..f2ed5a0c1 100644 --- a/theme_artists/views/snippets/s_carousel.xml +++ b/theme_artists/views/snippets/s_carousel.xml @@ -2,14 +2,6 @@