diff options
| author | Thibault Delavallée <tde@odoo.com> | 2020-07-30 07:45:18 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-07-31 15:35:58 +0000 |
| commit | 91b02aa924a122200140bc374d99941ffda24b21 (patch) | |
| tree | 300d1fb4fd1ad7107e557d9297b85c5a49d6d5ab /addons/website_event | |
| parent | 9cf03ebd82be23c471f9ab21a3661d951d5782b0 (diff) | |
[REF] website_event: improve main 'all events' 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: ALL EVENTS PAGE
Improve event cards layout
* remove footer when having nothing to show;
* remove organizer: odoo standard use case for PME show that it is uncommon
to have multi-organizers on an event page. It can be set back easily with
a simple customization if necessary;
* fix horizontal border crossing the screen in "no cards" layout;
Improve events search bar
* put move filters on same line as search, to have everything taking one line
in desktop mode;
* remove "clear filters" big button because we feel it is not necessary;
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/website_event')
| -rw-r--r-- | addons/website_event/i18n/website_event.pot | 16 | ||||
| -rw-r--r-- | addons/website_event/views/event_templates.xml | 23 |
2 files changed, 10 insertions, 29 deletions
diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot index 617aed71e52..8b72bc6f9cb 100644 --- a/addons/website_event/i18n/website_event.pot +++ b/addons/website_event/i18n/website_event.pot @@ -78,11 +78,6 @@ msgid "<i class=\"fa fa-check mr-2\"/>Registered" msgstr "" #. module: website_event -#: model_terms:ir.ui.view,arch_db:website_event.index_topbar -msgid "<i class=\"fa fa-eraser\"/> Clear filters" -msgstr "" - -#. module: website_event #: model_terms:ir.ui.view,arch_db:website_event.index_sidebar_follow_us msgid "" "<i class=\"fa fa-facebook text-facebook\" aria-label=\"Facebook\" " @@ -264,11 +259,6 @@ msgid "" msgstr "" #. module: website_event -#: model_terms:ir.ui.view,arch_db:website_event.index_topbar -msgid "Clear filters" -msgstr "" - -#. module: website_event #. openerp-web #: code:addons/website_event/static/src/js/tours/website_event.js:0 #, python-format @@ -541,11 +531,6 @@ msgid "Organizer" msgstr "" #. module: website_event -#: model_terms:ir.ui.view,arch_db:website_event.events_list -msgid "Organizer:" -msgstr "" - -#. module: website_event #: model_terms:ir.ui.view,arch_db:website_event.index_sidebar_photos msgid "Our Trainings" msgstr "" @@ -624,6 +609,7 @@ msgid "Registrations are <b>closed</b>" msgstr "" #. module: website_event +#: model_terms:ir.ui.view,arch_db:website_event.events_list #: model_terms:ir.ui.view,arch_db:website_event.registration_template msgid "Registrations not yet open" msgstr "" diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index db29a6cd8bc..731a27d103b 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -45,19 +45,14 @@ <template id="index_topbar" name="Topbar"> <nav class="navbar navbar-light border-top shadow-sm d-print-none"> <div class="container"> - <div class="row d-flex justify-content-between w-100 mr-0"> - <div class="col-lg-8 col-sm-12"> - <span class="navbar-brand h4 my-0">Events</span> - <ul class="o_wevent_index_topbar_filters nav"/> - </div> - <div class="col-lg-3 col-sm-12 d-flex align-items-center flex-wrap pl-3 pr-0"> + <div class="d-flex flex-column flex-sm-row justify-content-between w-100"> + <span class="navbar-brand h4 my-0 mr-auto">Events</span> + <ul class="o_wevent_index_topbar_filters nav"/> + <div class="d-flex align-items-center flex-wrap pl-sm-3 pr-0"> <t t-call="website_event.events_search_box"> <t t-set="_searches" t-value="searches"/> <t t-set="_placeholder" t-value="'Search an event ...'"/> </t> - <a href="/event" class="btn btn-info text-nowrap mr-0 w-100" role="button" title="Clear filters"> - <i class="fa fa-eraser"/> Clear filters - </a> </div> </div> </div> @@ -221,10 +216,6 @@ <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'date_only': 'true', 'format': 'long'}"/> - <span t-field="event.with_context(tz=event.date_tz).date_begin" t-options="{'time_only': 'true', 'format': 'short'}"/> </time> - <!-- Organizer --> - <div t-if="event.organizer_id" class="mb-3"> - <small class="text-muted text-truncate">Organizer: <span t-field="event.organizer_id" itemprop="organizer"/></small> - </div> <!-- Location --> <div itemprop="location" t-field="event.address_id" t-options="{'widget': 'contact', 'fields': ['city'], 'no_marker': 'true'}"/> <div class="mt8 d-flex align-items-center"> @@ -237,7 +228,11 @@ </main> </div> <!-- Footer --> - <footer t-attf-class="small align-self-end w-100 #{opt_events_list_cards and 'card-footer' or ((not opt_events_list_columns) and 'border-top mx-4 mt-auto pt-2' or 'border-top py-2')}"> + <footer t-if="not event.event_registrations_open or event.event_registrations_sold_out" + t-att-class="'small align-self-end w-100 %s %s' % ( + opt_events_list_cards and 'card-footer' or (not opt_events_list_columns and 'mx-4 mt-auto pt-2') or 'py-2', + opt_events_list_cards and 'border-top' or '', + )"> <span t-if="not event.event_registrations_open" class="text-danger"> <t t-if="event.start_sale_date and event.start_sale_date > datetime.date.today()"> Registrations not yet open |
