From 48141920e721a907162a7aa7f09c00a05e1833e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Mon, 24 Jun 2024 11:26:30 +0300 Subject: [PATCH 1/4] TMS-1054: Param comment fix --- lib/ACF/AlterPageSettingsFields.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ACF/AlterPageSettingsFields.php b/lib/ACF/AlterPageSettingsFields.php index 95cd9b6..7a4c503 100644 --- a/lib/ACF/AlterPageSettingsFields.php +++ b/lib/ACF/AlterPageSettingsFields.php @@ -21,7 +21,7 @@ public function __construct() { /** * Remove overlay TrueFalse-field from page settings * - * @param Field\Group[] $fields Array of settings. + * @param Field\Group $group Group-object of settings. * * @return array */ From a7e4b3d67cc92bfe09e3efed30e2a235356b6a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Tue, 25 Jun 2024 20:08:51 +0300 Subject: [PATCH 2/4] 1.14.0 --- CHANGELOG.MD | 2 ++ style.css | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index c241730..4f1dd47 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.14.0] - 2024-06-17 + - TMS-1054: Remove hero overlay-toggle from single page editor ## [1.13.0] - 2024-06-17 diff --git a/style.css b/style.css index b6ac351..ec9b6b1 100644 --- a/style.css +++ b/style.css @@ -1,7 +1,7 @@ /* * Theme Name: TMS Theme Filharmonia * Description: Tampere Multisite Filharmonia Theme - * Version: 1.13.0 + * Version: 1.14.0 * Author: Geniem * Author URI: https://geniem.fi * Template: tms-theme-base From c28baaff522cb24ffc7b01c4b2da52fc593fbeec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Tue, 20 Aug 2024 15:43:22 +0300 Subject: [PATCH 3/4] 1.15.0 --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++++ CHANGELOG.MD | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f5bac30..91be60a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,7 @@ +Severa-ID: 2129 +Severa-kuvaus: +Task: https://hiondigital.atlassian.net/browse/TMS- + ## Description diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 93ef275..ad944d3 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.15.0] - 2024-08-21 + - TMS-1058: Remove text-decoration & decrease font-size for single-post h1-heading ## [1.14.0] - 2024-06-17 From d251cf185bdff1891e41ac1daf414fe0656a1f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= Date: Mon, 16 Sep 2024 12:22:32 +0300 Subject: [PATCH 4/4] TMS-1067: Show price-info for event in listing if it's free --- CHANGELOG.MD | 2 ++ partials/ui/event-highlight.dust | 52 ++++++++++++++++++++------------ 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index ad944d3..bbe29e0 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-1067: Show price-info for event in listing if it's free + ## [1.15.0] - 2024-08-21 - TMS-1058: Remove text-decoration & decrease font-size for single-post h1-heading diff --git a/partials/ui/event-highlight.dust b/partials/ui/event-highlight.dust index 809bbeb..62c527e 100644 --- a/partials/ui/event-highlight.dust +++ b/partials/ui/event-highlight.dust @@ -1,9 +1,9 @@
-
+
{?image} @@ -11,48 +11,60 @@

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

{?short_description} -

{short_description|s}

+

{short_description|kses}

{/short_description} {?primary_keyword} - {primary_keyword|s} + {primary_keyword|html} {/primary_keyword} -
- - {>"ui/icon" icon="date" class="icon--large is-primary mr-4 {classes.event_item_icon}" /} +
+ + {>"ui/icon" icon="date" class="icon--large is-primary mr-4 {classes.event_item_icon|attr}" /} - {date|s} + {date|html}
-
- - {>"ui/icon" icon="time" class="icon--large is-primary mr-4 {classes.event_item_icon}" /} +
+ + {>"ui/icon" icon="time" class="icon--large is-primary mr-4 {classes.event_item_icon|attr}" /} - {time|s} + {time|html}
{?location.name}
- - {>"ui/icon" icon="location" class="icon--large is-primary mr-4 {classes.event_item_icon}" /} + + {>"ui/icon" icon="location" class="icon--large is-primary mr-4 {classes.event_item_icon|attr}" /} - {location.name|s} + {location.name|html}
{/location.name} + {#price} + {?is_free} +
+ + {>"ui/icon" icon="euro" class="icon--large is-primary mr-4 {iclasses.event_item_icon|attr}" /} + + + {price|html} +
+ {/is_free} + {/price} + {?url} - - {Strings.s.common.read_more|s} + + {Strings.s.common.read_more|html} {/url}