From a7671f40f8df99883c3f7a16c3584002e3b157ae Mon Sep 17 00:00:00 2001 From: stuart-madetech <75611506+stuart-madetech@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:32:38 +0000 Subject: [PATCH] Merge develop into master (#2891) * Updates to header and international index (#2889) * KLS-1906: Update the breadcrumbs for LTE pages * KLS-1906: Update the breadcrumbs for UKEA pages * KLS-1906: Update the breadcrumbs for Markets pages * KLS-1906: Update the breadcrumbs for Services page * KLS-1906: Update the breadcrumbs for Report A Trade barrier page * KLS-1906: Update the breadcrumbs for Free Trade agreement page * KLS-1906: Update the breadcrumbs for UK export finance * KLS-1906: Update the breadcrumbs for trade finance pages * KLS-1906: LTE page remove bottom padding for breadcrumbs div * Fix to show style cookie banner and show again (#2890) --------- Co-authored-by: divyaparameswaran --- .../domestic/article_listing_page.html | 9 +- .../templates/domestic/country_guide.html | 2 +- .../domestic/finance/trade_finance.html | 14 +- .../marketaccess/report_a_barrier.html | 4 +- .../topic_landing_pages/manually_curated.html | 9 +- .../domestic/topic_landing_pages/markets.html | 8 +- .../templates/domestic/ukef/home_page.html | 2 +- .../domestic/ukef/project_finance.html | 4 +- .../templates/export_academy/event_list.html | 219 +++++++++--------- .../export_academy/landing_page.html | 6 +- international/sass/header.scss | 6 +- international/sass/main.scss | 16 +- .../templates/international/base.html | 14 +- .../templates/international/header.html | 15 +- .../templates/international/index.html | 16 +- .../context_processors.py | 7 +- .../templates/learn/automated_list_page.html | 22 +- learn/templates/learn/curated_list_page.html | 73 +++--- .../dist/expand_your_business_styles.css | 2 +- .../dist/expand_your_business_styles.css.map | 2 +- .../dist/international_styles.css | 2 +- .../dist/international_styles.css.map | 2 +- 22 files changed, 230 insertions(+), 224 deletions(-) diff --git a/domestic/templates/domestic/article_listing_page.html b/domestic/templates/domestic/article_listing_page.html index 5fcc55cd9b..447342dda2 100644 --- a/domestic/templates/domestic/article_listing_page.html +++ b/domestic/templates/domestic/article_listing_page.html @@ -5,13 +5,14 @@ article-list-page {% endblock css_layout_class %} {% block content %} + {% block breadcrumbs %} + {% include 'components/breadcrumbs_cms.html' %} + {% endblock %} {% block hero %} {% include 'components/hero.html' with image=page.hero_image hero_title=page.title hero_text=page.teaser %} {% endblock %} -
- {% block breadcrumbs %} - {% include 'components/breadcrumbs_cms.html' %} - {% endblock %} +
{% if page.list_teaser %}
diff --git a/domestic/templates/domestic/country_guide.html b/domestic/templates/domestic/country_guide.html index f539486cd8..f7d1648628 100644 --- a/domestic/templates/domestic/country_guide.html +++ b/domestic/templates/domestic/country_guide.html @@ -8,8 +8,8 @@ {% if page.stats.market_trends %}{% endif %} {% endblock %} {% block content %} - {% include 'components/market-details-header.html' with image=page.hero_image %} {% include 'components/breadcrumbs_cms.html' %} + {% include 'components/market-details-header.html' with image=page.hero_image %} {% if page.heading_teaser %}
diff --git a/domestic/templates/domestic/finance/trade_finance.html b/domestic/templates/domestic/finance/trade_finance.html index 145c19ed83..fd431166b3 100755 --- a/domestic/templates/domestic/finance/trade_finance.html +++ b/domestic/templates/domestic/finance/trade_finance.html @@ -12,13 +12,13 @@ {% block head_title %}UK Export Finance - Trade Finance{% endblock %} {% block css_layout_class %}get-finance{% endblock %} {% block content %} - {% image page.hero_image original as hero_image_rendition %} -
- {% include 'components/hero.html' with hero_title="Trade finance for UK exporters" hero_text="When it comes to exporting, having a great product or service is only half the story. Putting the right finance and insurance in place can make the difference, helping you to win contracts, fulfil orders and get paid." image_url=hero_image_rendition.url %} - {% breadcrumbs %} - Home - UKEF - {% endbreadcrumbs %} + {% breadcrumbs %} + Home + UKEF +{% endbreadcrumbs %} +{% image page.hero_image original as hero_image_rendition %} +
+ {% include 'components/hero.html' with hero_title="Trade finance for UK exporters" hero_text="When it comes to exporting, having a great product or service is only half the story. Putting the right finance and insurance in place can make the difference, helping you to win contracts, fulfil orders and get paid." image_url=hero_image_rendition.url %}
{% include 'domestic/finance/includes/get_finance_cta.html' %} diff --git a/domestic/templates/domestic/marketaccess/report_a_barrier.html b/domestic/templates/domestic/marketaccess/report_a_barrier.html index 06e015a277..8355342492 100644 --- a/domestic/templates/domestic/marketaccess/report_a_barrier.html +++ b/domestic/templates/domestic/marketaccess/report_a_barrier.html @@ -12,12 +12,12 @@ A trade barrier can slow down, limit or prevent a UK business exporting. Let us know if you think you’re facing a new trade barrier or are having issues with a current trade barrier {% endblock %} {% block content %} - {% static 'images/report-a-trade-barrier-header.png' as xlarge_hero %} - {% include 'components/hero.html' with image_url=xlarge_hero hero_title='Check or report a trade barrier' %} {% breadcrumbs %} Home Trade barriers {% endbreadcrumbs %} +{% static 'images/report-a-trade-barrier-header.png' as xlarge_hero %} +{% include 'components/hero.html' with image_url=xlarge_hero hero_title='Check or report a trade barrier' %}
diff --git a/domestic/templates/domestic/topic_landing_pages/manually_curated.html b/domestic/templates/domestic/topic_landing_pages/manually_curated.html index b9dba149de..85fc74d215 100644 --- a/domestic/templates/domestic/topic_landing_pages/manually_curated.html +++ b/domestic/templates/domestic/topic_landing_pages/manually_curated.html @@ -3,15 +3,16 @@ article-list-page {% endblock css_layout_class %} {% block content %} - {% block hero %} - {% include 'components/hero.html' with image=page.hero_image hero_title=page.title hero_text=page.teaser %} - {% endblock %} {% block breadcrumbs %} {% include 'components/breadcrumbs_cms.html' %} {% endblock %} + {% block hero %} + {% include 'components/hero.html' with image=page.hero_image hero_title=page.title hero_text=page.teaser %} + {% endblock %} {% block intro_section %}{% endblock %} {% block child_pages %} -
+
{% for panel in page.panels %} diff --git a/domestic/templates/domestic/topic_landing_pages/markets.html b/domestic/templates/domestic/topic_landing_pages/markets.html index 12201a6050..9f02ab9762 100644 --- a/domestic/templates/domestic/topic_landing_pages/markets.html +++ b/domestic/templates/domestic/topic_landing_pages/markets.html @@ -6,12 +6,12 @@ article-list-page {% endblock css_layout_class %} {% block content %} - {% block hero %} - {% include 'components/hero.html' with image=page.hero_image hero_title="Markets" hero_text="Research export opportunities and prepare your business for new markets" %} - {% endblock %} {% block breadcrumbs %} {% include 'components/breadcrumbs_cms.html' %} {% endblock %} + {% block hero %} + {% include 'components/hero.html' with image=page.hero_image hero_title="Markets" hero_text="Research export opportunities and prepare your business for new markets" %} + {% endblock %} {% comment %} {% if page.teaser %}
@@ -25,7 +25,7 @@ {% endif %} {% endcomment %} {% block child_pages %}
+ class="topic-list-section markets-landing govuk-!-margin-top-6">
diff --git a/domestic/templates/domestic/ukef/home_page.html b/domestic/templates/domestic/ukef/home_page.html index d079cf0bcc..92fedeb5d8 100755 --- a/domestic/templates/domestic/ukef/home_page.html +++ b/domestic/templates/domestic/ukef/home_page.html @@ -11,9 +11,9 @@ {% block head_title %}UK Export Finance{% endblock %} {% block css_layout_class %}uk-export-finance{% endblock %} {% block content %} + {% breadcrumbs %}Home{% endbreadcrumbs %} {% static 'images/UKEF-Home-header.png' as hero_xlarge %} {% include 'components/hero.html' with image_url=hero_xlarge hero_title='UK Export Finance' hero_text='Get the right finance and insurance in place to help you win contracts, fulfil orders and get paid' %} - {% breadcrumbs %}Home{% endbreadcrumbs %}
diff --git a/domestic/templates/domestic/ukef/project_finance.html b/domestic/templates/domestic/ukef/project_finance.html index 773b5c186a..c0155266d0 100755 --- a/domestic/templates/domestic/ukef/project_finance.html +++ b/domestic/templates/domestic/ukef/project_finance.html @@ -13,12 +13,12 @@ {% block head_title %}UK Export Finance - Project Finance{% endblock %} {% block css_layout_class %}uk-export-finance-landing{% endblock %} {% block content %} - {% static 'images/UKEF-finance-for-international-projects-header.png' as project_finance_hero_image %} - {% include 'components/hero.html' with image_url=project_finance_hero_image hero_title='The UK’s export credit agency' hero_text='Find the support available to buyers of your goods and service exports' %} {% breadcrumbs %} Home UKEF {% endbreadcrumbs %} +{% static 'images/UKEF-finance-for-international-projects-header.png' as project_finance_hero_image %} +{% include 'components/hero.html' with image_url=project_finance_hero_image hero_title='The UK’s export credit agency' hero_text='Find the support available to buyers of your goods and service exports' %}
diff --git a/export_academy/templates/export_academy/event_list.html b/export_academy/templates/export_academy/event_list.html index 7005656415..4a41fa0fd6 100644 --- a/export_academy/templates/export_academy/event_list.html +++ b/export_academy/templates/export_academy/event_list.html @@ -7,122 +7,123 @@ {% load append_past_year_seperator from component_tags %} {% block head_title %}Events – UK Export Academy{% endblock %} {% block content %} -
- {% block hero %} - {% with content_snippet as hero %} -
- {% include 'components/export_academy_hero.html' with hero=hero hide_image_for_mobile=True %} -
- {% endwith %} - {% endblock %} - -
-
-
-
- -
- Filters -
    - {% for field in filter.form|get_filters:request.user %} -
  • -
    - {{ field.label }} - - -
    - {% if request.GET.booking_period == 'upcoming' or request.GET.booking_period == 'past' %} - {% filter disable_period_radios %} - {{ field }} - {% endfilter %} - {% else %} - {% filter set_all_events %} - {{ field }} - {% endfilter %} - {% endif %} -
    -
    -
    • - {% endfor %} -
- - + +
+ {% block hero %} + {% with content_snippet as hero %} +
+ {% include 'components/export_academy_hero.html' with hero=hero hide_image_for_mobile=True %} +
+ {% endwith %} + {% endblock %} +
+
+
+
+
+ +
+ Filters +
    + {% for field in filter.form|get_filters:request.user %} +
  • +
    + {{ field.label }} + + +
    + {% if request.GET.booking_period == 'upcoming' or request.GET.booking_period == 'past' %} + {% filter disable_period_radios %} + {{ field }} + {% endfilter %} + {% else %} + {% filter set_all_events %} + {{ field }} + {% endfilter %} + {% endif %} +
    +
    +
    • + {% endfor %} +
+ - -
-
- {% include 'export_academy/includes/filter_summary.html' %} - {% if not page_obj %} - {% include 'export_academy/includes/no_results.html' %} - {% else %} - {% for event in page_obj|append_past_year_seperator %} -
- {% if event.past_year_seperator %} -

{{ event.past_year_seperator }}

+ +
+ +
+
+ {% include 'export_academy/includes/filter_summary.html' %} + {% if not page_obj %} + {% include 'export_academy/includes/no_results.html' %} + {% else %} + {% for event in page_obj|append_past_year_seperator %} +
+ {% if event.past_year_seperator %} +

{{ event.past_year_seperator }}

+ {% endif %} +
+ {{ event.name }}– {{ event.start_date|date:"d F" }} at {{ event.start_date|time:"gA" }} +
+
+ {% include 'export_academy/includes/event_duration.html' %} + {% is_logged_in as show_logged_in_features %} + {% if show_logged_in_features %} +
{% event_list_badges event %}
{% endif %} -
- {{ event.name }}– {{ event.start_date|date:"d F" }} at {{ event.start_date|time:"gA" }} -
-
- {% include 'export_academy/includes/event_duration.html' %} - {% is_logged_in as show_logged_in_features %} - {% if show_logged_in_features %} -
{% event_list_badges event %}
- {% endif %} -
-
-
-
-

{{ event.start_date|date:"D" }}

-

{{ event.start_date|date:"j M" }}

-

{{ event.start_date|date:"g:iA"|lower }}

-
-
- {% for type in event.types.all %}

{{ type }}

{% endfor %} -

{{ event.get_format_display }}

-
+
+
+
+
+

{{ event.start_date|date:"D" }}

+

{{ event.start_date|date:"j M" }}

+

{{ event.start_date|date:"g:iA"|lower }}

+
+
+ {% for type in event.types.all %}

{{ type }}

{% endfor %} +

{{ event.get_format_display }}

-
-
-
{% include 'export_academy/includes/event_duration.html' %}
- {% is_logged_in as show_logged_in_features %} - {% if show_logged_in_features %} -
{% event_list_badges event %}
- {% endif %} -

{{ event.description }}

- {% include 'export_academy/includes/event_list_recording_details.html' %}
- {% endfor %} - {% endif %} -
-
-
- {% pagination pagination_page=page_obj %} +
+
{% include 'export_academy/includes/event_duration.html' %}
+ {% is_logged_in as show_logged_in_features %} + {% if show_logged_in_features %} +
{% event_list_badges event %}
+ {% endif %} +

{{ event.description }}

+ {% include 'export_academy/includes/event_list_recording_details.html' %} +
+
+ {% endfor %} + {% endif %}
-
+
+ {% pagination pagination_page=page_obj %} +
+
+
{% endblock %} {% block body_js %} diff --git a/export_academy/templates/export_academy/landing_page.html b/export_academy/templates/export_academy/landing_page.html index 55d2791e09..fe5a754c58 100644 --- a/export_academy/templates/export_academy/landing_page.html +++ b/export_academy/templates/export_academy/landing_page.html @@ -6,6 +6,9 @@ {% load event_list_buttons %} {% load add_govuk_classes from content_tags %} {% block content %} + {% block breadcrumbs %} + {% include 'components/breadcrumbs_cms.html' %} + {% endblock %}
{% image page.hero_image original as rendition %}
@@ -34,9 +37,6 @@

{{ page.title }}

- {% block breadcrumbs %} - {% include 'components/breadcrumbs_cms.html' %} - {% endblock %} {% if page.banner_label %}
{% include 'components/informative_banner.html' with banner_label=page.banner_label banner_content=page.banner_content %} diff --git a/international/sass/header.scss b/international/sass/header.scss index d2e56e064f..88e739a6c1 100644 --- a/international/sass/header.scss +++ b/international/sass/header.scss @@ -110,7 +110,7 @@ } -@media (min-width: 768px) { +@media (min-width: 769px) { .great-navigation-list { float: right; @@ -125,3 +125,7 @@ } } } + +.international-cookie-banner-container { + background-color: #dde5ed; +} diff --git a/international/sass/main.scss b/international/sass/main.scss index c0ec8ffe4a..716af88137 100644 --- a/international/sass/main.scss +++ b/international/sass/main.scss @@ -19,18 +19,14 @@ body { .great-hero { background-image: url('/static/images/international-background-image.png'); - position: relative; - padding-top: 0; - padding-bottom: 0; - min-height: 200px; - background-position: 50%; + background-repeat: no-repeat; + background-position: center; background-size: cover; + border-radius: var(--spacing-spacing-0, 0px); + flex-direction: column; + gap: 20px; - & > .container { - min-height: 200px; - overflow: visible; - padding-top: 45px; - } + align-self: stretch; .great-hero__heading { color: white; diff --git a/international/templates/international/base.html b/international/templates/international/base.html index 9cd2ce395e..d55ac2a062 100644 --- a/international/templates/international/base.html +++ b/international/templates/international/base.html @@ -52,11 +52,11 @@ })
-
+ class="govuk-!-padding-top-4 govuk-!-padding-bottom-2 international-cookie-banner-container"> +
-