Merge branch 'master' into TMS-1199

Author: eebbi

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
-Severa-ID: 2108
-Severa-kuvaus: 
+Project: Tampereen kaupunki, konsernihallinto / Tietohallintoyksikkö: 
+Ticket description: 
 Task: https://hiondigital.atlassian.net/browse/TMS-
 
 <!--- Provide a general summary of your changes in the Title above -->

CHANGELOG.MD

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - TMS-1199: Change events-search no-results text
 
+## [1.66.0] - 2025-10-01
+
+- TMS-1201: Add iframe-field for video fields
+
+
 ## [1.65.0] - 2025-09-08
 
 - TMS-1166: Fix duet-datepicker border on focus

lib/ACF/Fields/VideoFields.php

@@ -49,6 +49,10 @@ protected function sub_fields() : array {
                 'label'        => 'Alt-teksti ruudunlukijoille',
                 'instructions' => '',
             ],
+            'video_iframe' => [
+                'label'        => 'Videon upotuskoodi',
+                'instructions' => 'Lisää tähän videon upotuskoodi, jos videota ei voi käyttää pelkän urlin kautta (esim. Quickchannel).',
+            ],
             'align'    => [
                 'label'        => 'Asemointi',
                 'instructions' => '',
@@ -58,19 +62,24 @@ protected function sub_fields() : array {
         $key = $this->get_key();
 
         $video_field = ( new Field\Oembed( $strings['video']['label'] ) )
-            ->set_key( "${key}_video" )
+            ->set_key( "{$key}_video" )
             ->set_name( 'video' )
             ->set_wrapper_width( 50 )
             ->set_instructions( $strings['video']['instructions'] );
 
         $alt_text_field = ( new Field\Textarea( $strings['alt_text']['label'] ) )
-            ->set_key( "${key}_alt_text" )
+            ->set_key( "{$key}_alt_text" )
             ->set_name( 'alt_text' )
             ->set_wrapper_width( 50 )
             ->set_instructions( $strings['alt_text']['instructions'] );
 
+        $video_iframe_field = ( new Field\Textarea( $strings['video_iframe']['label'] ) )
+            ->set_key( "{$key}_video_iframe" )
+            ->set_name( 'video_iframe' )
+            ->set_instructions( $strings['video_iframe']['instructions'] );
+
         $align_field = ( new Field\Radio( $strings['align']['label'] ) )
-            ->set_key( "${key}_align" )
+            ->set_key( "{$key}_align" )
             ->set_name( 'align' )
             ->set_default_value( 'default' )
             ->set_choices( [
@@ -84,6 +93,7 @@ protected function sub_fields() : array {
         return [
             $video_field,
             $alt_text_field,
+            $video_iframe_field,
             $align_field,
         ];
     }

partials/blocks/block-video.dust

@@ -1,25 +1,29 @@
-{?video}
-    <div
-        class="video {@eq key=align value="full"}is-align-full{:else}is-align-wide{/eq} mt-4 mb-4 mt-8-tablet mb-8-tablet is-relative"
-        {?anchor}id="{anchor|attr}"{/anchor}>
-        {>"shared/layout-before-main-content" /}
+<div
+    class="video {@eq key=align value="full"}is-align-full{:else}is-align-wide{/eq} mt-4 mb-4 mt-8-tablet mb-8-tablet is-relative"
+    {?anchor}id="{anchor|attr}"{/anchor}>
+    {>"shared/layout-before-main-content" /}
 
-        {?alt_text}
-            <span class="is-sr-only">{alt_text|html}</span>
-        {/alt_text}
+    {?alt_text}
+        <span class="is-sr-only">{alt_text|html}</span>
+    {/alt_text}
 
-        {! Skip embed !}
-        <a href="#{id|attr}" class="skip-to-content">
-            {skip_text|kses}
-        </a>
+    {! Skip embed !}
+    <a href="#{id|attr}" class="skip-to-content">
+        {skip_text|kses}
+    </a>
 
+    {?video}
         <div class="image is-16by9 is-embed-container">
             {video|s}
         </div>
+    {/video}
 
-        {! Skip embed target !}
-        <div id="{id|attr}"></div>
+    {?video_iframe}
+        {video_iframe|s}
+    {/video_iframe}
 
-        {>"shared/layout-after-main-content" /}
-    </div>
-{/video}
+    {! Skip embed target !}
+    <div id="{id|attr}"></div>
+
+    {>"shared/layout-after-main-content" /}
+</div>

style.css

@@ -2,7 +2,7 @@
  * Theme Name:  TMS Theme Base
  * Description: Tampere Multisite Base Theme
  * Domain Path: /lang
- * Version:     1.65.0
+ * Version:     1.66.0
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Text Domain: tms-theme-base