diff --git a/CHANGELOG.md b/CHANGELOG.md index 51be4ae3..23a9ceae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Release History +## 79.0 (2024-08-20) + +Compare: + +- 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) Compare: 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/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..edde66cc 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"), @@ -301,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/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) 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 %} {% endif %} 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..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 @@ -10,19 +10,17 @@ 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 = `${this.state.email}`; } } } 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 {