From f8882698e8f4d1a3ad081522778344e2bd7aa0de Mon Sep 17 00:00:00 2001 From: Matthieu Stockbauer Date: Wed, 28 Apr 2021 12:52:45 +0000 Subject: [PATCH] [MOV] website, website_form, *: merge website_form app into website *: crm_iap_lead_website, website_crm, website_form_project, website_hr_recruitment, website_sale Part of https://github.com/odoo/odoo/pull/69888 task-2462993 --- addons/crm_iap_lead_website/__manifest__.py | 2 +- .../crm_iap_lead_website/controllers/main.py | 2 +- addons/website/__manifest__.py | 7 + addons/website/controllers/__init__.py | 1 + .../main.py => website/controllers/form.py} | 0 .../data/mail_mail_data.xml | 0 addons/website/data/website_data.xml | 132 +++- addons/website/models/__init__.py | 5 +- .../models/website_form.py} | 0 .../static/src/js/form_editor_registry.js} | 0 .../static/src/snippets/s_website_form/000.js | 0 .../src/snippets/s_website_form/000.scss | 0 .../src/snippets/s_website_form/001.scss | 0 .../src/snippets/s_website_form/options.js | 0 .../static/src/xml/website_form.xml | 0 .../static/src/xml/website_form_editor.xml | 0 .../static/tests/tours/website_form_editor.js | 0 addons/website/tests/__init__.py | 5 +- .../tests/test_website_form_editor.py | 0 .../views/ir_model_views.xml | 0 .../views/snippets/s_website_form.xml | 0 addons/website/views/snippets/snippets.xml | 3 +- addons/website_crm/__manifest__.py | 2 +- addons/website_crm/controllers/main.py | 4 +- .../views/website_crm_templates.xml | 2 +- addons/website_form/__init__.py | 2 - addons/website_form/__manifest__.py | 30 - addons/website_form/controllers/__init__.py | 1 - addons/website_form/data/ir_asset.xml | 13 - addons/website_form/i18n/af.po | 139 ---- addons/website_form/i18n/ar.po | 405 ------------ addons/website_form/i18n/az.po | 164 ----- addons/website_form/i18n/bg.po | 151 ----- addons/website_form/i18n/bs.po | 167 ----- addons/website_form/i18n/ca.po | 172 ----- addons/website_form/i18n/cs.po | 403 ------------ addons/website_form/i18n/da.po | 403 ------------ addons/website_form/i18n/de.po | 409 ------------ addons/website_form/i18n/el.po | 173 ----- addons/website_form/i18n/en_GB.po | 139 ---- addons/website_form/i18n/es.po | 414 ------------ addons/website_form/i18n/es_CL.po | 139 ---- addons/website_form/i18n/es_CO.po | 147 ----- addons/website_form/i18n/es_CR.po | 139 ---- addons/website_form/i18n/es_DO.po | 145 ---- addons/website_form/i18n/es_EC.po | 146 ---- addons/website_form/i18n/es_PE.po | 139 ---- addons/website_form/i18n/et.po | 173 ----- addons/website_form/i18n/fa.po | 170 ----- addons/website_form/i18n/fi.po | 170 ----- addons/website_form/i18n/fr.po | 412 ------------ addons/website_form/i18n/gl.po | 138 ---- addons/website_form/i18n/gu.po | 167 ----- addons/website_form/i18n/he.po | 397 ----------- addons/website_form/i18n/hr.po | 402 ------------ addons/website_form/i18n/hu.po | 398 ----------- addons/website_form/i18n/id.po | 143 ---- addons/website_form/i18n/is.po | 169 ----- addons/website_form/i18n/it.po | 408 ------------ addons/website_form/i18n/ja.po | 169 ----- addons/website_form/i18n/ka.po | 138 ---- addons/website_form/i18n/kab.po | 138 ---- addons/website_form/i18n/km.po | 169 ----- addons/website_form/i18n/ko.po | 170 ----- addons/website_form/i18n/lb.po | 390 ----------- addons/website_form/i18n/lt.po | 410 ------------ addons/website_form/i18n/lv.po | 137 ---- addons/website_form/i18n/mk.po | 140 ---- addons/website_form/i18n/mn.po | 402 ------------ addons/website_form/i18n/nb.po | 398 ----------- addons/website_form/i18n/nl.po | 404 ------------ addons/website_form/i18n/pl.po | 407 ------------ addons/website_form/i18n/pt.po | 390 ----------- addons/website_form/i18n/pt_BR.po | 405 ------------ addons/website_form/i18n/ro.po | 390 ----------- addons/website_form/i18n/ru.po | 405 ------------ addons/website_form/i18n/sk.po | 171 ----- addons/website_form/i18n/sl.po | 137 ---- addons/website_form/i18n/sr.po | 167 ----- addons/website_form/i18n/sr@latin.po | 140 ---- addons/website_form/i18n/sv.po | 153 ----- addons/website_form/i18n/th.po | 170 ----- addons/website_form/i18n/tr.po | 407 ------------ addons/website_form/i18n/uk.po | 404 ------------ addons/website_form/i18n/vi.po | 403 ------------ addons/website_form/i18n/website_form.pot | 621 ------------------ addons/website_form/i18n/zh_CN.po | 405 ------------ addons/website_form/i18n/zh_TW.po | 397 ----------- addons/website_form/models/__init__.py | 1 - .../website_form/static/description/icon.png | Bin 5565 -> 0 bytes .../website_form/static/description/icon.svg | 1 - addons/website_form/tests/__init__.py | 4 - .../website_form/views/snippets/snippets.xml | 14 - .../views/website_form_templates.xml | 140 ---- addons/website_form_project/__manifest__.py | 2 +- .../website_form_project/controllers/main.py | 4 +- addons/website_hr_recruitment/__manifest__.py | 2 +- addons/website_sale/__manifest__.py | 2 +- addons/website_sale/controllers/main.py | 2 +- 99 files changed, 157 insertions(+), 16004 deletions(-) rename addons/{website_form/controllers/main.py => website/controllers/form.py} (100%) rename addons/{website_form => website}/data/mail_mail_data.xml (100%) rename addons/{website_form/models/models.py => website/models/website_form.py} (100%) rename addons/{website_form/static/src/js/website_form_editor_registry.js => website/static/src/js/form_editor_registry.js} (100%) rename addons/{website_form => website}/static/src/snippets/s_website_form/000.js (100%) rename addons/{website_form => website}/static/src/snippets/s_website_form/000.scss (100%) rename addons/{website_form => website}/static/src/snippets/s_website_form/001.scss (100%) rename addons/{website_form => website}/static/src/snippets/s_website_form/options.js (100%) rename addons/{website_form => website}/static/src/xml/website_form.xml (100%) rename addons/{website_form => website}/static/src/xml/website_form_editor.xml (100%) rename addons/{website_form => website}/static/tests/tours/website_form_editor.js (100%) rename addons/{website_form => website}/tests/test_website_form_editor.py (100%) rename addons/{website_form => website}/views/ir_model_views.xml (100%) rename addons/{website_form => website}/views/snippets/s_website_form.xml (100%) delete mode 100644 addons/website_form/__init__.py delete mode 100644 addons/website_form/__manifest__.py delete mode 100644 addons/website_form/controllers/__init__.py delete mode 100644 addons/website_form/data/ir_asset.xml delete mode 100644 addons/website_form/i18n/af.po delete mode 100644 addons/website_form/i18n/ar.po delete mode 100644 addons/website_form/i18n/az.po delete mode 100644 addons/website_form/i18n/bg.po delete mode 100644 addons/website_form/i18n/bs.po delete mode 100644 addons/website_form/i18n/ca.po delete mode 100644 addons/website_form/i18n/cs.po delete mode 100644 addons/website_form/i18n/da.po delete mode 100644 addons/website_form/i18n/de.po delete mode 100644 addons/website_form/i18n/el.po delete mode 100644 addons/website_form/i18n/en_GB.po delete mode 100644 addons/website_form/i18n/es.po delete mode 100644 addons/website_form/i18n/es_CL.po delete mode 100644 addons/website_form/i18n/es_CO.po delete mode 100644 addons/website_form/i18n/es_CR.po delete mode 100644 addons/website_form/i18n/es_DO.po delete mode 100644 addons/website_form/i18n/es_EC.po delete mode 100644 addons/website_form/i18n/es_PE.po delete mode 100644 addons/website_form/i18n/et.po delete mode 100644 addons/website_form/i18n/fa.po delete mode 100644 addons/website_form/i18n/fi.po delete mode 100644 addons/website_form/i18n/fr.po delete mode 100644 addons/website_form/i18n/gl.po delete mode 100644 addons/website_form/i18n/gu.po delete mode 100644 addons/website_form/i18n/he.po delete mode 100644 addons/website_form/i18n/hr.po delete mode 100644 addons/website_form/i18n/hu.po delete mode 100644 addons/website_form/i18n/id.po delete mode 100644 addons/website_form/i18n/is.po delete mode 100644 addons/website_form/i18n/it.po delete mode 100644 addons/website_form/i18n/ja.po delete mode 100644 addons/website_form/i18n/ka.po delete mode 100644 addons/website_form/i18n/kab.po delete mode 100644 addons/website_form/i18n/km.po delete mode 100644 addons/website_form/i18n/ko.po delete mode 100644 addons/website_form/i18n/lb.po delete mode 100644 addons/website_form/i18n/lt.po delete mode 100644 addons/website_form/i18n/lv.po delete mode 100644 addons/website_form/i18n/mk.po delete mode 100644 addons/website_form/i18n/mn.po delete mode 100644 addons/website_form/i18n/nb.po delete mode 100644 addons/website_form/i18n/nl.po delete mode 100644 addons/website_form/i18n/pl.po delete mode 100644 addons/website_form/i18n/pt.po delete mode 100644 addons/website_form/i18n/pt_BR.po delete mode 100644 addons/website_form/i18n/ro.po delete mode 100644 addons/website_form/i18n/ru.po delete mode 100644 addons/website_form/i18n/sk.po delete mode 100644 addons/website_form/i18n/sl.po delete mode 100644 addons/website_form/i18n/sr.po delete mode 100644 addons/website_form/i18n/sr@latin.po delete mode 100644 addons/website_form/i18n/sv.po delete mode 100644 addons/website_form/i18n/th.po delete mode 100644 addons/website_form/i18n/tr.po delete mode 100644 addons/website_form/i18n/uk.po delete mode 100644 addons/website_form/i18n/vi.po delete mode 100644 addons/website_form/i18n/website_form.pot delete mode 100644 addons/website_form/i18n/zh_CN.po delete mode 100644 addons/website_form/i18n/zh_TW.po delete mode 100644 addons/website_form/models/__init__.py delete mode 100644 addons/website_form/static/description/icon.png delete mode 100644 addons/website_form/static/description/icon.svg delete mode 100644 addons/website_form/tests/__init__.py delete mode 100644 addons/website_form/views/snippets/snippets.xml delete mode 100644 addons/website_form/views/website_form_templates.xml diff --git a/addons/crm_iap_lead_website/__manifest__.py b/addons/crm_iap_lead_website/__manifest__.py index 89886895d4d..edfd91b6923 100644 --- a/addons/crm_iap_lead_website/__manifest__.py +++ b/addons/crm_iap_lead_website/__manifest__.py @@ -10,7 +10,7 @@ 'iap_crm', 'iap_mail', 'crm_iap_lead', - 'website_form' + 'website' ], 'data': [ 'data/reveal_data.xml', diff --git a/addons/crm_iap_lead_website/controllers/main.py b/addons/crm_iap_lead_website/controllers/main.py index 4a9b63573bf..1ab69917cac 100644 --- a/addons/crm_iap_lead_website/controllers/main.py +++ b/addons/crm_iap_lead_website/controllers/main.py @@ -2,7 +2,7 @@ import json from odoo import http -from odoo.addons.website_form.controllers.main import WebsiteForm +from odoo.addons.website.controllers.form import WebsiteForm from odoo.http import request diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py index 2bd399831dc..d436126f29f 100644 --- a/addons/website/__manifest__.py +++ b/addons/website/__manifest__.py @@ -17,10 +17,13 @@ 'portal', 'social_media', 'auth_signup', + 'mail', + 'google_recaptcha', ], 'installable': True, 'data': [ 'data/ir_asset.xml', + 'data/mail_mail_data.xml', 'data/website_data.xml', 'data/website_visitor_cron.xml', 'security/website_security.xml', @@ -80,6 +83,7 @@ 'views/snippets/s_dynamic_snippet.xml', 'views/snippets/s_dynamic_snippet_carousel.xml', 'views/snippets/s_embed_code.xml', + 'views/snippets/s_website_form.xml', 'views/website_views.xml', 'views/website_visitor_views.xml', 'views/res_config_settings_views.xml', @@ -87,6 +91,7 @@ 'views/ir_actions_views.xml', 'views/ir_asset_views.xml', 'views/ir_attachment_views.xml', + 'views/ir_model_views.xml', 'views/res_partner_views.xml', 'wizard/base_language_install_views.xml', 'wizard/website_robots.xml', @@ -177,6 +182,7 @@ 'website/static/src/snippets/s_dynamic_snippet/options.js', 'website/static/src/snippets/s_dynamic_snippet_carousel/options.js', 'website/static/src/snippets/s_embed_code/options.js', + 'website/static/src/snippets/s_website_form/options.js', 'website/static/src/js/editor/wysiwyg.js', 'website/static/src/js/editor/widget_link.js', 'website/static/src/js/widgets/media.js', @@ -188,6 +194,7 @@ 'web/static/src/legacy/scss/ace.scss', 'website/static/src/scss/website.editor.ui.scss', 'website/static/src/scss/website.theme_install.scss', + 'website/static/src/js/form_editor_registry.js', 'website/static/src/js/menu/content.js', 'website/static/src/js/menu/customize.js', 'website/static/src/js/menu/debug_manager.js', diff --git a/addons/website/controllers/__init__.py b/addons/website/controllers/__init__.py index 5ee7aaab8f2..12c98dba766 100644 --- a/addons/website/controllers/__init__.py +++ b/addons/website/controllers/__init__.py @@ -2,4 +2,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import backend +from . import form from . import main diff --git a/addons/website_form/controllers/main.py b/addons/website/controllers/form.py similarity index 100% rename from addons/website_form/controllers/main.py rename to addons/website/controllers/form.py diff --git a/addons/website_form/data/mail_mail_data.xml b/addons/website/data/mail_mail_data.xml similarity index 100% rename from addons/website_form/data/mail_mail_data.xml rename to addons/website/data/mail_mail_data.xml diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index cb985963714..968b64ca366 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -50,8 +50,94 @@ -
- Send us an email +
@@ -64,6 +150,48 @@ + + Thanks (Contact us) + qweb + /contactus-thank-you + + True + website_form.contactus_thanks + + + +
+
+
+
+
+
+
+
+

Thank You!

+
+
+
+
+ + Your message has been sent successfully +
+

We will get back to you shortly.

+
+
+
+
+ +
+
+
+
+
+ + + + +