Methodology page

cms/analysis/models.py

@@ -13,9 +13,9 @@
 from wagtail.models import Page
 from wagtail.search import index
 
-from cms.analysis.blocks import AnalysisStoryBlock
 from cms.bundles.models import BundledPageMixin
 from cms.core.blocks import HeadlineFiguresBlock
+from cms.core.blocks.section_block import SectionStreamBlock
 from cms.core.fields import StreamField
 from cms.core.models import BasePage
 
@@ -120,7 +120,7 @@ class AnalysisPage(BundledPageMixin, BasePage):  # type: ignore[django-manager-m
 
     # Fields: content
     headline_figures = StreamField([("figures", HeadlineFiguresBlock())], blank=True, max_num=1)
-    content = StreamField(AnalysisStoryBlock())
+    content = StreamField(SectionStreamBlock())
 
     show_cite_this_page = models.BooleanField(default=True)
 

cms/analysis/blocks.py → cms/core/blocks/section_block.py

@@ -6,6 +6,9 @@
 from wagtail.images.blocks import ImageChooserBlock
 from wagtailmath.blocks import MathBlock
 
+if TYPE_CHECKING:
+    from wagtail.blocks import StructValue
+
 from cms.core.blocks import (
     DocumentsBlock,
     HeadingBlock,
@@ -15,42 +18,39 @@
     RelatedLinksBlock,
 )
 
-if TYPE_CHECKING:
-    from wagtail.blocks import StructValue
-
 
 class SectionContentBlock(StreamBlock):
-    """The analysis section content StreamField block definition."""
+    """The core section content block definition."""
 
     rich_text = RichTextBlock()
     panel = PanelBlock()
+    embed = EmbedBlock(group="Media")
     image = ImageChooserBlock(group="Media")
     documents = DocumentsBlock(group="Media")
-    embed = EmbedBlock(group="Media")
+    related_links = RelatedLinksBlock(RelatedContentBlock(), icon="link")
     equation = MathBlock(group="DataVis", icon="decimal")
     ons_embed = ONSEmbedBlock(group="DataVis", label="ONS General Embed")
-    related_links = RelatedLinksBlock(RelatedContentBlock(), icon="link")
 
     class Meta:
         template = "templates/components/streamfield/stream_block.html"
-        block_counts: ClassVar[dict[str, dict]] = {"related_links": {"max_num": 1}}
 
 
 class SectionBlock(StructBlock):
-    """The analysis section block definition."""
+    """The core section block definition with headers."""
 
     title = HeadingBlock()
     content = SectionContentBlock()
 
+    class Meta:
+        block_counts: ClassVar[dict[str, dict]] = {"related_links": {"max_num": 1}}
+        template = "templates/components/streamfield/section_with_header_block.html"
+
     def to_table_of_contents_items(self, value: "StructValue") -> list[dict[str, str]]:
         """Convert the value to the table of contents component macro format."""
         return [{"url": "#" + slugify(value["title"]), "text": value["title"]}]
 
-    class Meta:
-        template = "templates/components/streamfield/analysis_section_block.html"
-
 
-class AnalysisStoryBlock(StreamBlock):
+class SectionStreamBlock(StreamBlock):
     """The analysis StreamField block definition."""
 
     section = SectionBlock()

cms/jinja2/templates/components/streamfield/analysis_section_block.html → cms/jinja2/templates/components/streamfield/section_with_header_block.html

@@ -3,3 +3,4 @@ <h2 class="ons-u-fs-l">{{ value.title }}</h2>
 
     {% include_block value.content %}
 </section>
+

cms/jinja2/templates/pages/methodology_page.html

@@ -0,0 +1 @@
+{% extends "templates/base_page.html" %}