Merge branch 'TMS-1059' into stage

devgeniem · Nov 19, 2024 · 7fd082b · 7fd082b
2 parents 3bd484b + 6d66e68
commit 7fd082b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 20 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- TMS-1059: Add Sign up-section to event partial
+
+## [1.8.0] - 2024-10-24
+
 - TMS-1075: Redipress 2 filters
 
 ## [1.7.3] - 2024-09-25

diff --git a/partials/views/single-dynamic-event/single-dynamic-event-info.dust b/partials/views/single-dynamic-event/single-dynamic-event-info.dust
@@ -1,84 +1,94 @@
 {?event.normalized.date}
-    <div class="info-group mb-5 {template_classes.info_group|s}">
+    <div class="info-group mb-5 {template_classes.info_group|attr}">
         {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.date_title template_classes=template_classes.info_group_title icon="date" /}
 
         <div class="info-group__description pr-8 pb-3 pl-9">
-            {event.normalized.date|s}
+            {event.normalized.date|html}
         </div>
     </div>
 {/event.normalized.date}
 
 {?event.normalized.time}
-    <div class="info-group mb-5 {template_classes.info_group|s}">
+    <div class="info-group mb-5 {template_classes.info_group|attr}">
         {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.time_title template_classes=template_classes.info_group_title icon="time" /}
 
         <div class="info-group__description pr-8 pb-3 pl-9">
-            {event.normalized.time|s}
+            {event.normalized.time|html}
         </div>
     </div>
 {/event.normalized.time}
 
 {?event.normalized.location}
-    <div class="info-group mb-5 {template_classes.info_group|s}">
+    <div class="info-group mb-5 {template_classes.info_group|attr}">
         {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.location_title template_classes=template_classes.info_group_title icon="location" /}
 
         <div class="info-group__description pr-8 pb-3 pl-9">
-            <div>{event.normalized.location.name|s}</div>
-            <div>{event.normalized.location.description|s}</div>
-            <div>{event.normalized.location.extra_info|s}</div>
+            <div>{event.normalized.location.name|html}</div>
+            <div>{event.normalized.location.description|html}</div>
+            <div>{event.normalized.location.extra_info|html}</div>
             {>"ui/link" link=event.normalized.location.info_url classes="is-inline-block mt-2" /}
         </div>
     </div>
 {/event.normalized.location}
 
 {?event.normalized.price}
-    <div class="info-group mb-5 {template_classes.info_group|s}">
+    <div class="info-group mb-5 {template_classes.info_group|attr}">
         {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.price_title template_classes=template_classes.info_group_title icon="euro" /}
 
         <div class="info-group__description pr-8 pb-3 pl-9">
             {#event.normalized.price}
                 <div>
-                    {price|s}
+                    {price|html}
                 </div>
                 <div>
-                    {description|s}
+                    {description|html}
                 </div>
                 {>"ui/link" link=info_url /}
             {/event.normalized.price}
         </div>
     </div>
 {/event.normalized.price}
 
+{?event.normalized.link_sign_up}
+    <div class="info-group mb-5 {template_classes.info_group|attr}">
+        {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.sign_up_title template_classes=template_classes.info_group_title icon="link" /}
+
+        <div class="info-group__description pr-8 pb-3 pl-9">
+            <a href="{event.normalized.link_sign_up.url|url}" target="_blank" class="is-block">{event.normalized.link_sign_up.name|html}</a>
+        </div>
+    </div>
+{/event.normalized.link_sign_up}
+
 {?event.normalized.provider}
-    <div class="info-group mb-5 {template_classes.info_group|s}">
+    <div class="info-group mb-5 {template_classes.info_group|attr}">
         {>"views/single-dynamic-event/single-dynamic-event-group-title" title=event.normalized.provider_title template_classes=template_classes.info_group_title icon="bullhorn" /}
 
         <div class="info-group__description pr-8 pb-3 pl-9">
-            <div>{event.normalized.provider.name|s}</div>
+            <div>{event.normalized.provider.name|html}</div>
 
             {?event.normalized.provider.email}
                 <div>
-                    <a href="mailto:{event.normalized.provider.email}"
+                    <a href="mailto:{event.normalized.provider.email|attr}"
                        class="has-text-black">
-                        {event.normalized.provider.email|s}
+                        {event.normalized.provider.email|html}
                     </a>
                 </div>
             {/event.normalized.provider.email}
 
             {?event.normalized.provider.phone}
                 <div>
-                    <a href="tel:{event.normalized.provider.phone}"
+                    <a href="tel:{event.normalized.provider.phone|attr}"
                        class="has-text-black">
-                        {event.normalized.provider.phone|s}
+                        {event.normalized.provider.phone|html}
                     </a>
                 </div>
             {/event.normalized.provider.phone}
         </div>
     </div>
 
-    {>"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}
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.3
+ * Version:     1.8.0
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Template:    tms-theme-base