Merge branch 'TMS-1067' into stage

devgeniem · Sep 16, 2024 · e4713e7 · e4713e7
2 parents 79fb552 + d251cf1
commit e4713e7
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 23 deletions.
diff --git 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-
+
 <!--- Provide a general summary of your changes in the Title above -->
 
 ## Description

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -7,9 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-- TMS-1054: Remove hero overlay-toggle from single page editor
+- 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
 
+## [1.14.0] - 2024-06-17
+
+- TMS-1054: Remove hero overlay-toggle from single page editor
+
 ## [1.13.0] - 2024-06-17
 
 - TMS-1045: Style changes:

diff --git 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
      */

diff --git a/partials/ui/event-highlight.dust b/partials/ui/event-highlight.dust
@@ -1,58 +1,70 @@
  <div class="column is-6 is-4-desktop mb-4 mb-0-desktop">
-    <div class="events__item has-height-100 {classes.event_item_bg}">
+    <div class="events__item has-height-100 {classes.event_item_bg|attr}">
         {?image}
             <div class="image is-16by9" aria-hidden="true">
-                <a href="{url}" aria-hidden="true" tabindex="-1">
-                    <img src="{image}" loading="lazy" alt="" class="objectfit-image">
+                <a href="{url|url}" aria-hidden="true" tabindex="-1">
+                    <img src="{image|url}" loading="lazy" alt="" class="objectfit-image">
                 </a>
                 {>"ui/event-item-pill" /}
             </div>
         {/image}
 
         <div class="events__item-inner pt-5 pr-6 pb-6 pl-6">
             <h3 class="h5 mt-0 mb-5">
-                <a href="{url}" class="has-text-black">
-                    {name|s}
+                <a href="{url|url}" class="has-text-black">
+                    {name|html}
                 </a>
             </h3>
 
             {?short_description}
-            <p>{short_description|s}</p>
+                <p>{short_description|kses}</p>
             {/short_description}
 
             {?primary_keyword}
-                <span class="is-sr-only">{primary_keyword|s}</span>
+                <span class="is-sr-only">{primary_keyword|html}</span>
             {/primary_keyword}
 
-            <div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text}">
-                <span class="is-flex" aria-label="{Strings.s.event.date|s}">
-                    {>"ui/icon" icon="date" class="icon--large is-primary mr-4 {classes.event_item_icon}" /}
+            <div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
+                <span class="is-flex" aria-label="{Strings.s.event.date|attr}">
+                    {>"ui/icon" icon="date" class="icon--large is-primary mr-4 {classes.event_item_icon|attr}" /}
                 </span>
 
-                {date|s}
+                {date|html}
             </div>
 
-            <div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text}">
-                <span class="is-flex" aria-label="{Strings.s.event.time|s}">
-                    {>"ui/icon" icon="time" class="icon--large is-primary mr-4 {classes.event_item_icon}" /}
+            <div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
+                <span class="is-flex" aria-label="{Strings.s.event.time|attr}">
+                    {>"ui/icon" icon="time" class="icon--large is-primary mr-4 {classes.event_item_icon|attr}" /}
                 </span>
 
-                {time|s}
+                {time|html}
             </div>
 
             {?location.name}
                 <div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text}">
-                    <span class="is-flex" aria-label="{Strings.s.event.location|s}">
-                        {>"ui/icon" icon="location" class="icon--large is-primary mr-4 {classes.event_item_icon}" /}
+                    <span class="is-flex" aria-label="{Strings.s.event.location|attr}">
+                        {>"ui/icon" icon="location" class="icon--large is-primary mr-4 {classes.event_item_icon|attr}" /}
                     </span>
 
-                    {location.name|s}
+                    {location.name|html}
                 </div>
             {/location.name}
 
+            {#price}
+                {?is_free}
+                    <div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
+                        <span class="is-flex" aria-label="{Strings.s.event.price|attr}">
+                            {>"ui/icon" icon="euro" class="icon--large is-primary mr-4 {iclasses.event_item_icon|attr}" /}
+                        </span>
+
+                        {price|html}
+                    </div>
+                {/is_free}
+            {/price}
+
             {?url}
-                <a href="{url}" class="button is-primary is-outlined is-small is-hidden-desktop mt-4">
-                    {Strings.s.common.read_more|s}
+                <a href="{url|url}" class="button is-primary is-outlined is-small is-hidden-desktop mt-4">
+                    {Strings.s.common.read_more|html}
                 </a>
             {/url}
         </div>

diff --git 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