Merge branch 'master' into TMS-768

Author: tim0haapala

CHANGELOG.MD

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
+- Fix image clickable option #396
 - TMS-674: Fix modaal background focus & translations #395
 - TMS-769: Fix issue with countdown block text contrast in certain color schemes.
 - TMS-766: Fix displaying image author on Call to Action.

partials/blocks/block-image-gallery.dust

@@ -2,21 +2,26 @@
      data-next="{translations.next}"
      data-previous="{translations.previous}">
     {#rows}
-        <a href="{image.sizes.fullhd}"
-           data-preview="{image.sizes.medium}"
-           data-gallery="{gallery_id}"
-           data-modal-button
-           aria-controls="{gallery_id}"
-           data-caption="{caption}"
-           data-author="{author_name}"
-           data-image_title_and_artist="{image_title_and_artist}"
-           class="image-gallery__image image-gallery__link image is-square has-zoom-on-hover"
-           aria-expanded="false"
-           aria-label="{translations.open}"
-        >
-            {@image id=image.id size="large" alt=image.alt title=image.alt /}
-        </a>
-
+        {?is_clickable}
+            <a href="{image.sizes.fullhd|url}"
+               data-preview="{image.sizes.medium|url}"
+               data-gallery="{gallery_id|attr}"
+               data-modal-button
+               aria-controls="{gallery_id|attr}"
+               data-caption="{caption|html}"
+               data-author="{author_name|html}"
+               data-image_title_and_artist="{image_title_and_artist|html}"
+               class="image-gallery__image image-gallery__link image is-square has-zoom-on-hover"
+               aria-expanded="false"
+               aria-label="{translations.open|html}"
+            >
+                {@image id=image.id size="large" alt=image.alt title=image.alt /}
+            </a>
+        {:else}
+            <div class="image-gallery__image image is-square">
+                {@image id=image.id size="large" alt=image.alt title=image.alt /}
+            </div>
+        {/is_clickable}
     {/rows}
 
     <!-- Markup of the modal -->