From 84ba083d172d0adb96b389aa8f49489fbb60c253 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Mon, 10 May 2021 15:46:42 +0200 Subject: [PATCH] [ADD] theme saas-14.3 --- test_themes/__manifest__.py | 6 +- test_themes/tests/test_crawl.py | 15 +- test_themes/views/assets.xml | 10 - theme_anelusia/__manifest__.py | 12 +- theme_anelusia/data/ir_asset.xml | 69 +++ theme_anelusia/models/theme_anelusia.py | 2 +- .../static/src/scss/primary_variables.scss | 191 +++---- theme_anelusia/views/assets.xml | 23 - .../views/old_snippets/s_banner_parallax.xml | 16 - .../old_snippets/s_features_carousel.xml | 10 - .../old_snippets/s_products_carousel.xml | 16 - theme_artists/__manifest__.py | 11 +- theme_artists/data/ir_asset.xml | 37 ++ theme_artists/models/theme_artists.py | 5 +- .../static/src/scss/primary_variables.scss | 97 ++-- theme_artists/views/assets.xml | 18 - .../views/old_snippets/s_banner_parallax.xml | 10 - .../old_snippets/s_products_carousel.xml | 10 - theme_avantgarde/__manifest__.py | 11 +- theme_avantgarde/data/ir_asset.xml | 36 ++ theme_avantgarde/models/theme_avantgarde.py | 5 +- .../static/src/scss/primary_variables.scss | 307 ++++------- theme_avantgarde/views/assets.xml | 20 - .../views/old_snippets/s_css_slider.xml | 10 - .../views/old_snippets/s_showcase_slider.xml | 10 - theme_beauty/__manifest__.py | 10 +- theme_beauty/data/ir_asset.xml | 37 ++ .../static/src/scss/primary_variables.scss | 101 ++-- theme_beauty/views/assets.xml | 23 - .../views/old_snippets/s_banner_parallax.xml | 10 - theme_bewise/__manifest__.py | 13 +- theme_bewise/data/ir_asset.xml | 45 ++ theme_bewise/models/theme_bewise.py | 5 +- .../static/src/scss/primary_variables.scss | 140 +++--- theme_bewise/views/assets.xml | 15 - .../views/old_snippets/s_big_icons.xml | 10 - .../views/old_snippets/s_big_image.xml | 10 - .../old_snippets/s_big_image_parallax.xml | 10 - .../views/old_snippets/s_icon_box.xml | 10 - theme_bistro/__manifest__.py | 9 +- theme_bistro/data/ir_asset.xml | 21 + theme_bistro/models/theme_bistro.py | 3 +- .../static/src/scss/primary_variables.scss | 230 +++------ theme_bistro/views/assets.xml | 18 - theme_bookstore/__manifest__.py | 10 +- theme_bookstore/data/ir_asset.xml | 29 ++ .../static/src/scss/primary_variables.scss | 120 ++--- theme_bookstore/views/assets.xml | 23 - theme_bookstore/views/snippets/s_cover.xml | 13 + theme_clean/__manifest__.py | 7 +- theme_clean/data/ir_asset.xml | 21 + .../static/src/scss/primary_variables.scss | 214 ++++---- theme_clean/views/assets.xml | 18 - theme_cobalt/__manifest__.py | 9 +- theme_cobalt/data/ir_asset.xml | 22 + theme_cobalt/models/theme_cobalt.py | 5 +- .../static/src/img/pictures/s_banner.jpg | Bin 209114 -> 216873 bytes .../static/src/scss/primary_variables.scss | 49 +- theme_cobalt/views/assets.xml | 20 - theme_cobalt/views/customizations.xml | 45 +- theme_common/__manifest__.py | 37 +- theme_common/data/ir_asset.xml | 476 ++++++++++++++++++ theme_common/models/theme_common.py | 13 +- .../colors/option_colors_02_variables.scss | 2 - .../colors/option_colors_03_variables.scss | 2 - .../colors/option_colors_04_variables.scss | 2 - .../colors/option_colors_05_variables.scss | 2 - .../colors/option_colors_06_variables.scss | 2 - .../colors/option_colors_07_variables.scss | 2 - .../colors/option_colors_08_variables.scss | 2 - .../colors/option_colors_09_variables.scss | 2 - theme_common/views/assets.xml | 49 -- .../views/old_snippets/s_animated_boxes.xml | 16 - .../views/old_snippets/s_banner_parallax.xml | 16 - .../views/old_snippets/s_big_icons.xml | 16 - .../views/old_snippets/s_big_image.xml | 10 - .../old_snippets/s_big_image_parallax.xml | 10 - .../views/old_snippets/s_clonable_boxes.xml | 10 - .../views/old_snippets/s_color_blocks_4.xml | 10 - .../views/old_snippets/s_color_blocks_img.xml | 10 - .../views/old_snippets/s_compact_menu.xml | 10 - .../views/old_snippets/s_css_slider.xml | 22 - .../views/old_snippets/s_discount.xml | 16 - .../views/old_snippets/s_event_list.xml | 16 - .../views/old_snippets/s_event_slide.xml | 10 - .../old_snippets/s_features_carousel.xml | 16 - .../views/old_snippets/s_full_menu.xml | 10 - .../s_header_text_big_picture.xml | 10 - .../views/old_snippets/s_icon_box.xml | 10 - .../views/old_snippets/s_images_carousel.xml | 10 - .../views/old_snippets/s_images_row.xml | 10 - .../old_snippets/s_menu_three_columns.xml | 10 - .../views/old_snippets/s_mini_nav_bar.xml | 16 - .../views/old_snippets/s_news_carousel.xml | 10 - theme_common/views/old_snippets/s_pricing.xml | 10 - .../old_snippets/s_products_carousel.xml | 16 - theme_common/views/old_snippets/s_profile.xml | 10 - .../views/old_snippets/s_progress.xml | 10 - .../views/old_snippets/s_separator_nav.xml | 10 - .../views/old_snippets/s_showcase_image.xml | 16 - .../views/old_snippets/s_showcase_slider.xml | 22 - .../views/old_snippets/s_team_profiles.xml | 10 - .../old_snippets/s_text_picture_text.xml | 10 - .../views/old_snippets/s_two_columns.xml | 10 - theme_common/views/theme_common_templates.xml | 46 -- theme_enark/__manifest__.py | 13 +- theme_enark/data/ir_asset.xml | 53 ++ .../static/src/scss/primary_variables.scss | 199 +++----- theme_enark/views/assets.xml | 18 - .../views/old_snippets/s_big_icons.xml | 10 - .../views/old_snippets/s_big_image.xml | 10 - .../old_snippets/s_big_image_parallax.xml | 10 - theme_enark/views/old_snippets/s_icon_box.xml | 10 - theme_graphene/__manifest__.py | 12 +- theme_graphene/data/ir_asset.xml | 29 ++ theme_graphene/models/theme_graphene.py | 5 +- .../static/src/scss/primary_variables.scss | 180 +++---- .../static/src/scss/secondary_variables.scss | 4 +- theme_graphene/views/assets.xml | 20 - .../views/old_snippets/s_showcase_slider.xml | 10 - theme_kea/__manifest__.py | 11 +- theme_kea/data/ir_asset.xml | 52 ++ theme_kea/models/theme_kea.py | 2 +- .../static/src/scss/primary_variables.scss | 187 +++---- theme_kea/views/assets.xml | 28 -- .../views/old_snippets/s_banner_parallax.xml | 10 - .../old_snippets/s_features_carousel.xml | 10 - theme_kiddo/__manifest__.py | 12 +- theme_kiddo/data/ir_asset.xml | 36 ++ theme_kiddo/models/theme_kiddo.py | 2 +- .../static/description/kiddo_screenshot.jpg | Bin 72259 -> 84071 bytes .../static/src/scss/primary_variables.scss | 189 ++++--- theme_kiddo/views/assets.xml | 23 - theme_kiddo/views/old_snippets/s_discount.xml | 10 - theme_kiddo/views/snippets/s_image_text.xml | 16 +- theme_loftspace/__manifest__.py | 12 +- theme_loftspace/data/ir_asset.xml | 60 +++ theme_loftspace/models/theme_loftspace.py | 2 +- .../static/src/scss/primary_variables.scss | 198 +++----- theme_loftspace/views/assets.xml | 28 -- .../views/old_snippets/s_banner_parallax.xml | 10 - .../old_snippets/s_features_carousel.xml | 10 - .../old_snippets/s_products_carousel.xml | 10 - theme_monglia/__manifest__.py | 13 +- theme_monglia/data/ir_asset.xml | 60 +++ theme_monglia/models/theme_monglia.py | 2 +- .../static/src/scss/primary_variables.scss | 180 +++---- theme_monglia/views/assets.xml | 26 - .../views/old_snippets/s_banner_parallax.xml | 10 - .../views/old_snippets/s_big_icons.xml | 10 - .../old_snippets/s_features_carousel.xml | 10 - .../old_snippets/s_products_carousel.xml | 10 - theme_nano/__manifest__.py | 9 +- theme_nano/data/ir_asset.xml | 21 + theme_nano/models/theme_nano.py | 3 +- .../static/src/scss/primary_variables.scss | 217 +++----- theme_nano/views/assets.xml | 18 - theme_notes/__manifest__.py | 11 +- theme_notes/data/ir_asset.xml | 52 ++ theme_notes/models/theme_notes.py | 2 +- .../static/src/scss/primary_variables.scss | 185 +++---- theme_notes/views/assets.xml | 28 -- .../views/old_snippets/s_banner_parallax.xml | 10 - .../old_snippets/s_features_carousel.xml | 10 - theme_odoo_experts/__manifest__.py | 10 +- theme_odoo_experts/data/ir_asset.xml | 29 ++ .../static/src/scss/primary_variables.scss | 84 +--- theme_odoo_experts/views/assets.xml | 18 - .../views/old_snippets/s_banner_parallax.xml | 10 - theme_orchid/__manifest__.py | 7 +- theme_orchid/data/ir_asset.xml | 21 + .../static/src/scss/primary_variables.scss | 94 ++-- theme_orchid/views/assets.xml | 18 - theme_paptic/__manifest__.py | 9 +- theme_paptic/data/ir_asset.xml | 22 + theme_paptic/models/theme_paptic.py | 5 +- .../static/src/scss/primary_variables.scss | 56 +-- theme_paptic/views/assets.xml | 20 - theme_real_estate/__manifest__.py | 7 +- theme_real_estate/data/ir_asset.xml | 21 + theme_real_estate/models/theme_real_estate.py | 5 +- .../static/src/scss/primary_variables.scss | 79 +-- theme_real_estate/views/assets.xml | 18 - theme_treehouse/__manifest__.py | 11 +- theme_treehouse/data/ir_asset.xml | 37 ++ theme_treehouse/models/theme_treehouse.py | 3 +- .../static/src/scss/primary_variables.scss | 223 +++----- theme_treehouse/views/assets.xml | 18 - .../views/old_snippets/s_images_carousel.xml | 10 - .../views/old_snippets/s_images_row.xml | 10 - theme_vehicle/__manifest__.py | 7 +- theme_vehicle/data/ir_asset.xml | 21 + theme_vehicle/models/theme_vehicle.py | 2 +- .../static/src/scss/primary_variables.scss | 159 +++--- theme_vehicle/views/assets.xml | 21 - theme_yes/__manifest__.py | 11 +- theme_yes/data/ir_asset.xml | 37 ++ .../static/src/scss/primary_variables.scss | 72 +-- theme_yes/views/assets.xml | 18 - .../views/old_snippets/s_banner_parallax.xml | 10 - .../old_snippets/s_products_carousel.xml | 10 - theme_zap/__manifest__.py | 9 +- theme_zap/data/ir_asset.xml | 21 + theme_zap/models/theme_zap.py | 3 +- .../static/src/scss/primary_variables.scss | 224 +++------ theme_zap/views/assets.xml | 18 - website_animate/__manifest__.py | 10 +- website_animate/views/assets.xml | 17 - 208 files changed, 3170 insertions(+), 4050 deletions(-) delete mode 100644 test_themes/views/assets.xml create mode 100644 theme_anelusia/data/ir_asset.xml delete mode 100644 theme_anelusia/views/assets.xml delete mode 100644 theme_anelusia/views/old_snippets/s_banner_parallax.xml delete mode 100644 theme_anelusia/views/old_snippets/s_features_carousel.xml delete mode 100644 theme_anelusia/views/old_snippets/s_products_carousel.xml create mode 100644 theme_artists/data/ir_asset.xml delete mode 100644 theme_artists/views/assets.xml delete mode 100644 theme_artists/views/old_snippets/s_banner_parallax.xml delete mode 100644 theme_artists/views/old_snippets/s_products_carousel.xml create mode 100644 theme_avantgarde/data/ir_asset.xml delete mode 100644 theme_avantgarde/views/assets.xml delete mode 100644 theme_avantgarde/views/old_snippets/s_css_slider.xml delete mode 100644 theme_avantgarde/views/old_snippets/s_showcase_slider.xml create mode 100644 theme_beauty/data/ir_asset.xml delete mode 100644 theme_beauty/views/assets.xml delete mode 100644 theme_beauty/views/old_snippets/s_banner_parallax.xml create mode 100644 theme_bewise/data/ir_asset.xml delete mode 100644 theme_bewise/views/assets.xml delete mode 100644 theme_bewise/views/old_snippets/s_big_icons.xml delete mode 100644 theme_bewise/views/old_snippets/s_big_image.xml delete mode 100644 theme_bewise/views/old_snippets/s_big_image_parallax.xml delete mode 100644 theme_bewise/views/old_snippets/s_icon_box.xml create mode 100644 theme_bistro/data/ir_asset.xml delete mode 100644 theme_bistro/views/assets.xml create mode 100644 theme_bookstore/data/ir_asset.xml delete mode 100644 theme_bookstore/views/assets.xml create mode 100644 theme_bookstore/views/snippets/s_cover.xml create mode 100644 theme_clean/data/ir_asset.xml delete mode 100644 theme_clean/views/assets.xml create mode 100644 theme_cobalt/data/ir_asset.xml delete mode 100644 theme_cobalt/views/assets.xml create mode 100644 theme_common/data/ir_asset.xml delete mode 100644 theme_common/views/assets.xml delete mode 100644 theme_common/views/old_snippets/s_animated_boxes.xml delete mode 100644 theme_common/views/old_snippets/s_banner_parallax.xml delete mode 100644 theme_common/views/old_snippets/s_big_icons.xml delete mode 100644 theme_common/views/old_snippets/s_big_image.xml delete mode 100644 theme_common/views/old_snippets/s_big_image_parallax.xml delete mode 100644 theme_common/views/old_snippets/s_clonable_boxes.xml delete mode 100644 theme_common/views/old_snippets/s_color_blocks_4.xml delete mode 100644 theme_common/views/old_snippets/s_color_blocks_img.xml delete mode 100644 theme_common/views/old_snippets/s_compact_menu.xml delete mode 100644 theme_common/views/old_snippets/s_css_slider.xml delete mode 100644 theme_common/views/old_snippets/s_discount.xml delete mode 100644 theme_common/views/old_snippets/s_event_list.xml delete mode 100644 theme_common/views/old_snippets/s_event_slide.xml delete mode 100644 theme_common/views/old_snippets/s_features_carousel.xml delete mode 100644 theme_common/views/old_snippets/s_full_menu.xml delete mode 100644 theme_common/views/old_snippets/s_header_text_big_picture.xml delete mode 100644 theme_common/views/old_snippets/s_icon_box.xml delete mode 100644 theme_common/views/old_snippets/s_images_carousel.xml delete mode 100644 theme_common/views/old_snippets/s_images_row.xml delete mode 100644 theme_common/views/old_snippets/s_menu_three_columns.xml delete mode 100644 theme_common/views/old_snippets/s_mini_nav_bar.xml delete mode 100644 theme_common/views/old_snippets/s_news_carousel.xml delete mode 100644 theme_common/views/old_snippets/s_pricing.xml delete mode 100644 theme_common/views/old_snippets/s_products_carousel.xml delete mode 100644 theme_common/views/old_snippets/s_profile.xml delete mode 100644 theme_common/views/old_snippets/s_progress.xml delete mode 100644 theme_common/views/old_snippets/s_separator_nav.xml delete mode 100644 theme_common/views/old_snippets/s_showcase_image.xml delete mode 100644 theme_common/views/old_snippets/s_showcase_slider.xml delete mode 100644 theme_common/views/old_snippets/s_team_profiles.xml delete mode 100644 theme_common/views/old_snippets/s_text_picture_text.xml delete mode 100644 theme_common/views/old_snippets/s_two_columns.xml delete mode 100644 theme_common/views/theme_common_templates.xml create mode 100644 theme_enark/data/ir_asset.xml delete mode 100644 theme_enark/views/assets.xml delete mode 100644 theme_enark/views/old_snippets/s_big_icons.xml delete mode 100644 theme_enark/views/old_snippets/s_big_image.xml delete mode 100644 theme_enark/views/old_snippets/s_big_image_parallax.xml delete mode 100644 theme_enark/views/old_snippets/s_icon_box.xml create mode 100644 theme_graphene/data/ir_asset.xml delete mode 100644 theme_graphene/views/assets.xml delete mode 100644 theme_graphene/views/old_snippets/s_showcase_slider.xml create mode 100644 theme_kea/data/ir_asset.xml delete mode 100644 theme_kea/views/assets.xml delete mode 100644 theme_kea/views/old_snippets/s_banner_parallax.xml delete mode 100644 theme_kea/views/old_snippets/s_features_carousel.xml create mode 100644 theme_kiddo/data/ir_asset.xml delete mode 100644 theme_kiddo/views/assets.xml delete mode 100644 theme_kiddo/views/old_snippets/s_discount.xml create mode 100644 theme_loftspace/data/ir_asset.xml delete mode 100644 theme_loftspace/views/assets.xml delete mode 100644 theme_loftspace/views/old_snippets/s_banner_parallax.xml delete mode 100644 theme_loftspace/views/old_snippets/s_features_carousel.xml delete mode 100644 theme_loftspace/views/old_snippets/s_products_carousel.xml create mode 100644 theme_monglia/data/ir_asset.xml delete mode 100644 theme_monglia/views/assets.xml delete mode 100644 theme_monglia/views/old_snippets/s_banner_parallax.xml delete mode 100644 theme_monglia/views/old_snippets/s_big_icons.xml delete mode 100644 theme_monglia/views/old_snippets/s_features_carousel.xml delete mode 100644 theme_monglia/views/old_snippets/s_products_carousel.xml create mode 100644 theme_nano/data/ir_asset.xml delete mode 100644 theme_nano/views/assets.xml create mode 100644 theme_notes/data/ir_asset.xml delete mode 100644 theme_notes/views/assets.xml delete mode 100644 theme_notes/views/old_snippets/s_banner_parallax.xml delete mode 100644 theme_notes/views/old_snippets/s_features_carousel.xml create mode 100644 theme_odoo_experts/data/ir_asset.xml delete mode 100644 theme_odoo_experts/views/assets.xml delete mode 100644 theme_odoo_experts/views/old_snippets/s_banner_parallax.xml create mode 100644 theme_orchid/data/ir_asset.xml delete mode 100644 theme_orchid/views/assets.xml create mode 100644 theme_paptic/data/ir_asset.xml delete mode 100644 theme_paptic/views/assets.xml create mode 100644 theme_real_estate/data/ir_asset.xml delete mode 100644 theme_real_estate/views/assets.xml create mode 100644 theme_treehouse/data/ir_asset.xml delete mode 100644 theme_treehouse/views/assets.xml delete mode 100644 theme_treehouse/views/old_snippets/s_images_carousel.xml delete mode 100644 theme_treehouse/views/old_snippets/s_images_row.xml create mode 100644 theme_vehicle/data/ir_asset.xml delete mode 100644 theme_vehicle/views/assets.xml create mode 100644 theme_yes/data/ir_asset.xml delete mode 100644 theme_yes/views/assets.xml delete mode 100644 theme_yes/views/old_snippets/s_banner_parallax.xml delete mode 100644 theme_yes/views/old_snippets/s_products_carousel.xml create mode 100644 theme_zap/data/ir_asset.xml delete mode 100644 theme_zap/views/assets.xml delete mode 100644 website_animate/views/assets.xml diff --git a/test_themes/__manifest__.py b/test_themes/__manifest__.py index dd855d815..6fa2e8998 100644 --- a/test_themes/__manifest__.py +++ b/test_themes/__manifest__.py @@ -40,10 +40,14 @@ 'theme_zap', ], 'data': [ - 'views/assets.xml', 'views/website_navbar_templates.xml', ], 'installable': True, 'application': False, 'post_init_hook': 'post_init_hook', + 'assets': { + 'web.assets_frontend': [ + 'test_themes/static/src/js/navbar.js', + ], + } } diff --git a/test_themes/tests/test_crawl.py b/test_themes/tests/test_crawl.py index 6d0c1591d..306157ef1 100644 --- a/test_themes/tests/test_crawl.py +++ b/test_themes/tests/test_crawl.py @@ -13,12 +13,23 @@ class Crawler(HttpCase): Website = self.env['website'] websites_themes = Website.get_test_themes_websites() assert len(websites_themes) == len(self.env.ref('base.module_test_themes').dependencies_id) + websites_themes_names = websites_themes.mapped('name') def test_crawling(): for website in websites_themes.filtered(lambda w: w.theme_id.name != 'theme_default'): + # Ensure theme is rendering without crashing r = self.url_open('/?fw=%s&debug=assets' % website.id) - self.assertEqual(r.status_code, 200, "Ensure rendering went fine as public user") - self.assertTrue('/%s/static/src' % website.theme_id.name in r.text, "Ensure rendering went fine as public user") + self.assertEqual(r.status_code, 200, "Ensure theme is rendering without crashing") + + # Ensure correct theme is actually loaded, see commit message + theme_asset_url = '/web/assets/debug/%s/web.assets_frontend.css' % website.id + self.assertTrue(theme_asset_url in r.text) + r = self.url_open(theme_asset_url) + self.assertTrue('/%s/static/src' % website.theme_id.name in r.text, "Ensure theme is actually loaded") + # Ensure other website/themes are not loaded + for name in websites_themes_names: + if name != website.theme_id.name: + self.assertFalse('/%s/static/src' % name in r.text, "Ensure other themes do not pollute current one") # 1. Test as public user test_crawling() diff --git a/test_themes/views/assets.xml b/test_themes/views/assets.xml deleted file mode 100644 index 276717395..000000000 --- a/test_themes/views/assets.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - -