Merge 7e5d7e901c into 4f78cced7f

wagtail/images/blocks.py

@@ -2,7 +2,7 @@ from django.template.loader import render_to_string
 from django.utils.functional import cached_property
 
 from wagtail.admin.compare import BlockComparison
-from wagtail.blocks import ChooserBlock
+from wagtail.blocks import BooleanBlock, CharBlock, ChooserBlock, StructBlock
 
 from .shortcuts import get_rendition_or_not_found
 
@@ -51,3 +51,13 @@ class ImageChooserBlockComparison(BlockComparison):
                 "image_b": self.val_b,
             },
         )
+
+
+class ImageBlock(StructBlock):
+    image = ImageChooserBlock(required=True)
+    alt_text = CharBlock(required=True)
+    decorative = BooleanBlock(default=False, required=False)
+
+    class Meta:
+        icon = "image"
+        template = "wagtailimages/widgets/image.html"

wagtail/images/templates/wagtailimages/widgets/image.html

@@ -0,0 +1,9 @@
+{% load wagtailimages_tags %}
+
+<figure>
+    {% if self.decorative %}
+        {% image self.image fill-600x338 loading="lazy" %}
+    {% else %}
+        {% image self.image fill-600x338 loading="lazy" alt=self.alt_text %}
+    {% endif %}
+</figure>