diff --git a/CHANGELOG.MD b/CHANGELOG.MD index c074aaf..87e22d7 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +- TMS-1100: Show multiple locations for events if available + ## [1.3.12] - 2025-01-22 - TMS-1096: Center exhibition-archive item-count diff --git a/partials/views/page-events-calendar/page-events-calendar-item-grid.dust b/partials/views/page-events-calendar/page-events-calendar-item-grid.dust index 9450d79..13a85c7 100644 --- a/partials/views/page-events-calendar/page-events-calendar-item-grid.dust +++ b/partials/views/page-events-calendar/page-events-calendar-item-grid.dust @@ -30,7 +30,7 @@ {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /} - {date|html} +
{date|html}
{?location.name} @@ -47,7 +47,12 @@ {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /} - {location.name|html} ++ {location.name|html} + {?location_count.other_locations_string} + {location_count.other_locations_string|html} + {/location_count.other_locations_string} +
{/location.name} @@ -58,7 +63,7 @@ {>"ui/icon" icon="euro" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /} - {price|html} +{price|html}
{/is_free} {/price} diff --git a/partials/views/page-events-calendar/page-events-calendar-item-list.dust b/partials/views/page-events-calendar/page-events-calendar-item-list.dust index 7595f3d..64717f2 100644 --- a/partials/views/page-events-calendar/page-events-calendar-item-list.dust +++ b/partials/views/page-events-calendar/page-events-calendar-item-list.dust @@ -33,7 +33,7 @@ {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /} - {date|html} +{date|html}
{?location.name} @@ -50,7 +50,12 @@ {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /} - {location.name|html} ++ {location.name|html} + {?location_count.other_locations_string} + {location_count.other_locations_string|html} + {/location_count.other_locations_string} +
{/location.name} diff --git a/partials/views/single-dynamic-event/single-dynamic-event-info.dust b/partials/views/single-dynamic-event/single-dynamic-event-info.dust index 21bca1b..6781a30 100644 --- a/partials/views/single-dynamic-event/single-dynamic-event-info.dust +++ b/partials/views/single-dynamic-event/single-dynamic-event-info.dust @@ -6,17 +6,17 @@{date|html} -
{date|attr} -
{event.normalized.date|html}
{event.normalized.time|html}
{event.normalized.location.name|html}
+{event.normalized.location.description|html}
+{event.normalized.location.extra_info|html}
+ {>"ui/link" link=event.normalized.location.info_url classes="is-inline-block mt-2" /} +{name|html}
+ {/event.normalized.multiple_locations}{price|html} -
{description|kses} -
{event.normalized.provider.name|html}
{?event.normalized.provider.email}