diff --git a/addons/website_event/views/event_templates_list.xml b/addons/website_event/views/event_templates_list.xml index 990c736a901..4b69241ea2d 100644 --- a/addons/website_event/views/event_templates_list.xml +++ b/addons/website_event/views/event_templates_list.xml @@ -162,8 +162,8 @@
- -
+ +
diff --git a/addons/website_event_exhibitor/controllers/exhibitor.py b/addons/website_event_exhibitor/controllers/exhibitor.py index e141d2a78e6..d609139fb2b 100644 --- a/addons/website_event_exhibitor/controllers/exhibitor.py +++ b/addons/website_event_exhibitor/controllers/exhibitor.py @@ -77,16 +77,26 @@ class ExhibitorController(WebsiteEventController): sponsor_types = sponsors_all.mapped('sponsor_type_id') sponsor_countries = sponsors_all.mapped('partner_id.country_id').sorted('name') # organize sponsors into categories to help display - sponsor_categories = dict() + sponsor_categories_dict = dict() + sponsor_categories = [] + is_event_user = request.env.user.has_group('event.group_event_registration_desk') for sponsor in sponsors: - if not sponsor_categories.get(sponsor.sponsor_type_id): - sponsor_categories[sponsor.sponsor_type_id] = request.env['event.sponsor'].sudo() - sponsor_categories[sponsor.sponsor_type_id] |= sponsor - sponsor_categories = [ - dict({ + if not sponsor_categories_dict.get(sponsor.sponsor_type_id): + sponsor_categories_dict[sponsor.sponsor_type_id] = request.env['event.sponsor'].sudo() + sponsor_categories_dict[sponsor.sponsor_type_id] |= sponsor + + for sponsor_category, sponsors in sponsor_categories_dict.items(): + # To display random published sponsors first and random unpublished sponsors last + if is_event_user: + published_sponsors = sponsors.filtered(lambda s: s.website_published) + unpublished_sponsors = sponsors - published_sponsors + random_sponsors = sample(published_sponsors, len(published_sponsors)) + sample(unpublished_sponsors, len(unpublished_sponsors)) + else: + random_sponsors = sample(sponsors, len(sponsors)) + sponsor_categories.append({ 'sponsorship': sponsor_category, - 'sponsors': sample(sponsors, len(sponsors)), - }) for sponsor_category, sponsors in sponsor_categories.items()] + 'sponsors': random_sponsors, + }) # return rendering values return { @@ -104,7 +114,7 @@ class ExhibitorController(WebsiteEventController): 'sponsor_countries': sponsor_countries, # environment 'hostname': request.httprequest.host.split(':')[0], - 'is_event_user': request.env.user.has_group('event.group_event_registration_desk'), + 'is_event_user': is_event_user, } # ------------------------------------------------------------ @@ -139,6 +149,7 @@ class ExhibitorController(WebsiteEventController): current_country = sponsor.partner_id.country_id sponsors_other = sponsors_other.sorted(key=lambda sponsor: ( + sponsor.website_published, sponsor.is_in_opening_hours, sponsor.partner_id.country_id == current_country, -1 * sponsor.sponsor_type_id.sequence, diff --git a/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js b/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js index 154b0d1b773..7743147d87f 100644 --- a/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js +++ b/addons/website_event_exhibitor/static/src/js/event_exhibitor_connect.js @@ -61,7 +61,7 @@ var ExhibitorConnectClosedDialog = Dialog.extend({ publicWidget.registry.eventExhibitorConnect = publicWidget.Widget.extend({ - selector: '.o_wesponsor_js_connect', + selector: '.o_wesponsor_connect_button', xmlDependencies: ['/website_event_exhibitor/static/src/xml/event_exhibitor_connect.xml'], /** diff --git a/addons/website_event_exhibitor/static/src/scss/event_exhibitor_templates.scss b/addons/website_event_exhibitor/static/src/scss/event_exhibitor_templates.scss index 6e2d39536fb..61a9c973c9f 100644 --- a/addons/website_event_exhibitor/static/src/scss/event_exhibitor_templates.scss +++ b/addons/website_event_exhibitor/static/src/scss/event_exhibitor_templates.scss @@ -61,19 +61,19 @@ a { display: none; } - } + @include media-breakpoint-up(md) { + &:hover { + cursor: pointer; + transition: background-color .2s linear; + background-color: rgba(0,0,0,.1); - @include media-breakpoint-up(md) { - :hover .o_wesponsor_connect_button { - cursor: pointer; - transition: background-color .2s linear; - background-color: rgba(0,0,0,.1); - - a { - display: inline-block; + a { + display: inline-block; + } } } } + } /* diff --git a/addons/website_event_exhibitor/views/event_exhibitor_templates_list.xml b/addons/website_event_exhibitor/views/event_exhibitor_templates_list.xml index 52423d57acc..6054b8f4f36 100644 --- a/addons/website_event_exhibitor/views/event_exhibitor_templates_list.xml +++ b/addons/website_event_exhibitor/views/event_exhibitor_templates_list.xml @@ -156,52 +156,28 @@ diff --git a/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml b/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml index 5573b0f83a2..fd8455facb1 100644 --- a/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml +++ b/addons/website_event_exhibitor/views/event_exhibitor_templates_page.xml @@ -161,7 +161,8 @@
  • + t-att-href="sponsor_other.website_url" + t-att-data-publish="sponsor_other.website_published and 'on' or 'off'">
    +
    + Unpublished +
    • diff --git a/addons/website_event_exhibitor/views/event_templates_sponsor.xml b/addons/website_event_exhibitor/views/event_templates_sponsor.xml index 36e4f5cee24..7307bbf97aa 100644 --- a/addons/website_event_exhibitor/views/event_templates_sponsor.xml +++ b/addons/website_event_exhibitor/views/event_templates_sponsor.xml @@ -3,28 +3,18 @@ + + + diff --git a/addons/website_event_meet/controllers/community.py b/addons/website_event_meet/controllers/community.py index 32c8cbafb41..e3796bdabb8 100644 --- a/addons/website_event_meet/controllers/community.py +++ b/addons/website_event_meet/controllers/community.py @@ -23,7 +23,7 @@ class WebsiteEventMeetController(EventCommunityController): return search_domain_base def _sort_event_rooms(self, room): - return (room.is_pinned, room.room_last_activity, room.id) + return (room.website_published, room.is_pinned, room.room_last_activity, room.id) # ------------------------------------------------------------ # MAIN PAGE @@ -61,7 +61,7 @@ class WebsiteEventMeetController(EventCommunityController): return { # event information - "event": event.sudo(), + "event": event, 'main_object': event, # rooms "meeting_rooms": meeting_rooms, diff --git a/addons/website_event_meet/static/src/scss/event_meet_templates.scss b/addons/website_event_meet/static/src/scss/event_meet_templates.scss index ddd9e030f3c..dffd340dc0d 100644 --- a/addons/website_event_meet/static/src/scss/event_meet_templates.scss +++ b/addons/website_event_meet/static/src/scss/event_meet_templates.scss @@ -57,3 +57,8 @@ position: absolute; opacity: 0.6; } + +.o_wevent_meeting_room_manager_menu { + top: $spacer / 2; + right: $spacer; +} diff --git a/addons/website_event_meet/views/event_meet_templates_list.xml b/addons/website_event_meet/views/event_meet_templates_list.xml index 4dc72bd2a5e..4d08ecc4084 100644 --- a/addons/website_event_meet/views/event_meet_templates_list.xml +++ b/addons/website_event_meet/views/event_meet_templates_list.xml @@ -122,27 +122,14 @@ t-att-href="meeting_room_href" t-att-data-toggle="meeting_room_data_toggle" t-att-data-target="meeting_room_data_target"> -
    +
    Full
    -
    -

    -
    +
    +

    +
    Unpublished
    -
    -
    - -
    -
    Room Manager
    - - -
    -
    - -

    @@ -155,6 +142,18 @@

    +
    + +
    + +
    + + +
    +
    +
    diff --git a/addons/website_event_track/controllers/event_track.py b/addons/website_event_track/controllers/event_track.py index b7f91141834..3627d55c80c 100644 --- a/addons/website_event_track/controllers/event_track.py +++ b/addons/website_event_track/controllers/event_track.py @@ -96,7 +96,7 @@ class EventTrackController(http.Controller): now_tz = utc.localize(fields.Datetime.now().replace(microsecond=0), is_dst=False).astimezone(timezone(event.date_tz)) today_tz = now_tz.date() event = event.with_context(tz=event.date_tz or 'UTC') - tracks_sudo = event.env['event.track'].sudo().search(search_domain, order='date asc') + tracks_sudo = event.env['event.track'].sudo().search(search_domain, order='is_published desc, date asc') tag_categories = request.env['event.track.tag.category'].sudo().search([]) # filter on wishlist (as post processing due to costly search on is_reminder_on) 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 6d5ec0807f5..1c6e2b2e3c2 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 @@ -134,6 +134,11 @@ > div { padding: 0.3em; } + // For unpublished tracks, opacity is already reduced + [data-publish='off'] .o_weagenda_track_badges > .o_wevent_online_badge_unpublished { + opacity: unset; + } + } // Remove me in master diff --git a/addons/website_event_track/views/event_track_templates_agenda.xml b/addons/website_event_track/views/event_track_templates_agenda.xml index 6b4335b5686..a369f2c2fa4 100644 --- a/addons/website_event_track/views/event_track_templates_agenda.xml +++ b/addons/website_event_track/views/event_track_templates_agenda.xml @@ -156,16 +156,16 @@