diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index c003279c12b..e35d52f89bb 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -383,13 +383,17 @@ class WebsiteEventController(http.Controller): registrations = self._process_attendees_form(event, post) attendees_sudo = self._create_attendees_from_registration_post(event, registrations) + return request.render("website_event.registration_complete", + self._get_registration_confirm_values(event, attendees_sudo)) + + def _get_registration_confirm_values(self, event, attendees_sudo): urls = event._get_event_resource_urls() - return request.render("website_event.registration_complete", { + return { 'attendees': attendees_sudo, 'event': event, 'google_url': urls.get('google_url'), 'iCal_url': urls.get('iCal_url') - }) + } def _extract_searched_event_tags(self, searches): tags = request.env['event.tag'] diff --git a/addons/website_event/static/src/scss/website_event_templates.scss b/addons/website_event/static/src/scss/website_event_templates.scss index 390536d6f97..85f7406b7ea 100644 --- a/addons/website_event/static/src/scss/website_event_templates.scss +++ b/addons/website_event/static/src/scss/website_event_templates.scss @@ -65,6 +65,44 @@ } } + // background color-based for new styling + .event_color_0 { + @extend .bg-100; + } + .event_color_1 { + background-color: rgba(240, 96, 80, 0.2); + } + .event_color_2 { + background-color: rgba(244, 164, 96, 0.2); + } + .event_color_3 { + background-color: rgba(247, 205, 31, 0.2); + } + .event_color_4 { + background-color: rgba(108,193,237,0.2); + } + .event_color_5 { + background-color: rgba(129,73,104,0.2); + } + .event_color_6 { + background-color: rgba(235,126,127,0.2); + } + .event_color_7 { + background-color: rgba(44,131,151,0.2); + } + .event_color_8 { + background-color: rgba(71,85,119,0.2); + } + .event_color_9 { + background-color: rgba(214,20,95,0.2); + } + .event_color_10 { + background-color: rgba(48,195,129,0.2); + } + .event_color_11 { + background-color: rgba(147,101,184,0.2); + } + .o_wevent_online_page_container { // Widescreen mode @include media-breakpoint-up(md) { diff --git a/addons/website_event_meet/controllers/website_event_main.py b/addons/website_event_meet/controllers/website_event_main.py index f395ca09e3f..991b15f7e91 100644 --- a/addons/website_event_meet/controllers/website_event_main.py +++ b/addons/website_event_meet/controllers/website_event_main.py @@ -18,7 +18,7 @@ class WebsiteEventController(WebsiteEventController): date_begin = format_datetime(event.with_context(tz=event.date_tz).date_begin, format="medium") values["toast_message"] = ( - _('The event %s starts at %s (%s). \nJoin us there to chat about "%s" !') + _('The event %s starts on %s (%s). \nJoin us there to chat about "%s" !') % (event.name, date_begin, event.date_tz, meeting_room.name) ) diff --git a/addons/website_event_meet/views/event_meet_templates_page.xml b/addons/website_event_meet/views/event_meet_templates_page.xml index bd865af704a..7d0a4319cc3 100644 --- a/addons/website_event_meet/views/event_meet_templates_page.xml +++ b/addons/website_event_meet/views/event_meet_templates_page.xml @@ -38,7 +38,7 @@ t-options="{'widget': 'duration', 'digital': True, 'unit': 'minute', 'round': 'minute'}"/>. - starts at + starts on (). diff --git a/addons/website_event_track/controllers/__init__.py b/addons/website_event_track/controllers/__init__.py index 8779baf6109..41b126da54a 100644 --- a/addons/website_event_track/controllers/__init__.py +++ b/addons/website_event_track/controllers/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +from . import event from . import event_track from . import webmanifest diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py new file mode 100644 index 00000000000..895f9fd314d --- /dev/null +++ b/addons/website_event_track/controllers/event.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo.addons.website_event.controllers.main import WebsiteEventController + + +class EventOnlineController(WebsiteEventController): + + def _get_registration_confirm_values(self, event, attendees_sudo): + values = super(EventOnlineController, self)._get_registration_confirm_values(event, attendees_sudo) + values['hide_sponsors'] = True + return values diff --git a/addons/website_event_track/data/event_track_demo.xml b/addons/website_event_track/data/event_track_demo.xml index aec7c85d33e..ec3ca4bcec1 100644 --- a/addons/website_event_track/data/event_track_demo.xml +++ b/addons/website_event_track/data/event_track_demo.xml @@ -382,7 +382,7 @@ Life at Home Around the World: William’s Story - 5 + 0 @@ -399,7 +399,7 @@ Top 10 Most Expensive Wood in the World - 3 + 0 @@ -413,7 +413,7 @@ Securing your Lumber during transport - 3 + 0 @@ -439,7 +439,7 @@ Dealing with OpenWood Furniture - 6 + 0 @@ -452,7 +452,7 @@ Kitchens for the Future - 7 + 0 @@ -479,7 +479,7 @@ Who's OpenWood anyway ? - 6 + 0 @@ -528,6 +528,7 @@ Climate positive + 3 @@ -540,7 +541,7 @@ Log House Building - 2 + 0 @@ -554,7 +555,7 @@ Building a DIY cabin from the ground up - 2 + 0 @@ -568,7 +569,7 @@ Logs to lumber - 3 + 0 @@ -581,7 +582,7 @@ Pretty. Ugly. Lovely. - 4 + 0 @@ -608,7 +609,7 @@ 6 Woodworking tips and tricks for beginners - 7 + 0 @@ -648,7 +649,7 @@ Happy with OpenWood - 6 + 0 @@ -696,7 +697,7 @@ Tools for the Woodworking Beginner - 3 + 0 @@ -737,11 +738,11 @@ Live Testimonials - 5 + 0 - + 3 @@ -750,7 +751,7 @@ Less Furniture is More Furniture - 4 + 0 diff --git a/addons/website_event_track/static/src/scss/event_track_templates.scss b/addons/website_event_track/static/src/scss/event_track_templates.scss index 065b413588e..c1347493d91 100644 --- a/addons/website_event_track/static/src/scss/event_track_templates.scss +++ b/addons/website_event_track/static/src/scss/event_track_templates.scss @@ -1,3 +1,9 @@ +// small hack to hide sponsors on specific views +.o_wevent_hide_sponsors .container.mt32.mb16.d-none.d-md-block.d-print-none { + // Not a very accurate way to target the 'sponsors' block -> improve in master + display: none !important; +} + /* * EVENT TOOL: REMINDER WIDGET */ @@ -22,6 +28,7 @@ } } + /* * AGENDA */ @@ -121,6 +128,7 @@ } } + // Remove me in master &.event_color_0 { background-color: rgba(211, 211, 211, 0.5); } diff --git a/addons/website_event_track/static/src/scss/event_track_templates_online.scss b/addons/website_event_track/static/src/scss/event_track_templates_online.scss index a37a0a380cb..f6d2aec008c 100644 --- a/addons/website_event_track/static/src/scss/event_track_templates_online.scss +++ b/addons/website_event_track/static/src/scss/event_track_templates_online.scss @@ -49,7 +49,14 @@ } @media screen and (min-width: 1400px) { - max-width: none; + // return to bootstrap value for col-lg-9 / 10 breakpoint if screen is big enough + &.col-lg-9 { + max-width: 75%; + } + + &.col-lg-10 { + max-width: 83.33333333%; + } } } diff --git a/addons/website_event_track/views/event_templates.xml b/addons/website_event_track/views/event_templates.xml index caf1b7e41c5..b19dd1b0760 100644 --- a/addons/website_event_track/views/event_templates.xml +++ b/addons/website_event_track/views/event_templates.xml @@ -4,7 +4,7 @@