From 854295ebb2b9fed8595b6b7edb861f22b8cb8a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= <eepi1994@hotmail.com>
Date: Mon, 16 Oct 2023 12:04:22 +0300
Subject: [PATCH 1/2] TMS-970: Add image meta to cta and content-columns
 components

---
 CHANGELOG.MD                                 | 2 ++
 partials/layouts/layout-call-to-action.dust  | 8 ++++++++
 partials/layouts/layout-content-columns.dust | 8 ++++++++
 3 files changed, 18 insertions(+)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 8c3819a..5337dc7 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- TMS-970: Add image meta to call-to-action and content-columns components
+
 ## [1.1.3] - 2023-10-12
 
 ### Fixed
diff --git a/partials/layouts/layout-call-to-action.dust b/partials/layouts/layout-call-to-action.dust
index 20d8731..d0cebe0 100644
--- a/partials/layouts/layout-call-to-action.dust
+++ b/partials/layouts/layout-call-to-action.dust
@@ -11,6 +11,14 @@
                             {@image id=image.id size="large" class="objectfit-image" /}
                         </div>
                         {>"shared/layout-before-main-content" /}
+
+                        {@isset key1=display_caption key2=image.caption method="and" }
+                            {>"ui/image/image-caption"  /}
+                        {/isset}
+
+                        {?display_artist}
+                            {>"ui/image/image-meta-minimal"  /}
+                        {/display_artist}
                     </div>
                 {/image}
 
diff --git a/partials/layouts/layout-content-columns.dust b/partials/layouts/layout-content-columns.dust
index df159cc..2257e6d 100644
--- a/partials/layouts/layout-content-columns.dust
+++ b/partials/layouts/layout-content-columns.dust
@@ -7,6 +7,14 @@
                         <div class="image">
                             {@image id=image.id size="large" class="objectfit-image" /}
                         </div>
+
+                        {@isset key1=display_caption key2=image.caption method="AND" }
+                            {>"ui/image/image-caption"  /}
+                        {/isset}
+
+                        {?display_artist}
+                            {>"ui/image/image-meta-minimal" /}
+                        {/display_artist}
                     </div>
                 {/image}
 

From cf3bba176efda9fec160319b0539c736eb9e6791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20V=C3=A4nttinen?= <eepi1994@hotmail.com>
Date: Mon, 23 Oct 2023 11:52:02 +0300
Subject: [PATCH 2/2] 1.1.4

---
 CHANGELOG.MD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 5337dc7..cc3fcdf 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.1.4] - 2023-10-23
+
 - TMS-970: Add image meta to call-to-action and content-columns components
 
 ## [1.1.3] - 2023-10-12