Merge branch 'TMS-1067' into stage

devgeniem · Sep 16, 2024 · 8910e82 · 8910e82
2 parents 9319c03 + a5c6f31
commit 8910e82
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 43 deletions.
diff --git 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
@@ -1,58 +1,70 @@
-<div class="events__item has-height-100 {item_classes.grid.item|s}">
+<div class="events__item has-height-100 {item_classes.grid.item|attr}">
     {?image}
         <div class="image is-relative is-4by3" aria-hidden="true">
-            <a href="{url}" aria-hidden="true" tabindex="-1">
-                <img src="{image}" alt="" class="objectfit-image">
+            <a href="{url|url}" aria-hidden="true" tabindex="-1">
+                <img src="{image|url}" alt="" class="objectfit-image">
             </a>
 
             {?primary_keyword}
                 <span class="pill is-absolute has-bottom-2 has-left-2 is-bordered is-secondary">
-                    {primary_keyword|s}
+                    {primary_keyword|html}
                 </span>
             {/primary_keyword}
 
         </div>
     {/image}
 
-    <div class="events__item-inner pt-5 pb-6 {item_classes.grid.item_inner|s}">
+    <div class="events__item-inner pt-5 pb-6 {item_classes.grid.item_inner|attr}">
         <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>
 
         <p class="has-text-small">
-            {short_description|s}
+            {short_description|kses}
         </p>
 
         <div class="is-flex is-align-items-center mt-2 mb-2">
-            <span class="is-flex" aria-label="{Strings.s.event.date|s}">
-                {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
+            <span class="is-flex" aria-label="{Strings.s.event.date|attr}">
+                {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
             </span>
 
-            {date|s}
+            {date|html}
         </div>
 
         <div class="is-flex is-align-items-center mt-2 mb-2">
-            <span class="is-flex" aria-label="{Strings.s.event.time|s}">
-                {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
+            <span class="is-flex" aria-label="{Strings.s.event.time|attr}">
+                {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
             </span>
 
-            {time|s}
+            {time|html}
         </div>
 
         {?location.name}
             <div class="is-flex is-align-items-center mt-2 mb-2">
-                <span class="is-flex" aria-label="{Strings.s.event.location|s}">
-                    {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
+                <span class="is-flex" aria-label="{Strings.s.event.location|attr}">
+                    {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
                 </span>
 
-                {location.name|s}
+                {location.name|html}
             </div>
         {/location.name}
 
-        <a href="{url}" class="button is-primary is-small mt-4">
-            {Strings.s.common.read_more|s}
+        {#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-2 {item_classes.grid.icon|attr}" /}
+                    </span>
+
+                    {price|html}
+                </div>
+            {/is_free}
+        {/price}
+
+        <a href="{url|url}" class="button is-primary is-small mt-4">
+            {Strings.s.common.read_more|html}
         </a>
     </div>
 </div>
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
@@ -1,19 +1,19 @@
-<div class="events__item columns is-gapless mt-4 mb-4 has-border has-border-1 {item_classes.list.item|s}">
+<div class="events__item columns is-gapless mt-4 mb-4 has-border has-border-1 {item_classes.list.item|attr}">
     {?image}
         <div class="column is-4 is-relative">
-            <a href="{url}" class="is-hidden-mobile is-overlay has-background-cover" aria-hidden="true"
+            <a href="{url|url}" class="is-hidden-mobile is-overlay has-background-cover" aria-hidden="true"
                tabindex="-1" {@inlinebg url=image /}></a>
 
             <div class="image is-16by9 is-hidden-tablet" aria-hidden="true">
-                <a href="{url}" aria-hidden="true" tabindex="-1">
-                    <img src="{image}" alt="" class="objectfit-image">
+                <a href="{url|url}" aria-hidden="true" tabindex="-1">
+                    <img src="{image|url}" alt="" class="objectfit-image">
                 </a>
             </div>
 
             {?primary_keyword}
                 <span
                     class="is-absolute has-top-1 has-left-1 pill is-bordered has-background-primary-invert has-text-primary">
-                    {primary_keyword|s}
+                    {primary_keyword|attr}
                 </span>
             {/primary_keyword}
         </div>
@@ -22,45 +22,45 @@
     <div class="column">
         <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>
 
             <div class="is-flex is-flex-wrap-wrap">
-                <div class="is-flex is-align-items-center mt-2 mb-2 mr-4 {item_classes.list.meta_label|s}">
-                    <span class="is-flex" aria-label="{Strings.s.event.date|s}">
-                        {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.list.icon|s}" /}
+                <div class="is-flex is-align-items-center mt-2 mb-2 mr-4 {item_classes.list.meta_label|attr}">
+                    <span class="is-flex" aria-label="{Strings.s.event.date|attr}">
+                        {>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /}
                     </span>
 
-                    {date|s}
+                    {date|html}
                 </div>
 
-                <div class="is-flex is-align-items-center mt-2 mb-2 mr-4 {item_classes.list.meta_label|s}">
-                    <span class="is-flex" aria-label="{Strings.s.event.time|s}">
-                        {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.list.icon|s}" /}
+                <div class="is-flex is-align-items-center mt-2 mb-2 mr-4 {item_classes.list.meta_label|attr}">
+                    <span class="is-flex" aria-label="{Strings.s.event.time|attr}">
+                        {>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /}
                     </span>
 
-                    {time|s}
+                    {time|html}
                 </div>
 
                 {?location.name}
-                    <div class="is-flex is-align-items-center mt-2 mb-2 {item_classes.list.meta_label|s}">
-                        <span class="is-flex" aria-label="{Strings.s.event.location|s}">
-                            {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.list.icon|s}" /}
+                    <div class="is-flex is-align-items-center mt-2 mb-2 {item_classes.list.meta_label|attr}">
+                        <span class="is-flex" aria-label="{Strings.s.event.location|attr}">
+                            {>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.list.icon|attr}" /}
                         </span>
 
-                        {location.name|s}
+                        {location.name|html}
                     </div>
                 {/location.name}
             </div>
 
-            <p class="has-text-small {item_classes.list.description|s}">
-                {short_description|s}
+            <p class="has-text-small {item_classes.list.description|attr}">
+                {short_description|kses}
             </p>
 
-            <a href="{url}" class="button is-primary is-small mt-4">
-                {Strings.s.common.read_more|s}
+            <a href="{url|url}" class="button is-primary is-small mt-4">
+                {Strings.s.common.read_more|html}
             </a>
         </div>
     </div>

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