diff --git a/CHANGELOG.md b/CHANGELOG.md index 84b4b3c67..e52ec8d82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Release History +## 82.0 (2024-11-25) + +Compare: + +- Various FE fixes/updates +- Add description field to the `EventIndexPage` +- Update the `hero--promo-blog.html` molecule to display a description in both the the `BlogHomePage` and `EventIndexPage` hero + ## 81.1 (2024-11-21) Compare: diff --git a/bc/events/migrations/0037_eventindexpage_description.py b/bc/events/migrations/0037_eventindexpage_description.py new file mode 100644 index 000000000..0e991e2ab --- /dev/null +++ b/bc/events/migrations/0037_eventindexpage_description.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.14 on 2024-11-22 10:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("events", "0036_eventindexpage_fetch_all_events"), + ] + + operations = [ + migrations.AddField( + model_name="eventindexpage", + name="description", + field=models.TextField(blank=True), + ), + ] diff --git a/bc/events/models.py b/bc/events/models.py index c5529ecbe..d5a8a1a90 100644 --- a/bc/events/models.py +++ b/bc/events/models.py @@ -152,10 +152,6 @@ def clean_fields(self, exclude=None): class EventIndexPage(BasePage): template = "patterns/pages/events/event_index_page.html" - fetch_all_events = models.BooleanField( - help_text="Fetch events from all sites, instead of just displaying child pages of this page" - ) - subpage_types = ["EventPage"] parent_page_types = [ "home.HomePage", @@ -163,7 +159,13 @@ class EventIndexPage(BasePage): "promotional.PromotionalHomePage", ] + description = models.TextField(blank=True) + fetch_all_events = models.BooleanField( + help_text="Fetch events from all sites, instead of just displaying child pages of this page" + ) + content_panels = BasePage.content_panels + [ + FieldPanel("description"), FieldPanel("fetch_all_events"), ] diff --git a/bc/project_styleguide/templates/patterns/molecules/hero/hero--promo-blog.html b/bc/project_styleguide/templates/patterns/molecules/hero/hero--promo-blog.html index abd05e099..c17ce3524 100644 --- a/bc/project_styleguide/templates/patterns/molecules/hero/hero--promo-blog.html +++ b/bc/project_styleguide/templates/patterns/molecules/hero/hero--promo-blog.html @@ -2,16 +2,11 @@ {% is_promotional_site as promotional_site %} -
-
-
-

{{ page.title }}

- {% comment %} -
-

Todo: BE field for this introduction text

-
- {% endcomment %} +
+
+

{{ page.title }}

+
+

{% firstof page.description page.about_description %}

- +
- diff --git a/bc/project_styleguide/templates/patterns/molecules/hero/hero--promo-event.html b/bc/project_styleguide/templates/patterns/molecules/hero/hero--promo-event.html deleted file mode 100644 index abd05e099..000000000 --- a/bc/project_styleguide/templates/patterns/molecules/hero/hero--promo-event.html +++ /dev/null @@ -1,17 +0,0 @@ -{% load promotional_utils wagtailcore_tags %} - -{% is_promotional_site as promotional_site %} - -
-
-
-

{{ page.title }}

- {% comment %} -
-

Todo: BE field for this introduction text

-
- {% endcomment %} -
- -
- diff --git a/bc/project_styleguide/templates/patterns/organisms/promotional-content-page-hero/promotional-content-page-hero.html b/bc/project_styleguide/templates/patterns/organisms/promotional-content-page-hero/promotional-content-page-hero.html index abf118e7d..48dd3085a 100644 --- a/bc/project_styleguide/templates/patterns/organisms/promotional-content-page-hero/promotional-content-page-hero.html +++ b/bc/project_styleguide/templates/patterns/organisms/promotional-content-page-hero/promotional-content-page-hero.html @@ -1,6 +1,6 @@ {% load wagtailimages_tags %} -{% image image fill-1200x980 as rendition %} +{% image image fill-1200x980 format-jpeg as rendition %}
diff --git a/bc/project_styleguide/templates/patterns/organisms/promotional-hero/promotional-hero.html b/bc/project_styleguide/templates/patterns/organisms/promotional-hero/promotional-hero.html index 271fb6b14..69573c466 100644 --- a/bc/project_styleguide/templates/patterns/organisms/promotional-hero/promotional-hero.html +++ b/bc/project_styleguide/templates/patterns/organisms/promotional-hero/promotional-hero.html @@ -1,14 +1,14 @@ {% load wagtailimages_tags %} -{% image image fill-1200x980 as rendition %} +{% image image fill-1200x980 format-jpeg as rendition %}
-