From d73e5e80b6bb4b58259019e06e1f3b5369b15599 Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Mon, 12 Aug 2024 13:28:00 +0530
Subject: [PATCH 01/11] feat(ehcco): Update widget heading text

---
 .../streamfield/blocks/ehc_cosearch_block.html         |  6 ++----
 bc/static_src/sass/components/_fis-ehcco-search.scss   | 10 ----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/ehc_cosearch_block.html b/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/ehc_cosearch_block.html
index 98b06dce..cad3b3d6 100644
--- a/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/ehc_cosearch_block.html
+++ b/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/ehc_cosearch_block.html
@@ -10,9 +10,7 @@
 <div class="ehcco-search is-hidden" data-ehcco-search data-matching-schools-url="{{ get_matching_schools_url|escapejs }}" data-ehc-co-url="{{ get_corresponding_ehc_co_url|escapejs }}">
     <div class="ehcco-search__container">
         <div data-autocomplete-search class="ehcco-search__search">
-            <h2 class="ehcco-search__heading heading heading--s">Find your EHC coordinator by typing the name of your education provider</h2>
-
-            <label class="ehcco-search__label" for="school-search">Type the name of a nursery, school or college</label>
+            <label for="school-search" class="ehcco-search__heading heading heading--s">Find your EHC Coordinator by typing the name of your nursery, school or college</label>
             <div data-autocomplete-wrapper></div>
             <div data-autocomplete-list id="autocomplete-list" class="autocomplete-items"></div>
         </div>
@@ -31,7 +29,7 @@ <h2 class="ehcco-search__heading heading heading--s">Find your EHC coordinator b
 <noscript>
     <div class="ehcco-search__fallback rich-text">
         <p>To find the EHC coordinator for your education provider or setting please use one of the email addresses below. Select the email address for the area your education provider or setting is in.</p>
-        
+
         <ul>
             <li>Aylesbury: <a href="mailto:senaylesbury@buckinghamshire.gov.uk">senaylesbury@buckinghamshire.gov.uk</a></li>
             <li>Chiltern and South Bucks: <a href="mailto:sencsb@buckinghamshire.gov.uk">sencsb@buckinghamshire.gov.uk</a></li>
diff --git a/bc/static_src/sass/components/_fis-ehcco-search.scss b/bc/static_src/sass/components/_fis-ehcco-search.scss
index 576e0554..032c9582 100644
--- a/bc/static_src/sass/components/_fis-ehcco-search.scss
+++ b/bc/static_src/sass/components/_fis-ehcco-search.scss
@@ -17,17 +17,7 @@
     &__heading {
         margin-top: 0;
         margin-bottom: $grid--min;
-
-        @include media-query(tablet-landscape) {
-            margin-bottom: 0;
-        }
-    }
-
-    &__label {
-        @include font-size(s);
         display: block;
-        color: $color--grey-accessible;
-        margin: $grid--min 0;
     }
 
     &__input {

From 8d74ce5bf45d64dbd55ab860ab77f6381d2e096a Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Mon, 12 Aug 2024 17:12:30 +0530
Subject: [PATCH 02/11] docs: Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51be4ae3..fa80a0f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History
 
+## Unreleased
+
+- EHCCo widget: Update widget heading text
+
 ## 78.2 (2024-08-14)
 
 Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/78.1...78.2>

From 256d6837b1f84815c46f56fa615931afab3fb488 Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Mon, 12 Aug 2024 13:16:40 +0530
Subject: [PATCH 03/11] feat(ehcco): Make emails clickable by converting them
 to links

---
 bc/static_src/javascript/components/fis-ehcco-search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bc/static_src/javascript/components/fis-ehcco-search.js b/bc/static_src/javascript/components/fis-ehcco-search.js
index e49fadd8..81e0b93e 100644
--- a/bc/static_src/javascript/components/fis-ehcco-search.js
+++ b/bc/static_src/javascript/components/fis-ehcco-search.js
@@ -107,7 +107,7 @@ class EHCCOSearch {
             this.result.classList.remove('is-hidden');
             this.ehccoSchool.textContent = this.state.school;
             this.ehccoName.textContent = this.state.name;
-            this.ehccoEmail.textContent = this.state.email;
+            this.ehccoEmail.innerHTML = `<a href="mailto:${this.state.email}">${this.state.email}</a>`;
         }
     }
 }

