Merge pull request #16 from devgeniem/TMS-970

TMS-970: Add image meta to cta and content-columns components
devgeniem · Oct 23, 2023 · 0ea89af · 0ea89af
2 parents c12c625 + cf3bba1
commit 0ea89af
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 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]
 
+## [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
 
 ### Fixed

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