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 <[email protected]>
uktrade · Feb 8, 2024 · a7671f4 · a7671f4
1 parent a6ebb4a
commit a7671f4
Show file tree

Hide file tree

Showing 22 changed files with 230 additions and 224 deletions.
diff --git 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 %}
-    <section id="{% block page_id %}article-list-page{% endblock %}">
-        {% block breadcrumbs %}
-            {% include 'components/breadcrumbs_cms.html' %}
-        {% endblock %}
+    <section id="{% block page_id %}article-list-page{% endblock %}"
+             class="govuk-!-margin-top-6">
         <div class="container">
             {% if page.list_teaser %}
                 <div class="grid-row">

diff --git a/domestic/templates/domestic/country_guide.html b/domestic/templates/domestic/country_guide.html
@@ -8,8 +8,8 @@
     {% if page.stats.market_trends %}<script src="https://cdn.plot.ly/plotly-1.58.5.min.js"></script>{% 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 %}
         <section id="country-guide-teaser-section"
                  class="teaser-section padding-vertical-30">

diff --git 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 %}
-    <section id="get-finance-hero">
-        {% 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 %}
-        <a href="/">Home</a>
-        <a href="{% url 'domestic:get-finance' %}">UKEF</a>
-    {% endbreadcrumbs %}
+    {% breadcrumbs %}
+    <a href="/">Home</a>
+    <a href="{% url 'domestic:get-finance' %}">UKEF</a>
+{% endbreadcrumbs %}
+{% image page.hero_image original as hero_image_rendition %}
+<section id="get-finance-hero">
+    {% 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 %}
 </section>
 <section id="contact-section" class="contact-section padding-vertical-30">
     {% 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
@@ -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 %}
     <a href="/">Home</a>
     <a href="{% url 'domestic:market-access' %}">Trade barriers</a>
 {% 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' %}
 <section class="great" id="report-a-trade-barrier">
     <div class="page-main-content-container">
         <div class="container">

diff --git 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 %}
-        <section id="{{ page.slug }}-list-section" class="topic-list-section">
+        <section id="{{ page.slug }}-list-section"
+                 class="topic-list-section govuk-!-margin-top-6">
             <div class="container">
                 <div class="flex-grid">
                     {% 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
@@ -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 %}
 <section id="markets-banner-section" class="topic-list-section padding-bottom-60-m padding-top-15-m">
     <div class="container">
@@ -25,7 +25,7 @@
     {% endif %}  {% endcomment %}
     {% block child_pages %}
         <section id="{{ page.slug }}-list-section"
-                 class="topic-list-section markets-landing">
+                 class="topic-list-section markets-landing govuk-!-margin-top-6">
             <div class="container">
                 <form id="sectors-form" action="" method="get">
                     <div class="grid-row">

diff --git 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 %}<a href="/">Home</a>{% 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 %}<a href="/">Home</a>{% endbreadcrumbs %}
     <section id="list-teaser-section"
              class="list-teaser-section padding-top-30 padding-bottom-60">
         <div class="container">

diff --git 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 %}
     <a href="/">Home</a>
     <a href="{% url 'domestic:get-finance' %}">UKEF</a>
 {% 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' %}
 <section id="teaser-section" class="teaser-section padding-vertical-60">
     <div class="container">
         <div class="grid-row">