diff options
| author | Thibault Delavallée <tde@odoo.com> | 2020-07-30 07:18:34 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-07-31 15:35:52 +0000 |
| commit | 9cf03ebd82be23c471f9ab21a3661d951d5782b0 (patch) | |
| tree | ae0e20d5284c231611bb62c849a3637f9abab7f1 /addons | |
| parent | e8dd796b7a474e0726fc93e604095c7340de6eac (diff) | |
[REF] website_event: improve frontend 'introduction' page
RATIONALE
Even will soon gain a major update called Event Online, allowing to better
support full-online events. In order to prepare its merge, preparatory merge
are done to lessen the final diff.
PURPOSE
Prepare Event Online support by providing fixes in registration and event
frontend flows. Also provide a quick back2basic in backend views to prepare
addition of Online sub modules.
SPECIFICATIONS: INTRODUCTION PAGE
Ease introduction page edition, notably by adding missing snippets information
on introduction page template.
By the way, move those side templates in a specific file in order to cleanup a
bit the main template file that is a bit messy.
LINKS
Community PR odoo/odoo#55197
Enterprise PR odoo/enterprise#12113
Task ID-2287372 (Fix Twitter Wall)
Task ID-2309702 (Event Preparatory Merge 4)
Prepares Task ID-2252655 (Main Online Event task)
Prepares Task ID-2283796 (Event B2Basics / Registration Flow)
Prepares Task ID-2299857 (Event Design Review)
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/website_event/__manifest__.py | 1 | ||||
| -rw-r--r-- | addons/website_event/i18n/website_event.pot | 8 | ||||
| -rw-r--r-- | addons/website_event/views/event_templates.xml | 50 | ||||
| -rw-r--r-- | addons/website_event/views/event_templates_misc_pages.xml | 57 |
4 files changed, 65 insertions, 51 deletions
diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py index bc4b7d57a43..e62bfa93d75 100644 --- a/addons/website_event/__manifest__.py +++ b/addons/website_event/__manifest__.py @@ -14,6 +14,7 @@ 'views/res_config_settings_views.xml', 'views/event_snippets.xml', 'views/event_templates.xml', + 'views/event_templates_misc_pages.xml', 'views/event_views.xml', 'security/ir.model.access.csv', 'security/event_security.xml', diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot index a1edea2325f..617aed71e52 100644 --- a/addons/website_event/i18n/website_event.pot +++ b/addons/website_event/i18n/website_event.pot @@ -55,6 +55,13 @@ msgid "" msgstr "" #. module: website_event +#: model_terms:ir.ui.view,arch_db:website_event.template_intro +msgid "" +"<font style=\"font-size: 62px;\" " +"class=\"o_default_snippet_text\">Introduction</font>" +msgstr "" + +#. module: website_event #: model_terms:ir.ui.view,arch_db:website_event.registration_template msgid "<i class=\"fa fa-ban mr-2\"/>Sold Out" msgstr "" @@ -467,7 +474,6 @@ msgstr "" #. module: website_event #: code:addons/website_event/models/event_event.py:0 -#: model_terms:ir.ui.view,arch_db:website_event.template_intro #, python-format msgid "Introduction" msgstr "" diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index cbf795ee6ff..db29a6cd8bc 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -765,56 +765,6 @@ </t> </template> -<!-- Multipage event - Default template when creating a new page --> -<template id="default_page"> - <t t-call="website.layout"> - <div class="oe_structure oe_empty"/> - </t> -</template> - -<!-- Multipage event - Default template for the Introduction page --> -<template id="template_intro"> - <t t-call="website_event.layout"> - <section class="s_title pt48 pb48" data-vcss="001" data-snippet="s_title"> - <div class="container"> - <h1>Introduction</h1> - </div> - </section> - <div class="oe_structure oe_empty" id="oe_structure_website_event_intro_1"/> - </t> -</template> - -<!-- Multipage event - Default template for the Location page --> -<template id="template_location"> - <t t-call="website_event.layout"> - <div class="oe_structure" id="oe_structure_website_event_location_1"/> - <section class="pt32 pb32"> - <div class="container"> - <div class="row"> - <div class="col-12"> - <h1 class="o_page_header mb-3">Event Location</h1> - <h4 class="mb-3" t-field="event.address_id" t-options='{ - "widget": "contact", - "fields": ["name"], - }'/> - <div class="mb-3" t-field="event.address_id" t-options='{ - "widget": "contact", - "fields": ["address"], - "no_marker": True - }'/> - <div class="mb-3" t-field="event.address_id" t-options='{ - "widget": "contact", - "fields": ["phone", "mobile", "email"], - "no_marker": True - }'/> - </div> - </div> - </div> - </section> - <div class="oe_structure" id="oe_structure_website_event_location_2"/> - </t> -</template> - <!-- User Navbar --> <template id="user_navbar_inherit_website_event" inherit_id="website.user_navbar"> <xpath expr="//div[@id='o_new_content_menu_choices']//div[@name='module_website_event']" position="attributes"> diff --git a/addons/website_event/views/event_templates_misc_pages.xml b/addons/website_event/views/event_templates_misc_pages.xml new file mode 100644 index 00000000000..b20eba9943a --- /dev/null +++ b/addons/website_event/views/event_templates_misc_pages.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?> +<odoo> + +<!-- Multipage event - Default template when creating a new page --> +<template id="default_page"> + <t t-call="website.layout"> + <div class="oe_structure oe_empty"/> + </t> +</template> + +<!-- Multipage event - Default template for the Introduction page --> +<template id="template_intro"> + <t t-call="website_event.layout"> + <div class="oe_structure oe_empty" id="oe_structure_website_event_intro_1"/> + <section class="s_title pt32 pb32" data-vcss="001" data-snippet="s_title" data-name="Title"> + <div class="container s_allow_columns"> + <h1 style="text-align: center;"> + <font style="font-size: 62px;" class="o_default_snippet_text">Introduction</font> + </h1> + </div> + </section> + <div class="oe_structure oe_empty" id="oe_structure_website_event_intro_2"/> + </t> +</template> + +<!-- Multipage event - Default template for the Location page --> +<template id="template_location"> + <t t-call="website_event.layout"> + <div class="oe_structure" id="oe_structure_website_event_location_1"/> + <section class="pt32 pb32"> + <div class="container"> + <div class="row"> + <div class="col-12"> + <h1 class="o_page_header mb-3">Event Location</h1> + <h4 class="mb-3" t-field="event.address_id" t-options='{ + "widget": "contact", + "fields": ["name"], + }'/> + <div class="mb-3" t-field="event.address_id" t-options='{ + "widget": "contact", + "fields": ["address"], + "no_marker": True + }'/> + <div class="mb-3" t-field="event.address_id" t-options='{ + "widget": "contact", + "fields": ["phone", "mobile", "email"], + "no_marker": True + }'/> + </div> + </div> + </div> + </section> + <div class="oe_structure" id="oe_structure_website_event_location_2"/> + </t> +</template> + +</odoo> |
