Merge pull request #1883 from uktrade/release

UAT/prod release

CHANGELOG.md

@@ -4,11 +4,28 @@
 
 ### Hotfix
 
+### Bugs fixed
+
+### Enhancements
+* GLS-406 - Remove reference to the transition period in the domestic contact form
+* GLS-435 - Revert emergency banner styling
+
+## [2.15.0](https://github.com/uktrade/great-cms/releases/tag/2.15.0)
+
+[Full Changelog](https://github.com/uktrade/great-cms/compare/2.14.0...2.15.0)
+
+### Hotfix
+* GLS-416 - [HOTFIX] Update styling for emergency banner on homepage
+* GLS-416 - [HOTFIX] Further updates on the styles for the emergency banner on homepage
+
 ### Bugs fixed
 * GLS-401 - Remove duplicate meta tags from domestic templates
 * GLS-422 - Only show 'Want to know more' banner on advice article pages
 
 ### Enhancements
+* GLS-360 - Get GDP & economic growth data for a market from API, not Wagtail
+* GLS-400 - Added image/video stream component to campaign/article page
+* GLS-400 - Added transcript link to video on the article/campaign page
 
 ## [2.14.0](https://github.com/uktrade/great-cms/releases/tag/2.14.0)
 
@@ -17,8 +34,6 @@
 ### Hotfix
 
 * GLS-395 - [HOTFIX] Logo not uploading to business profile
-* GLS-416 - [HOTFIX] Update styling for emergency banner on homepage
-* GLS-416 - [HOTFIX] Further updates on the styles for the emergency banner on homepage
 
 ### Bugs fixed
 
@@ -40,7 +55,6 @@
 ### Enhancements
 
 * GLS-348 - Update Gunicorn 19.5.0 -> 20.1.0
-* GLS-360 - Get GDP & economic growth data for a market from API, not Wagtail
 
 ## [2.12.0](https://github.com/uktrade/great-cms/releases/tag/2.12.0)
 

config/settings.py

@@ -485,10 +485,6 @@
 
 # EU exit
 EU_EXIT_ZENDESK_SUBDOMAIN = env.str('EU_EXIT_ZENDESK_SUBDOMAIN')
-EU_EXIT_INTERNATIONAL_CONTACT_URL = env.str(
-    'EU_EXIT_INTERNATIONAL_CONTACT_URL',
-    '/international/eu-exit-news/contact/',
-)
 
 # Contact
 INVEST_CONTACT_URL = env.str(

config/url_redirects.py

@@ -34,16 +34,6 @@
         QuerystringRedirectView.as_view(url='/international/content/invest/how-to-setup-in-the-uk/transition-period/'),
         name='transition-redirect',
     ),
-    url(
-        r'^eu-exit-news/contact/$',
-        QuerystringRedirectView.as_view(url='/transition-period/contact/'),
-        name='eu-exit-brexit-contact-redirect',
-    ),
-    url(
-        r'^eu-exit-news/contact/success/$',
-        QuerystringRedirectView.as_view(url='/transition-period/contact/success/'),
-        name='eu-exit-brexit-contact-success-redirect',
-    ),
     url(
         r'^redarrows/$',
         QuerystringRedirectView.as_view(url='https://www.events.great.gov.uk/red-arrows-north-america-tour/'),
@@ -486,14 +476,6 @@
             )
         ),
     ),
-    url(
-        r'^brexit/contact/$',
-        QuerystringRedirectView.as_view(url='/transition-period/contact/'),
-    ),
-    url(
-        r'^brexit/contact/success/$',
-        QuerystringRedirectView.as_view(url='/transition-period/contact/success/'),
-    ),
 ]
 
 articles_redirects = [

contact/constants.py

@@ -23,7 +23,6 @@
 BUYING = 'buying'
 DOMESTIC = 'domestic'
 DSO = 'dso'
-EUEXIT = 'euexit'
 EVENTS = 'events'
 EXPORT_ADVICE = 'export-advice'
 EXPORT_OPPORTUNITIES = 'export-opportunities'

contact/forms.py

@@ -285,7 +285,6 @@ class DomesticRoutingForm(forms.Form):
         (constants.EXPORT_ADVICE, 'Advice to export from the UK'),
         (constants.GREAT_SERVICES, 'great.gov.uk account and services support'),
         (constants.FINANCE, 'UK Export Finance (UKEF)'),
-        (constants.EUEXIT, 'The transition period (now that the UK has left the EU)'),
         (constants.EVENTS, 'Events'),
         (constants.DSO, 'Defence and Security Organisation (DSO)'),
         (constants.OTHER, 'Other'),

contact/views.py

@@ -234,9 +234,6 @@ class RoutingFormView(
                 'domestic:uk-export-finance-lead-generation-form',
                 kwargs={'step': 'contact'},
             ),
-            # This next one no longer exists as a view in the codebase, but can be
-            # (and is) redirected at the Wagtail CMS level to a different service.
-            constants.EUEXIT: '/transition-period/contact/',
             constants.EVENTS: reverse_lazy('contact:contact-us-events-form'),
             constants.DSO: reverse_lazy('contact:contact-us-dso-form'),
             constants.OTHER: reverse_lazy('contact:contact-us-enquiries'),

core/components/sass/components/hero/_base.scss

@@ -69,23 +69,11 @@
     min-height: 345px;
   }
 
