From c0ba2453fb549dda0f5f11e7762b27b160e5e285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Fri, 10 Nov 2023 09:30:04 +0200 Subject: [PATCH 1/3] TMS-974: Recurring event layout changes --- .../page-events-calendar-item-grid.dust | 34 ++++----- .../single-dynamic-event-info.dust | 73 +++++++++++-------- 2 files changed, 61 insertions(+), 46 deletions(-) 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 f1467f5..2b09a53 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 @@ -1,53 +1,53 @@ -
+
{?image} {/image} -
+

- - {name|s} + + {name|html}

- {short_description|s} + {short_description|kses}

- - {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /} + + {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /} - {date|s} + {date|html}
- - {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /} + + {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /} - {time|s} + {time|html}
{?location.name}
- - {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /} + + {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /} - {location.name|s} + {location.name|html}
{/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 7448ee5..2075117 100644 --- a/partials/views/single-dynamic-event/single-dynamic-event-info.dust +++ b/partials/views/single-dynamic-event/single-dynamic-event-info.dust @@ -1,47 +1,62 @@ -{?event.normalized.date} -
- {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.date_title template_classes=template_classes.info_group_title icon="date" /} +{?event.normalized.recurring} + {?event.normalized.date} +
+ {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.date_title template_classes=template_classes.info_group_title icon="date" /} -
- {event.normalized.date|s} +
+ {#event.normalized.dates} +
+ {date|html} +
+ {/event.normalized.dates} +
-
-{/event.normalized.date} + {/event.normalized.date} +{:else} + {?event.normalized.date} +
+ {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.date_title template_classes=template_classes.info_group_title icon="date" /} -{?event.normalized.time} -
- {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.time_title template_classes=template_classes.info_group_title icon="time" /} +
+ {event.normalized.date|html} +
+
+ {/event.normalized.date} + {?event.normalized.time} +
+ {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.time_title template_classes=template_classes.info_group_title icon="time" /} -
- {event.normalized.time|s} +
+ {event.normalized.time|html} +
-
-{/event.normalized.time} + {/event.normalized.time} +{/event.normalized.recurring} {?event.normalized.location} -
+
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.location_title template_classes=template_classes.info_group_title icon="location" /}
-
{event.normalized.location.name|s}
-
{event.normalized.location.description|s}
-
{event.normalized.location.extra_info|s}
+
{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" /}
{/event.normalized.location} {?event.normalized.price} -
+
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.price_title template_classes=template_classes.info_group_title icon="euro" /}
{#event.normalized.price}
- {price|s} + {price|html}
- {description|s} + {description|kses}
{>"ui/link" link=info_url /} {/event.normalized.price} @@ -50,33 +65,33 @@ {/event.normalized.price} {?event.normalized.provider} -
+
{>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.provider_title template_classes=template_classes.info_group_title icon="bullhorn" /}
-
{event.normalized.provider.name|s}
+
{event.normalized.provider.name|html}
{?event.normalized.provider.email} {/event.normalized.provider.email} {?event.normalized.provider.phone} {/event.normalized.provider.phone}
- {>"ui/button-link" link=event.normalized.provider.link classes="is-primary mt-3 {template_classes.info_button|s}" icon="chevron-right" icon_classes="icon--medium" /} + {>"ui/button-link" link=event.normalized.provider.link classes="is-primary mt-3 {template_classes.info_button|attr}" icon="chevron-right" icon_classes="icon--medium" /} {/event.normalized.provider} {?event.normalized.virtual_event_link} - {>"ui/button-link" link=event.normalized.virtual_event_link classes="is-primary mt-3 {template_classes.info_button|s}" icon="chevron-right" icon_classes="icon--medium" /} + {>"ui/button-link" link=event.normalized.virtual_event_link classes="is-primary mt-3 {template_classes.info_button|attr}" icon="chevron-right" icon_classes="icon--medium" /} {/event.normalized.virtual_event_link} From d6c4c2ab9630fe5ac45666845a073d0c9dda4920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Fri, 10 Nov 2023 09:52:20 +0200 Subject: [PATCH 2/3] TMS-974: Update changelog --- CHANGELOG.MD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index cc3fcdf..45604cf 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-974: Recurring event layout changes + ## [1.1.4] - 2023-10-23 - TMS-970: Add image meta to call-to-action and content-columns components From 6a8c0a879d689d1f8292e4ad5898df3e41be616d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Mon, 20 Nov 2023 15:07:22 +0200 Subject: [PATCH 3/3] TMS-974: Update changelog --- CHANGELOG.MD | 2 ++ style.css | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 45604cf..8e16f6b 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] +## [1.2.0] - 2023-11-21 + - TMS-974: Recurring event layout changes ## [1.1.4] - 2023-10-23 diff --git a/style.css b/style.css index 71873d7..7331572 100644 --- a/style.css +++ b/style.css @@ -1,7 +1,7 @@ /* * Theme Name: TMS Theme Milavida * Description: Tampere Multisite Milavida Theme - * Version: 1.1.3 + * Version: 1.2,9 * Author: Geniem * Author URI: https://geniem.fi * Template: tms-theme-base