Merge branch 'integration/2024-evolution' into staging

tbx/core/models.py

@@ -210,7 +210,8 @@ def partner_logos(self):
                         "Use bold to mark links as"
                         ' <span style="color:#EE5276">pink</span>,'
                         " and use italics to mark links as"
-                        ' <span style="color:#6F60D0">purple</span>.'
+                        ' <span style="color:#6F60D0">purple</span> '
+                        "(the colours will only take effect on larger screen sizes)."
                     ),
                 ),
             ],

tbx/navigation/migrations/0008_navigationsettings_footer_newsletter_cta.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.1.5 on 2025-02-10 08:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("navigation", "0007_divisionmixin_and_navigationsetmixin"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="navigationsettings",
+            name="footer_newsletter_cta_text",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AddField(
+            model_name="navigationsettings",
+            name="footer_newsletter_cta_url",
+            field=models.URLField(blank=True),
+        ),
+    ]

tbx/navigation/models.py

@@ -1,10 +1,11 @@
 from django.contrib.contenttypes.fields import GenericRelation
 from django.core.cache import cache
 from django.core.cache.utils import make_template_fragment_key
+from django.core.exceptions import ValidationError
 from django.db import models
 
 from modelcluster.models import ClusterableModel
-from wagtail.admin.panels import FieldPanel
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
 from wagtail.contrib.settings.models import BaseSiteSetting, register_setting
 from wagtail.models import RevisionMixin
 from wagtail.snippets.models import register_snippet
@@ -58,11 +59,20 @@ class NavigationSettings(BaseSiteSetting, ClusterableModel):
         blank=True,
         help_text="Single list of logos that appear before the footer box",
     )
+    footer_newsletter_cta_url = models.URLField(blank=True)
+    footer_newsletter_cta_text = models.CharField(blank=True, max_length=255)
 
     panels = [
         FieldPanel("primary_navigation"),
         FieldPanel("footer_links"),
         FieldPanel("footer_logos"),
+        MultiFieldPanel(
+            [
+                FieldPanel("footer_newsletter_cta_url", heading="External link"),
+                FieldPanel("footer_newsletter_cta_text", heading="Text"),
+            ],
+            heading="Footer newsletter CTA",
+        ),
     ]
 
     def save(self, **kwargs):
@@ -83,3 +93,10 @@ def save(self, **kwargs):
             for key in fragment_keys
         ]
         cache.delete_many(keys)
+
+    def clean(self):
+        super().clean()
+
+        if self.footer_newsletter_cta_url and not self.footer_newsletter_cta_text:
+            msg = "The CTA footer text is required when a URL is supplied"
+            raise ValidationError({"footer_newsletter_cta_text": msg})

tbx/navigation/tests/test_navigation_settings.py

@@ -0,0 +1,35 @@
+from django.test import SimpleTestCase
+
+from wagtail.admin.panels.base import get_form_for_model
+
+from tbx.navigation.models import NavigationSettings
+
+
+class NavigationSettingsFormTestCase(SimpleTestCase):
+    def setUp(self):
+        self.form_class = get_form_for_model(
+            NavigationSettings,
+            fields=[
+                "footer_newsletter_cta_url",
+                "footer_newsletter_cta_text",
+            ],
+        )
+
+    def test_cta_optional(self):
+        form = self.form_class(
+            data={"footer_newsletter_cta_url": "", "footer_newsletter_cta_text": ""}
+        )
+        self.assertTrue(form.is_valid())
+
+    def test_cta_text_required_if_url_supplied(self):
+        form = self.form_class(
+            data={
+                "footer_newsletter_cta_url": "https://example.com",
+                "footer_newsletter_cta_text": "",
+            }
+        )
+        self.assertFormError(
+            form,
+            "footer_newsletter_cta_text",
+            "The CTA footer text is required when a URL is supplied",
+        )

tbx/project_styleguide/templates/patterns/organisms/footer/footer.html

@@ -10,7 +10,15 @@
             {% wagtailcache 600 "footerlinks" current_site.pk is_pattern_library %}
                 {% footerlinks %}
             {% endwagtailcache %}
-            <a href="#" class="footer__newsletter-link">Sign up for news and insights{% include "patterns/atoms/icons/icon.html" with name="arrow-wide" classname="footer__arrow" %}</a>
+            {% with settings.navigation.NavigationSettings as global_settings %}
+                {% if global_settings.footer_newsletter_cta_url and global_settings.footer_newsletter_cta_text %}
+                    <a href="{{ global_settings.footer_newsletter_cta_url }}"
+                       class="footer__newsletter-link">
+                        {{ global_settings.footer_newsletter_cta_text }}
+                        {% include "patterns/atoms/icons/icon.html" with name="arrow-wide" classname="footer__arrow" %}
+                    </a>
+                {% endif %}
+            {% endwith %}
             <ul class="footer__socials">
                 <li>
                     <a aria-label="Follow us on Bluesky"

tbx/project_styleguide/templates/patterns/organisms/footer/footer.yaml

@@ -32,6 +32,8 @@ context:
                 url: '#'
               alt_text: 'We are carbon neutral'
               image: fake
+        footer_newsletter_cta_url: '#'
+        footer_newsletter_cta_text: 'Sign up for news and insights'
 
 tags:
   srcset_image: