Anonym Part 5: About Page

bedrock/mozorg/blocks/anonym.py

@@ -8,6 +8,7 @@
 from wagtail import blocks
 from wagtail.contrib.table_block.blocks import TableBlock
 from wagtail.images.blocks import ImageChooserBlock
+from wagtail.snippets.blocks import SnippetChooserBlock
 from wagtail_link_block.blocks import LinkBlock
 from wagtail_thumbnail_choice_block import ThumbnailChoiceBlock
 
@@ -450,12 +451,23 @@ class Meta:
         label_format = "Logo Card - {heading}"
 
 
+class PersonCardBlock(blocks.StructBlock):
+    person = SnippetChooserBlock("mozorg.Person")
+    link = blocks.ListBlock(LinkWithTextBlock(), min_num=0, max_num=1, default=[])
+
+    class Meta:
+        template = "mozorg/cms/anonym/blocks/person-card.html"
+        label = "Person Card"
+        label_format = "Person Card - {person}"
+
+
 class CardsListBlock(blocks.StructBlock):
     settings = CardListSettings()
     cards = blocks.StreamBlock(
         [
             ("icon_card", IconCardBlock()),
             ("logo_card", LogoCardBlock()),
+            ("person_card", PersonCardBlock()),
         ],
         min_num=1,
         max_num=4,
@@ -507,6 +519,29 @@ class Meta:
         value_class = SectionBlockSettingsValue
 
 
+class ListItemBlock(blocks.StructBlock):
+    heading_text = blocks.CharBlock(label="Heading")
+    supporting_text = blocks.RichTextBlock(features=BASIC_TEXT_FEATURES)
+
+    class Meta:
+        label = "List Item"
+        label_format = "{heading_text}"
+        template = "mozorg/cms/anonym/blocks/list-item.html"
+        form_classname = "compact-form struct-block"
+
+
+class TwoColumnBlock(blocks.StructBlock):
+    heading_text = blocks.CharBlock(label="Heading")
+    subheading_text = blocks.RichTextBlock(features=BASIC_TEXT_FEATURES)
+    second_column = blocks.ListBlock(ListItemBlock(), min_num=0)
+
+    class Meta:
+        label = "Two Column Block"
+        label_format = "Two Column - {heading_text}"
+        template = "mozorg/cms/anonym/blocks/two-column.html"
+        form_classname = "compact-form struct-block"
+
+
 class SectionBlock(blocks.StructBlock):
     is_section_block = True
 
@@ -525,6 +560,7 @@ class SectionBlock(blocks.StructBlock):
             ("stats_list_block", StatsListBlock()),
             ("people_list", PeopleListBlock()),
             ("table", TableBlock()),
+            ("two_column", TwoColumnBlock()),
         ],
         required=False,
     )

bedrock/mozorg/models.py

@@ -241,6 +241,47 @@ def __str__(self):
         return f"{self.notification_text} - Notification Snippet"
 
 
+@register_snippet
+class Person(TranslatableMixin):
+    image = models.ForeignKey(
+        "cms.BedrockImage",
+        null=True,
+        blank=False,
+        on_delete=models.SET_NULL,
+        related_name="+",
+    )
+    name = models.CharField(
+        max_length=255,
+        blank=False,
+    )
+    position = models.CharField(
+        max_length=255,
+        blank=False,
+    )
+    description = models.TextField(
+        blank=True,
+    )
+
+    panels = [
+        MultiFieldPanel(
+            [
+                FieldPanel("image", heading="Image"),
+                FieldPanel("name", heading="Name"),
+                FieldPanel("position", heading="Position"),
+                FieldPanel("description", heading="Description"),
+            ],
+            heading="Person",
+        ),
+    ]
+
+    class Meta(TranslatableMixin.Meta):
+        verbose_name = "Person"
+        verbose_name_plural = "People"
+
+    def __str__(self):
+        return f"{self.name} - {self.position}"
+
+
 class LeadershipPage(AbstractBedrockCMSPage):
     max_count = 1  # Ensure there's only one instance of this page
     subpage_types = []  # This page type cannot have any children

bedrock/mozorg/templates/mozorg/cms/anonym/blocks/list-item.html

@@ -0,0 +1,10 @@
+{#
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#}
+
+<li>
+  <h4>{{ value.heading_text|linebreaksbr }}</h4>
+  <div>{{ value.supporting_text|richtext }}</div>
+</li>

bedrock/mozorg/templates/mozorg/cms/anonym/blocks/person-card.html

@@ -0,0 +1,20 @@
+{#
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#}
+
+<li class="mzan-card">
+  <img src="{{ value.person.image.file.url }}" alt="{{ value.person.image.description }}" width="64" height="64" loading="lazy">
+  <div>{{ value.person.name }}</div>
+  <div>{{ value.person.position }}</div>
+  <div>{{ value.person.description }}</div>
+  {% if value.link %}
+    {% for link in value.link %}
+      <a class=""
+        href="{{ link.link.get_url() }}"
+        {% if link.link.new_window %}target="_blank" rel="external noopener"{% endif %}
+      >{{ link.label }}</a>
+    {% endfor %}
+  {% endif %}
+</li>

bedrock/mozorg/templates/mozorg/cms/anonym/blocks/two-column.html

@@ -0,0 +1,20 @@
+{#
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#}
+
+<div class="{% if value.second_column %}mzan-half-grid{% endif %}">
+  <div>
+    <h3>{{ value.heading_text }}</h3>
+    <p">{{ value.subheading_text }}</p>
+  </div>
+
+  {% if value.second_column %}
+    <ul>
+      {% for item in value.second_column %}
+        {% include_block item %}
+      {% endfor %}
+    </ul>
+  {% endif %}
+</div>