Merge branch 'TMS-1061' into stage

devgeniem · Aug 27, 2024 · ff5517d · ff5517d
2 parents 176d83a + 0b13611
commit ff5517d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 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-1061: Change hero video-field from URL to File, since the URL wasn't working
+
+## [1.58.0] - 2024-08-21
+
 - TMS-1057: Increase articles lead-text font-size
 
 ## [1.57.0] - 2024-06-26

diff --git a/lib/ACF/Fields/HeroFields.php b/lib/ACF/Fields/HeroFields.php
@@ -80,9 +80,9 @@ protected function sub_fields() : array {
             ->set_wrapper_width( 50 )
             ->set_instructions( $strings['image']['instructions'] );
 
-        $video_field = ( new Field\URL( $strings['video']['label'] ) )
-            ->set_key( "${key}_video" )
-            ->set_name( 'video' )
+        $video_field = ( new Field\File( $strings['video']['label'] ) )
+            ->set_key( "${key}_video_file" )
+            ->set_name( 'video_file' )
             ->set_wrapper_width( 50 )
             ->set_instructions( $strings['video']['instructions'] );
 

diff --git a/partials/layouts/layout-hero.dust b/partials/layouts/layout-hero.dust
@@ -4,9 +4,9 @@
         <div class="overlay overlay--dark-50"></div>
     {/use_overlay}
 
-    {?video}
+    {?video_file}
         <div class="is-overlay is-clipped" aria-hidden="true" tabindex="-1">
-            <video src="{video}" class="hero__video is-hidden" loop muted playsinline></video>
+            <video src="{video_file.url|url}" class="hero__video is-hidden" loop muted playsinline></video>
 
             <button class="hero__control hero__control--play" aria-label="{Strings.s.video.play|attr}">
                 {>"ui/icon" icon="play" class="icon--xxxlarge"  /}
@@ -16,7 +16,7 @@
                 {>"ui/icon" icon="pause" class="icon--xxxlarge"  /}
             </button>
         </div>
-    {/video}
+    {/video_file}
 
     <div class="hero__inner">
         <div class="container">

diff --git a/style.css b/style.css
@@ -2,7 +2,7 @@
  * Theme Name:  TMS Theme Base
  * Description: Tampere Multisite Base Theme
  * Domain Path: /lang
- * Version:     1.57.0
+ * Version:     1.58.0
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Text Domain: tms-theme-base