From b2656b4a292af8791fea90ed2560bf71bd9ee577 Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Mon, 12 Aug 2024 17:09:39 +0530
Subject: [PATCH 04/11] docs: Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa80a0f5..1517a416 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - EHCCo widget: Update widget heading text
+- EHCCo widget: Make emails clickable by converting them to links
 
 ## 78.2 (2024-08-14)
 

From b890739cdb114cb762c7c26db1048dd13784be7b Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Mon, 12 Aug 2024 13:24:12 +0530
Subject: [PATCH 05/11] feat(ehcco): Change fallback text from TBC to awaiting
 allocation

---
 bc/family_information/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bc/family_information/views.py b/bc/family_information/views.py
index 26fa51b1..ea293316 100644
--- a/bc/family_information/views.py
+++ b/bc/family_information/views.py
@@ -46,7 +46,7 @@ def get_corresponding_ehc_co(request):
         }
     else:
         context = {
-            "name": "TBC",
+            "name": "awaiting allocation",
             "email": school.hub_email,
         }
     return JsonResponse(context)

From 783bc5cb2e459ee7cafbc551bb2a2f3d3ecb3be9 Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Mon, 12 Aug 2024 17:10:36 +0530
Subject: [PATCH 06/11] docs: Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1517a416..9f1df4f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - EHCCo widget: Update widget heading text
 - EHCCo widget: Make emails clickable by converting them to links
+- EHCCo widget: Change fallback text from TBC to awaiting allocation
 
 ## 78.2 (2024-08-14)
 

From 22649c747ce9b4d5f2bd5721e4ca6a57005b0cbe Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Thu, 15 Aug 2024 11:03:59 +0530
Subject: [PATCH 07/11] feat(ehcco_widget): Update instances of ehc coordinator
 to make them uniform across the site

---
 .../molecules/streamfield/blocks/ehc_cosearch_block.html    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/ehc_cosearch_block.html b/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/ehc_cosearch_block.html
index cad3b3d6..828a548b 100644
--- a/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/ehc_cosearch_block.html
+++ b/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/ehc_cosearch_block.html
@@ -17,10 +17,10 @@
 
         <div data-autocomplete-result class="ehcco-search__result is-hidden">
             <p class="ehcco-search__result-heading heading heading--xl">
-                The EHC coordinator for <span data-autocomplete-school></span> is <span data-autocomplete-name></span>
+                The EHC Coordinator for <span data-autocomplete-school></span> is <span data-autocomplete-name></span>
             </p>
             <div class="rich-text">
-                <p>You can contact your EHC co-ordinator via email, use <span data-autocomplete-email class="heading"></span></p>
+                <p>You can contact your EHC Coordinator via email, use <span data-autocomplete-email class="heading"></span></p>
             </div>
         </div>
     </div>
@@ -28,7 +28,7 @@
 
 <noscript>
     <div class="ehcco-search__fallback rich-text">
-        <p>To find the EHC coordinator for your education provider or setting please use one of the email addresses below. Select the email address for the area your education provider or setting is in.</p>
+        <p>To find the EHC Coordinator for your education provider or setting please use one of the email addresses below. Select the email address for the area your education provider or setting is in.</p>
 
         <ul>
             <li>Aylesbury: <a href="mailto:senaylesbury@buckinghamshire.gov.uk">senaylesbury@buckinghamshire.gov.uk</a></li>

From 435ef421ccd752c1a352a92ff55f0474ac5eb9c6 Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Tue, 13 Aug 2024 17:12:41 +0530
Subject: [PATCH 08/11] feat(category_pages): Add option to display images for
 first three pages in category page

---
 ...rypage_display_featured_images_and_more.py | 31 +++++++++++++++++++
 bc/family_information/models.py               |  3 ++
 .../standardpages/index_page--fis-cat1.html   |  6 +++-
 .../standardpages/index_page--fis-cat2.html   |  6 +++-
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 bc/family_information/migrations/0017_categorypage_display_featured_images_and_more.py

