From c9b37b8cb2aafb69a6e05014f59690dfafe9833a Mon Sep 17 00:00:00 2001
From: Amanda Lim-Cabuloy <amanda.lim@torchbox.com>
Date: Fri, 10 Jan 2025 19:43:30 +0800
Subject: [PATCH 1/5] Add intro to BlogChooserBlock

---
 tbx/core/blocks.py                                       | 3 +++
 .../molecules/streamfield/blocks/blog_chooser_block.html | 9 +++++++++
 .../molecules/streamfield/blocks/blog_chooser_block.yaml | 3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/tbx/core/blocks.py b/tbx/core/blocks.py
index 9c3e5c909..768d5a9ea 100644
--- a/tbx/core/blocks.py
+++ b/tbx/core/blocks.py
@@ -473,6 +473,9 @@ def clean(self, value):
 
 class BlogChooserBlock(blocks.StructBlock):
     featured_blog_heading = blocks.CharBlock(max_length=255)
+    intro = blocks.RichTextBlock(
+        features=settings.NO_HEADING_RICH_TEXT_FEATURES, required=False
+    )
     blog_pages = blocks.ListBlock(
         blocks.PageChooserBlock(page_type="blog.BlogPage"),
         min_num=1,
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html
index 075b5d6ae..4a7b1d92b 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html
@@ -1,11 +1,20 @@
 {% load wagtailcore_tags %}
 
+{# Section heading #}
 {% if is_standard_page %}
     <h2 class="heading heading--two-b heading--light grid__heading mb-spacerMedium">{{ value.featured_blog_heading }}</h2>
 {% else %}
     {% include "patterns/atoms/motif-heading/motif-heading.html" with heading_level=2 heading=value.featured_blog_heading classes="motif-heading--two motif-heading--static  motif-heading--half-width   section-title--related-posts" %}
 {% endif %}
 
+{# Section intro #}
+{% if value.intro %}
+    <div class="rich-text">
+        {{ value.intro|richtext }}
+    </div>
+{% endif %}
+
+{# Blog posts #}
 <ul class="grid__related-posts streamfield__related-posts mb-spacerMedium lg:mb-spacerLarge">
     {% for blog_page in value.blog_pages %}
         {% pageurl blog_page.blog_index as blog_index_url %}
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml
index 6c0552cdf..588c27ae0 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml
@@ -1,6 +1,7 @@
 context:
   value:
-    featured_blog_heading: Case studies
+    featured_blog_heading: Blog posts
+    intro: '<p>An injection of fresh ideas, and the occasional challenging opinion, to ignite your fire.</p>'
     blog_pages:
       - title: Explore the potential of AI in content management
         date: 20 Oct 2023

From 59b3b10c73250db19dce39348dc49e8844947247 Mon Sep 17 00:00:00 2001
From: Amanda Lim-Cabuloy <amanda.lim@torchbox.com>
Date: Fri, 10 Jan 2025 19:46:45 +0800
Subject: [PATCH 2/5] Add intro to WorkChooserBlock

---
 tbx/core/blocks.py                                       | 3 +++
 .../molecules/streamfield/blocks/work_chooser_block.html | 9 +++++++++
 .../molecules/streamfield/blocks/work_chooser_block.yaml | 1 +
 3 files changed, 13 insertions(+)

diff --git a/tbx/core/blocks.py b/tbx/core/blocks.py
index 768d5a9ea..98cc988b7 100644
--- a/tbx/core/blocks.py
+++ b/tbx/core/blocks.py
@@ -502,6 +502,9 @@ def get_context(self, value, parent_context=None):
 
 class WorkChooserBlock(blocks.StructBlock):
     featured_work_heading = blocks.CharBlock(max_length=255)
+    intro = blocks.RichTextBlock(
+        features=settings.NO_HEADING_RICH_TEXT_FEATURES, required=False
+    )
     work_pages = blocks.ListBlock(
         blocks.PageChooserBlock(page_type=["work.WorkPage", "work.HistoricalWorkPage"]),
         min_num=1,
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html
index 17d962775..53261eca9 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html
@@ -1,12 +1,21 @@
 {% load wagtailcore_tags %}
 
 {% if work_pages %}
+    {# Section heading #}
     {% if is_standard_page %}
         <h2 class="heading heading--two-b heading--light grid__heading mb-spacerMedium">{{ value.featured_work_heading }}</h2>
     {% else %}
         {% include "patterns/atoms/motif-heading/motif-heading.html" with heading_level=2 heading=value.featured_work_heading classes="motif-heading--two motif-heading--static  motif-heading--half-width section-title--related-posts" %}
     {% endif %}
 
+    {# Section intro #}
+    {% if value.intro %}
+        <div class="rich-text">
+            {{ value.intro|richtext }}
+        </div>
+    {% endif %}
+
+    {# Work pages / Case study pages #}
     <ul class="grid__related-posts streamfield__related-posts mb-spacerMedium lg:mb-spacerLarge">
         {% for work_page in work_pages %}
             {% pageurl work_page.work_index as work_index_url %}
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml
index 138eca9c5..ed638b8ef 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml
@@ -1,6 +1,7 @@
 context:
   value:
     featured_work_heading: Case studies
+    intro: '<p>An injection of fresh ideas, and the occasional challenging opinion, to ignite your fire.</p>'
   work_pages:
     - title: Imagining and designing a future product for MQ in 5 days flat
       client: 'MQ: Transforming Mental Health'

From 1154aae900907fc9fdef64de8694997ff13b2cc7 Mon Sep 17 00:00:00 2001
From: Amanda Lim-Cabuloy <amanda.lim@torchbox.com>
Date: Fri, 10 Jan 2025 20:05:45 +0800
Subject: [PATCH 3/5] Comment out intro from pattern library for now

---
 .../molecules/streamfield/blocks/blog_chooser_block.yaml        | 2 +-
 .../molecules/streamfield/blocks/work_chooser_block.yaml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml
index 588c27ae0..58158c704 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml
@@ -1,7 +1,7 @@
 context:
   value:
     featured_blog_heading: Blog posts
-    intro: '<p>An injection of fresh ideas, and the occasional challenging opinion, to ignite your fire.</p>'
+    # intro: '<p>An injection of fresh ideas, and the occasional challenging opinion, to ignite your fire.</p>'
     blog_pages:
       - title: Explore the potential of AI in content management
         date: 20 Oct 2023
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml
index ed638b8ef..df72bc19c 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml
@@ -1,7 +1,7 @@
 context:
   value:
     featured_work_heading: Case studies
-    intro: '<p>An injection of fresh ideas, and the occasional challenging opinion, to ignite your fire.</p>'
+    # intro: '<p>An injection of fresh ideas, and the occasional challenging opinion, to ignite your fire.</p>'
   work_pages:
     - title: Imagining and designing a future product for MQ in 5 days flat
       client: 'MQ: Transforming Mental Health'

From b9ecca70707c5439a2377b004dbfc9bf03230578 Mon Sep 17 00:00:00 2001
From: Amanda Lim-Cabuloy <amanda.lim@torchbox.com>
Date: Thu, 16 Jan 2025 20:12:30 +0800
Subject: [PATCH 4/5] Add primary & secondary buttons also, commented out from
 the YAML file

---
 tbx/core/blocks.py                                        | 4 ++++
 .../molecules/streamfield/blocks/blog_chooser_block.html  | 8 ++++++++
 .../molecules/streamfield/blocks/blog_chooser_block.yaml  | 8 ++++++++
 .../molecules/streamfield/blocks/work_chooser_block.html  | 8 ++++++++
 .../molecules/streamfield/blocks/work_chooser_block.yaml  | 8 ++++++++
 5 files changed, 36 insertions(+)

diff --git a/tbx/core/blocks.py b/tbx/core/blocks.py
index 1d6532d00..46573d608 100644
--- a/tbx/core/blocks.py
+++ b/tbx/core/blocks.py
@@ -562,6 +562,8 @@ class BlogChooserBlock(blocks.StructBlock):
         min_num=1,
         max_num=3,
     )
+    primary_button = LinkBlock(label="Primary button", required=False)
+    secondary_button = LinkBlock(label="Secondary button", required=False)
 
     def get_context(self, value, parent_context=None):
         context = super().get_context(value, parent_context=parent_context)
@@ -591,6 +593,8 @@ class WorkChooserBlock(blocks.StructBlock):
         min_num=1,
         max_num=3,
     )
+    primary_button = LinkBlock(label="Primary button", required=False)
+    secondary_button = LinkBlock(label="Secondary button", required=False)
 
     def get_context(self, value, parent_context=None):
         context = super().get_context(value, parent_context)
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html
index 4a7b1d92b..decfcb646 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html
@@ -22,3 +22,11 @@ <h2 class="heading heading--two-b heading--light grid__heading mb-spacerMedium">
         {% include "patterns/molecules/listing/listing--avatar.html" with title=blog_page.title name=blog_page.first_author.name job_title=blog_page.first_author.role link=blog_post_url date=blog_page.date reading_time=blog_page.read_time tags=blog_page.tags avatar=blog_page.first_author.image tag_link_base=blog_index_url %}
     {% endfor %}
 </ul>
+
+{% for button in value.primary_button %}
+    <a href="{{ button.value.url }}">{{ button.value.text }}</a>
+{% endfor %}
+
+{% for button in value.secondary_button %}
+    <a href="{{ button.value.url }}">{{ button.value.text }}</a>
+{% endfor %}
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml
index 58158c704..f8535139b 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.yaml
@@ -2,6 +2,14 @@ context:
   value:
     featured_blog_heading: Blog posts
     # intro: '<p>An injection of fresh ideas, and the occasional challenging opinion, to ignite your fire.</p>'
+    # primary_button:
+    #   - value:
+    #       text: Primary button
+    #       url: '#'
+    # secondary_button:
+    #   - value:
+    #       text: Secondary button
+    #       url: '#'
     blog_pages:
       - title: Explore the potential of AI in content management
         date: 20 Oct 2023
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html
index 53261eca9..f158b4a1a 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html
@@ -24,3 +24,11 @@ <h2 class="heading heading--two-b heading--light grid__heading mb-spacerMedium">
         {% endfor %}
     </ul>
 {% endif %}
+
+{% for button in value.primary_button %}
+    <a href="{{ button.value.url }}">{{ button.value.text }}</a>
+{% endfor %}
+
+{% for button in value.secondary_button %}
+    <a href="{{ button.value.url }}">{{ button.value.text }}</a>
+{% endfor %}
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml
index df72bc19c..7aca6b447 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.yaml
@@ -2,6 +2,14 @@ context:
   value:
     featured_work_heading: Case studies
     # intro: '<p>An injection of fresh ideas, and the occasional challenging opinion, to ignite your fire.</p>'
+    # primary_button:
+    #   - value:
+    #       text: Primary button
+    #       url: '#'
+    # secondary_button:
+    #   - value:
+    #       text: Secondary button
+    #       url: '#'
   work_pages:
     - title: Imagining and designing a future product for MQ in 5 days flat
       client: 'MQ: Transforming Mental Health'

From d8f324aff4770d238b9cbe023f97ac7434f8db90 Mon Sep 17 00:00:00 2001
From: Amanda Lim-Cabuloy <amanda.lim@torchbox.com>
Date: Mon, 3 Feb 2025 14:51:18 +0800
Subject: [PATCH 5/5] Add comments we only expect 1 button

---
 .../molecules/streamfield/blocks/blog_chooser_block.html        | 2 ++
 .../molecules/streamfield/blocks/work_chooser_block.html        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html
index decfcb646..2e4121238 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/blog_chooser_block.html
@@ -23,10 +23,12 @@ <h2 class="heading heading--two-b heading--light grid__heading mb-spacerMedium">
     {% endfor %}
 </ul>
 
+{# We expect only up to 1 primary button (`max_num=1` is set in the block definition.) #}
 {% for button in value.primary_button %}
     <a href="{{ button.value.url }}">{{ button.value.text }}</a>
 {% endfor %}
 
+{# We expect only up to 1 secondary button (`max_num=1` is set in the block definition.) #}
 {% for button in value.secondary_button %}
     <a href="{{ button.value.url }}">{{ button.value.text }}</a>
 {% endfor %}
diff --git a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html
index f158b4a1a..bb8cb4d0b 100644
--- a/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html
+++ b/tbx/project_styleguide/templates/patterns/molecules/streamfield/blocks/work_chooser_block.html
@@ -25,10 +25,12 @@ <h2 class="heading heading--two-b heading--light grid__heading mb-spacerMedium">
     </ul>
 {% endif %}
 
+{# We expect only up to 1 primary button (`max_num=1` is set in the block definition.) #}
 {% for button in value.primary_button %}
     <a href="{{ button.value.url }}">{{ button.value.text }}</a>
 {% endfor %}
 
+{# We expect only up to 1 secondary button (`max_num=1` is set in the block definition.) #}
 {% for button in value.secondary_button %}
     <a href="{{ button.value.url }}">{{ button.value.text }}</a>
 {% endfor %}