-  .great-hero--temporary-height,
-  .great-hero--temporary-height > .container {
-    min-height: 215px;
-  }
-
   .great-hero-title {
     min-width: 470px;
   }
 }
 
-@media (min-width: 640px) and (max-width: 800px) {
-
-  .great-hero--temporary-height > .container > .great-hero-text > .heading-xlarge {
-    font-size: 38px;
-  }
-}
-
 // Hero with CTA
 
 .great-hero-with-cta {

core/templates/components/landing_hero_with_cta.html

@@ -45,13 +45,14 @@
 {% endif %}
 
 <section
-  class="great-hero great-hero--temporary-height {% if not hero_image %}great-hero-no-image{% endif %}" id="hero"
+  class="great-hero {% if not hero_image %}great-hero-no-image{% endif %}" id="hero"
   {% if hero_image and not 'WebHeader_v26' in rendition.url %}style="background-image: url({{ rendition.url }})"{% endif %}
 >
-  <div class="container padding-top-90-l padding-top-45 padding-bottom-45-l" style="margin-top: 3px;">
+  <div class="container padding-top-90-l padding-top-45 padding-bottom-45-l">
     <div class="great-hero-text width-half-xl width-two-thirds-l width-full">
       <h1
         class="heading-xlarge {% if subheading or subtitle %} margin-bottom-0 {% else %} margin-bottom-30 {% endif %}"
+        style="max-width: 500px;"
       >{{ heading }}</h1>
       {% block content %}
         {% if subheading %}

pii-secret-exclude.txt

@@ -46,3 +46,5 @@ runtime.txt
 domestic/templatetags/component_tags.py
 tests/unit/domestic/test_templatetags.py
 tests/unit/conftest.py
+contact/forms.py
+tests/unit/contact/test_forms.py

tests/unit/config/test_url_redirects.py

@@ -100,8 +100,6 @@ def test_privacy_international_redirect(path, client):
     ('/jpm/', 'https://www.events.great.gov.uk/ehome/200197163/'),
     ('/brexit/', '/transition/'),
     ('/transition/', '/international/content/invest/how-to-setup-in-the-uk/transition-period/'),
-    ('/eu-exit-news/contact/', '/transition-period/contact/'),
-    ('/eu-exit-news/contact/success/', '/transition-period/contact/success/'),
     ('/redarrows/', 'https://www.events.great.gov.uk/red-arrows-north-america-tour/'),
     (
         '/new-zealand-event-calendar/',
@@ -609,14 +607,6 @@ def test_redirects_no_trailing_slash(url, expected, client):
         ('/new/', '/advice/'),
         ('/occasional/', '/advice/'),
         ('/regular/', '/advice/'),
-        (
-            '/brexit/contact/',
-            '/transition-period/contact/',
-        ),
-        (
-            '/brexit/contact/success/',
-            '/transition-period/contact/success/',
-        ),
         (
             '/today/',
             '/international/content/capital-invest/',

tests/unit/contact/test_forms.py

@@ -308,7 +308,6 @@ def test_domestic_form_routing():
         constants.TRADE_OFFICE,
         constants.EXPORT_ADVICE,
         constants.FINANCE,
-        constants.EUEXIT,
         constants.EVENTS,
         constants.DSO,
         constants.OTHER,

tests/unit/contact/test_views.py

@@ -527,13 +527,6 @@ def test_ecommerce_success_view(client):
                 kwargs={'step': 'contact'},
             ),
         ),
-        (
-            constants.DOMESTIC,
-            constants.EUEXIT,
-            # This path no longer exists as a view in the codebase, but can be
-            # (and is) redirected at the Wagtail CMS level to a different service.
-            '/transition-period/contact/',
-        ),
         (
             constants.DOMESTIC,
             constants.EVENTS,