diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 774e647..dd7d549 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +- TMS-1067: Show price-info for event in listing if it's free + +## [1.7.2] - 2024-09-12 + +- Hero field key hotfix + ## [1.7.1] - 2024-08-21 - TMS-1057: Increase articles lead-text font-size 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 7b40450..b9da2a6 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,58 +1,70 @@ -
+
{?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} - - {Strings.s.common.read_more|s} + {#price} + {?is_free} +
+ + {>"ui/icon" icon="euro" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /} + + + {price|html} +
+ {/is_free} + {/price} + +
+ {Strings.s.common.read_more|html}
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 843bd3c..f353cd8 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 @@ -1,19 +1,19 @@ -
+
{?image}
- {?primary_keyword} - {primary_keyword|s} + {primary_keyword|attr} {/primary_keyword}
@@ -22,45 +22,45 @@

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

-
- - {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.list.icon|s}" /} +
+ + {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /} - {date|s} + {date|html}
-
- - {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.list.icon|s}" /} +
+ + {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /} - {time|s} + {time|html}
{?location.name} -
- - {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.list.icon|s}" /} +
+ + {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /} - {location.name|s} + {location.name|html}
{/location.name}
-

- {short_description|s} +

+ {short_description|kses}

- - {Strings.s.common.read_more|s} + + {Strings.s.common.read_more|html}
diff --git a/style.css b/style.css index 85efb8b..6d56b4f 100644 --- a/style.css +++ b/style.css @@ -1,7 +1,7 @@ /* * Theme Name: TMS Theme Sara Hilden * Description: Tampere Multisite Sara Hilden Theme - * Version: 1.7.1 + * Version: 1.7.2 * Author: Geniem * Author URI: https://geniem.fi * Template: tms-theme-base