Merge pull request #142 from devgeniem/TMS-970

TMS-970: Add image meta to content-columns component
devgeniem · Oct 23, 2023 · 9ae28b4 · 9ae28b4
2 parents 11f7df3 + 12fa35f
commit 9ae28b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
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.6.4] - 2023-10-23
+
+- TMS-970: Add image meta to content-columns component
+
 ## [1.6.3] - 2023-10-12
 
 - TMS-936: Image carousel accessibility fixes

diff --git a/partials/layouts/layout-content-columns.dust b/partials/layouts/layout-content-columns.dust
@@ -7,6 +7,11 @@
                         <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}
                             {?image_author_and_artist}
                                 <small>{image_author_and_artist|html}</small>
@@ -24,7 +29,7 @@
 
                     {?description}
                         <div class="content-columns__description mt-6 keep-vertical-spacing">
-                            {description|html}
+                            {description|kses}
                         </div>
                     {/description}
                 </div>