diff --git a/bc/family_information/migrations/0017_categorypage_display_featured_images_and_more.py b/bc/family_information/migrations/0017_categorypage_display_featured_images_and_more.py
new file mode 100644
index 00000000..f7aa9675
--- /dev/null
+++ b/bc/family_information/migrations/0017_categorypage_display_featured_images_and_more.py
@@ -0,0 +1,31 @@
+# Generated by Django 4.2.14 on 2024-08-13 08:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "family_information",
+            "0016_directory_search_block__add_bucks_online_directory_option",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="categorypage",
+            name="display_featured_images",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="categorytypeonepage",
+            name="display_featured_images",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="categorytypetwopage",
+            name="display_featured_images",
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/bc/family_information/models.py b/bc/family_information/models.py
index e6868bb9..3e451ce8 100644
--- a/bc/family_information/models.py
+++ b/bc/family_information/models.py
@@ -228,6 +228,8 @@ class BaseCategoryPage(FISBannerFields, BasePage):
         default="What do you want to do?", max_length=255
     )
 
+    display_featured_images = models.BooleanField(default=False)
+
     # Content
     body = StreamField(
         [
@@ -262,6 +264,7 @@ class BaseCategoryPage(FISBannerFields, BasePage):
     content_panels = (
         BasePage.content_panels
         + [
+            FieldPanel("display_featured_images"),
             MultiFieldPanel(
                 [
                     FieldPanel("top_tasks_heading", heading="Heading"),
diff --git a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html
index 45866845..c90fc483 100644
--- a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html
+++ b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html
@@ -48,7 +48,11 @@ <h2 class="heading heading--l" id="{{ page.other_pages_heading|slugify }}">{{ pa
             data-height-equalizer
         >
             {% for subpage in page.other_child_pages %}
-                {% include "patterns/molecules/page-card/page-card.html" with classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}
+                {% if page.display_featured_images and forloop.counter <= 3 %}
+                    {% include "patterns/molecules/page-card/page-card.html" with show_image=True classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}
+                {% else %}
+                    {% include "patterns/molecules/page-card/page-card.html" with show_image=False classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}
+                {% endif %}
             {% endfor %}
         </section>
     </div>
diff --git a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html
index 5360054e..834ecab4 100644
--- a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html
+++ b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html
@@ -49,7 +49,11 @@ <h2 class="heading heading--l" id="{{ page.other_pages_heading|slugify }}">{{ pa
                     data-height-equalizer
                 >
                     {% for subpage in page.other_child_pages %}
-                        {% include "patterns/molecules/page-card/page-card.html" with classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}
+                        {% if page.display_featured_images and forloop.counter <= 3 %}
+                            {% include "patterns/molecules/page-card/page-card.html" with show_image=True classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}
+                        {% else %}
+                            {% include "patterns/molecules/page-card/page-card.html" with show_image=False classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}
+                        {% endif %}
                     {% endfor %}
                 </div>
             </section>

From f087ed2afd308c919ec54d10ef38f0ea0b7269eb Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Thu, 15 Aug 2024 11:22:06 +0530
Subject: [PATCH 09/11] feat(category_pages): Display images on featured pages
 instead if they are present

---
 bc/family_information/blocks.py                             | 3 +++
 bc/family_information/models.py                             | 4 ++++
 .../patterns/molecules/streamfield/blocks/cards_block.html  | 6 +++++-
 .../patterns/pages/standardpages/index_page--fis-cat1.html  | 2 +-
 .../patterns/pages/standardpages/index_page--fis-cat2.html  | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bc/family_information/blocks.py b/bc/family_information/blocks.py
index baf60b92..94bca231 100644
--- a/bc/family_information/blocks.py
+++ b/bc/family_information/blocks.py
@@ -9,6 +9,9 @@ def get_context(self, value, parent_context=None):
 
         # Get the page's class.
         context["page_class"] = parent_context["page"]._meta.object_name
+        context["display_featured_images"] = getattr(
+            parent_context["page"], "display_featured_images", False
+        )
 
         # Check if the block is preceded by a heading.
         blocks_under_headings = parent_context.get("blocks_under_headings", [])
diff --git a/bc/family_information/models.py b/bc/family_information/models.py
index 3e451ce8..edde66cc 100644
--- a/bc/family_information/models.py
+++ b/bc/family_information/models.py
@@ -304,6 +304,10 @@ def allowed_subpage_models(cls):
             resolve_model_string("standardpages.IndexPage")
         ]
 
+    @cached_property
+    def has_featured_pages(self):
+        return any(row.block_type == "cards" for row in self.body)
+
     @cached_property
     def other_child_pages(self):
         """Get child pages for the current category page, excluding children that are
diff --git a/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/cards_block.html b/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/cards_block.html
index 856547ea..b634b0b0 100644
--- a/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/cards_block.html
+++ b/bc/project_styleguide/templates/patterns/molecules/streamfield/blocks/cards_block.html
@@ -5,7 +5,11 @@
         data-height-equalizer
     >
         {% for card in value %}
-            {% include "patterns/molecules/page-card/page-card.html" with classes="card--fis-index" has_heading=has_heading page=card.value.specific %}
+            {% if display_featured_images and forloop.counter <= 3 %}
+                {% include "patterns/molecules/page-card/page-card.html" with classes="card--fis-index" has_heading=has_heading page=card.value.specific show_image=True %}
+            {% else %}
+                {% include "patterns/molecules/page-card/page-card.html" with classes="card--fis-index" has_heading=has_heading page=card.value.specific show_image=False %}
+            {% endif %}
         {% endfor %}
     </section>
 {% endif %}
diff --git a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html
index c90fc483..af6a4496 100644
--- a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html
+++ b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat1.html
@@ -48,7 +48,7 @@ <h2 class="heading heading--l" id="{{ page.other_pages_heading|slugify }}">{{ pa
             data-height-equalizer
         >
             {% for subpage in page.other_child_pages %}
-                {% if page.display_featured_images and forloop.counter <= 3 %}
+                {% if not page.has_featured_pages and page.display_featured_images and forloop.counter <= 3 %}
                     {% include "patterns/molecules/page-card/page-card.html" with show_image=True classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}
                 {% else %}
                     {% include "patterns/molecules/page-card/page-card.html" with show_image=False classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}
diff --git a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html
index 834ecab4..4822aee0 100644
--- a/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html
+++ b/bc/project_styleguide/templates/patterns/pages/standardpages/index_page--fis-cat2.html
@@ -49,7 +49,7 @@ <h2 class="heading heading--l" id="{{ page.other_pages_heading|slugify }}">{{ pa
                     data-height-equalizer
                 >
                     {% for subpage in page.other_child_pages %}
-                        {% if page.display_featured_images and forloop.counter <= 3 %}
+                        {% if not page.has_featured_pages and page.display_featured_images and forloop.counter <= 3 %}
                             {% include "patterns/molecules/page-card/page-card.html" with show_image=True classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}
                         {% else %}
                             {% include "patterns/molecules/page-card/page-card.html" with show_image=False classes="card--fis-index" has_heading=show_other_pages_heading page=subpage %}

From df0417c6b7e5feb4d5ae889deadb7e0951c48e6d Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Tue, 20 Aug 2024 14:43:04 +0530
Subject: [PATCH 10/11] docs: Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f1df4f8..2668f952 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - EHCCo widget: Update widget heading text
 - EHCCo widget: Make emails clickable by converting them to links
 - EHCCo widget: Change fallback text from TBC to awaiting allocation
+- Add option to display images for first three pages in category page
 
 ## 78.2 (2024-08-14)
 

From 50ce90216b3d0648cbdc41efa417d06f123c2c68 Mon Sep 17 00:00:00 2001
From: Shohan Dutta Roy <shohan.duttaroy@torchbox.com>
Date: Tue, 20 Aug 2024 14:51:04 +0530
Subject: [PATCH 11/11] docs: Update CHANGELOG.md

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2668f952..23a9ceae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Release History
 
-## Unreleased
+## 79.0 (2024-08-20)
+
+Compare: <https://git.torchbox.com/buckinghamshire-council/bc/compare/78.2...79.0>
 
 - EHCCo widget: Update widget heading text
 - EHCCo widget: Make emails clickable by converting them to links