govuk_publishing_components 29.5.0 → 29.8.0

data/app/views/govuk_publishing_components/audit/_component_contents.html.erb

@@ -0,0 +1,82 @@
+<%
+  total_components = components.length
+  components_with_stylesheet = 0
+  components_with_print_stylesheet = 0
+  components_with_javascript = 0
+  components_with_test = 0
+  components_with_javascript_test = 0
+  components_with_helper = 0
+
+  components.each do |component|
+    components_with_stylesheet += 1 if component[:stylesheet]
+    components_with_print_stylesheet += 1 if component[:print_stylesheet]
+    components_with_javascript += 1 if component[:javascript]
+    components_with_test += 1 if component[:tests]
+    components_with_javascript_test += 1 if component[:js_tests]
+    components_with_helper += 1 if component[:helper]
+  end
+%>
+<table class="govuk-table">
+  <thead class="govuk-table__head">
+    <tr class="govuk-table__row">
+      <th scope="col" class="govuk-table__header sticky-table-header">Component (<%= total_components %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">CSS (<%= components_with_stylesheet %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">Print CSS (<%= components_with_print_stylesheet %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">JS (<%= components_with_javascript %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">Test (<%= components_with_test %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">JS test (<%= components_with_javascript_test %>)</th>
+      <th scope="col" class="govuk-table__header sticky-table-header">Helper (<%= components_with_helper %>)</th>
+    </tr>
+  </thead>
+  <tbody class="govuk-table__body">
+    <% components.each do |component| %>
+      <tr class="govuk-table__row">
+        <th scope="row" class="govuk-table__header">
+          <a href="<%= component[:link] %>" class="govuk-link"><%= component[:name] %></a>
+        </th>
+        <td class="govuk-table__cell">
+          <% if component[:stylesheet] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:stylesheet] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:print_stylesheet] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:print_stylesheet] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:javascript] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:javascript] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:tests] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:tests] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:js_tests] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:js_tests] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+        <td class="govuk-table__cell">
+          <% if component[:helper] %>
+            <strong class="govuk-tag govuk-tag--green">
+              <a href="<%= component[:helper] %>" class="govuk-link">Yes</a>
+            </strong>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/govuk_publishing_components/audit/_components.html.erb

@@ -1,6 +1,6 @@
 <% if @other_applications %>
   <%= render "govuk_publishing_components/components/heading", {
-    text: "Components",
+    text: "Components in the gem",
     font_size: "l",
     margin_bottom: 6,
   } %>
@@ -10,52 +10,7 @@
   <% component_items = [] %>
 
   <% component_files = capture do %>
-    <table class="govuk-table">
-      <thead class="govuk-table__head">
-        <tr class="govuk-table__row">
-          <th scope="col" class="govuk-table__header sticky-table-header">Component</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">Stylesheet</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">Print stylesheet</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">JS</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">Test</th>
-          <th scope="col" class="govuk-table__header sticky-table-header">JS test</th>
-        </tr>
-      </thead>
-      <tbody class="govuk-table__body">
-        <% @components[:component_listing].each do |component| %>
-          <tr class="govuk-table__row">
-            <th scope="row" class="govuk-table__header">
-              <a href="<%= component[:link] %>" class="govuk-link"><%= component[:name] %></a>
-            </th>
-            <td class="govuk-table__cell">
-              <% if component[:stylesheet] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:print_stylesheet] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:javascript] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:tests] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-            <td class="govuk-table__cell">
-              <% if component[:js_tests] %>
-                <strong class="govuk-tag govuk-tag--green">Yes</strong>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+    <%= render partial: "component_contents", locals: { components: @components[:component_listing] } %>
   <% end %>
 
   <%

data/app/views/govuk_publishing_components/component_guide/index.html.erb

@@ -20,7 +20,7 @@
   <p>Components are packages of template, style, behaviour and documentation that live in your application.</p>
   <p>See the <a href="https://github.com/alphagov/govuk_publishing_components">govuk_publishing_components gem</a> for further details, or <a href="https://docs.publishing.service.gov.uk/manual/components.html#component-guides">a list of all component guides</a>.</p>
   <ul>
-    <li>Read about how to <a href="https://github.com/alphagov/govuk_publishing_components/blob/master/docs/publishing-to-rubygems.md">release a new version of the gem</a></li>
+    <li>Read about how to <a href="https://github.com/alphagov/govuk_publishing_components/blob/main/docs/publishing-to-rubygems.md">release a new version of the gem</a></li>
     <% if ENV["MAIN_COMPONENT_GUIDE"] %>
       <li><a href="/component-guide/audit">View component audits</a></li>
     <% end %>
@@ -105,5 +105,5 @@
 </ul>
 
 <div class="component-markdown">
-  <p class="govuk-body">If you cannot find a suitable component consider extending an existing component or <a href="https://github.com/alphagov/govuk_publishing_components/blob/master/docs/generate-a-new-component.md">creating a new one</a>.</p>
+  <p class="govuk-body">If you cannot find a suitable component consider extending an existing component or <a href="https://github.com/alphagov/govuk_publishing_components/blob/main/docs/generate-a-new-component.md">creating a new one</a>.</p>
 </div>

data/app/views/govuk_publishing_components/component_guide/show.html.erb

@@ -13,7 +13,7 @@
       <% if !@component_doc.accessibility_criteria.present? %>
         <div class="component-violation">
           <h2 class="component-violation__title">This component is not valid</h2>
-          <a class="component-violation__link" href="https://github.com/alphagov/govuk_publishing_components/blob/master/docs/accessibility_acceptance_criteria.md">Please define accessibility acceptance criteria for this component.</a>
+          <a class="component-violation__link" href="https://github.com/alphagov/govuk_publishing_components/blob/main/docs/accessibility_acceptance_criteria.md">Please define accessibility acceptance criteria for this component.</a>
         </div>
       <% end %>
       <%= render 'govuk_publishing_components/components/lead_paragraph', text: @component_doc.description %>

data/app/views/govuk_publishing_components/components/_attachment.html.erb

@@ -1,5 +1,5 @@
 <%
-  attachment = GovukPublishingComponents::Presenters::Attachment.new(attachment)
+  attachment = GovukPublishingComponents::Presenters::AttachmentHelper.new(attachment)
   target ||= "_self"
   hide_opendocument_metadata ||= false
   hide_order_copy_link ||= false

data/app/views/govuk_publishing_components/components/_attachment_link.html.erb

@@ -1,5 +1,5 @@
 <%
-  attachment = GovukPublishingComponents::Presenters::Attachment.new(attachment)
+  attachment = GovukPublishingComponents::Presenters::AttachmentHelper.new(attachment)
   target ||= nil
   data_attributes ||= {}
   attributes = []

data/app/views/govuk_publishing_components/components/_cards.html.erb

@@ -31,17 +31,19 @@
         end
       %>
         <li class="gem-c-cards__list-item">
-          <%= content_tag("h#{sub_heading_level}", class: "gem-c-cards__sub-heading govuk-heading-s") do %>
-            <%= 
-              link_to link[:text], link[:path], 
-              class: "govuk-link gem-c-cards__link", 
-              data: link[:data_attributes],
-              "data-track-count": "cardLink"
-            %>
-          <% end %>
-          <% if item[:description] %>
-            <p class="govuk-body gem-c-cards__description"><%= item[:description] %></p>
-          <% end %>
+          <div class="gem-c-cards__list-item-wrapper">
+            <%= content_tag("h#{sub_heading_level}", class: "gem-c-cards__sub-heading govuk-heading-s") do %>
+              <%=
+                link_to link[:text], link[:path],
+                class: "govuk-link gem-c-cards__link",
+                data: link[:data_attributes],
+                "data-track-count": "cardLink"
+              %>
+            <% end %>
+            <% if item[:description] %>
+              <p class="govuk-body gem-c-cards__description"><%= item[:description] %></p>
+            <% end %>
+          </div>
         </li>
       <% end %>
     <% end %>

data/app/views/govuk_publishing_components/components/docs/contents_list.yml

@@ -191,7 +191,7 @@ examples:
     context:
       right_to_left: true
   with_branding:
-    description: Where this component could be used on an organisation page (such as the [Attorney General's Office](https://www.gov.uk/government/organisations/attorney-generals-office)) branding can be applied for link colours and border colours. See the [branding documentation](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) for more details.
+    description: Where this component could be used on an organisation page (such as the [Attorney General's Office](https://www.gov.uk/government/organisations/attorney-generals-office)) branding can be applied for link colours and border colours. See the [branding documentation](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) for more details.
     data:
       brand: 'department-for-environment-food-rural-affairs'
       format_numbers: true

data/app/views/govuk_publishing_components/components/docs/document_list.yml

@@ -2,7 +2,7 @@ name: Document list
 description: An ordered list of documents including a document type, when updated and a link.
 body: |
   Outputs a list to documents, based on an array of document data. A "document" in this context can be an asset (such as a ODT or other downloadable document) or a web page.
-  
+
   The component can display:
 
   * a document title
@@ -116,7 +116,7 @@ examples:
           public_updated_at: 2017-07-19 15:01:48
           document_type: 'Statutory guidance'
   with_branding:
-    description: Where this component could be used on an organisation page (such as the [Attorney General's Office](https://www.gov.uk/government/organisations/attorney-generals-office)) branding can be applied for link colours and border colours. See the [branding documentation](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) for more details.
+    description: Where this component could be used on an organisation page (such as the [Attorney General's Office](https://www.gov.uk/government/organisations/attorney-generals-office)) branding can be applied for link colours and border colours. See the [branding documentation](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) for more details.
     data:
       brand: 'attorney-generals-office'
       items:
@@ -308,9 +308,9 @@ examples:
   with_rel_link_attribute:
     description: |
       The [rel attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel) is an option attribute to dictate the relationship between the document being linked to and the current page. This is predominantly used by search engines to help index journeys through a website.
-      
+
       On GOV.UK, this is typically used to dictate an external website being linked to with `rel="external"`, however this component supports:
-      
+
       - external
       - nofollow
       - noopener

data/app/views/govuk_publishing_components/components/docs/heading.yml

@@ -65,7 +65,7 @@ examples:
       padding: true
       border_top: 2
   with_branding:
-    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown, if a top border is included.
+    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) can be added to the component as shown, if a top border is included.
     data:
       text: 'Branding'
       brand: 'department-for-environment-food-rural-affairs'

data/app/views/govuk_publishing_components/components/docs/image_card.yml

@@ -166,7 +166,7 @@ examples:
       heading_text: 'John McJohnson'
       description: 'Deputy director for Parks and Small Trees'
   with_branding:
-    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown.
+    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) can be added to the component as shown.
     data:
       brand: "department-for-work-pensions"
       href: "/again-not-a-page"

data/app/views/govuk_publishing_components/components/docs/meta_tags.yml

@@ -4,9 +4,9 @@ body: |
   This takes a content-store links hash like object which it can then turn into
   the correct analytics identifier metadata tags.
 
-  These are additionally used by the <a href="https://github.com/alphagov/govuk-browser-extension">GOV.UK browser extension</a> to provide details about a given page. 
+  These are additionally used by the <a href="https://github.com/alphagov/govuk-browser-extension">GOV.UK browser extension</a> to provide details about a given page.
 
-  The code which reads the meta tags can be found <a href="https://github.com/alphagov/govuk_publishing_components/blob/master/app/assets/javascripts/govuk_publishing_components/analytics/custom-dimensions.js">in custom-dimensions.js</a>.
+  The code which reads the meta tags can be found <a href="https://github.com/alphagov/govuk_publishing_components/blob/main/app/assets/javascripts/govuk_publishing_components/analytics/custom-dimensions.js">in custom-dimensions.js</a>.
 accessibility_criteria: |
   The analytics meta tags component should not be visible to any users.
 display_html: true
@@ -24,7 +24,7 @@ examples:
   with_content_history_tags:
     description: |
       The tags in this object will generate the `content-has-history` tag, set to true. This tag is triggered when either, within `content_item`:
-      
+
       1. `public_updated_at` and `first_public_at` within `details` are both present and they aren't the same value
       2. `change_history` within `details` is present and it has a value of more than 1
 
@@ -121,4 +121,4 @@ examples:
       content_item:
         links:
           secondary_to_step_navs:
-            - content_id: "22222222-2222-2222-2222-222222222222"
+            - content_id: "22222222-2222-2222-2222-222222222222"

data/app/views/govuk_publishing_components/components/docs/metadata.yml

@@ -359,7 +359,7 @@ examples:
       dark_background: true
   with_custom_margin_bottom:
     description: |
-      The component accepts a number for margin bottom from `0` to `9` (`0px` to `60px`) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to the `margin-bottom` values defined in the [responsive-bottom-margin mixin](https://github.com/alphagov/govuk_publishing_components/blob/master/app/assets/stylesheets/govuk_publishing_components/components/mixins/_margins.scss#L1)
+      The component accepts a number for margin bottom from `0` to `9` (`0px` to `60px`) using the [GOV.UK Frontend spacing scale](https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale). It defaults to the `margin-bottom` values defined in the [responsive-bottom-margin mixin](https://github.com/alphagov/govuk_publishing_components/blob/main/app/assets/stylesheets/govuk_publishing_components/components/mixins/_margins.scss#L1)
     data:
       first_published: 14 June 2014
       last_updated: 10 September 2015

data/app/views/govuk_publishing_components/components/docs/share_links.yml

@@ -80,7 +80,7 @@ examples:
         }
       ]
   with_branding:
-    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown.
+    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) can be added to the component as shown.
     data:
       brand: 'attorney-generals-office'
       links: [

data/app/views/govuk_publishing_components/components/docs/subscription_links.yml

@@ -46,7 +46,7 @@ examples:
       email_signup_link: '/foreign-travel-advice/singapore/email-signup'
       feed_link_box_value: 'https://www.gov.uk/government/organisations/attorney-generals-office.atom'
   with_branding:
-    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown.
+    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) can be added to the component as shown.
     data:
       brand: 'attorney-generals-office'
       email_signup_link: '/foreign-travel-advice/singapore/email-signup'

data/app/views/govuk_publishing_components/components/docs/translation_nav.yml

@@ -60,7 +60,7 @@ examples:
     context:
       right_to_left: true
   with_branding:
-    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/master/docs/component_branding.md) can be added to the component as shown.
+    description: Organisation [colour branding](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/component_branding.md) can be added to the component as shown.
     data:
       brand: 'wales-office'
       translations:
@@ -134,4 +134,3 @@ examples:
             dimension29: 'dimension29Welsh'
     context:
       dark_background: true
-

data/config/locales/ar.yml

@@ -87,6 +87,7 @@ ar:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© حقوق نشر التاج الملكي</a>
       licence_html: كل المحتوى متاح بموجب <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">الترخيص الحكومي المفتوح (الإصدار v3.0)</a>، ما لم ينص على خلاف ذلك
+      navigation_links:
       support_links: روابط الدعم
     layout_for_public:
       account_layout:

data/config/locales/az.yml

@@ -83,6 +83,7 @@ az:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Bütün məzmunlar <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">v3.0 Açıq dövlət lisenziyasına əsasən mövcuddur</a>(başqa cür nəzərdə tutulmuş hallar istisna olmaqla)
+      navigation_links:
       support_links: Dəstək keçidləri
     layout_for_public:
       account_layout:

data/config/locales/be.yml

@@ -90,6 +90,7 @@ be:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Увесь змест даступны <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, калі не паказана іншае
+      navigation_links:
       support_links: Дапаможныя спасылкі
     layout_for_public:
       account_layout:

data/config/locales/bg.yml

@@ -88,6 +88,7 @@ bg:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Цялото съдържание е налично на <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, освен ако не е посочено друго
+      navigation_links:
       support_links: Помощни линкове
     layout_for_public:
       account_layout:

data/config/locales/bn.yml

@@ -85,6 +85,7 @@ bn:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© ক্রাউন কপিরাইট</a>
       licence_html: শুধুমাত্র অন্যভাবে বর্ণিত থাকা ছাড়া, সকল তথ্য <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">ওপেন গভর্নমেন্ট লাইসেন্স v3.0</a>-এর অধীনে উপলভ্য
+      navigation_links:
       support_links: সহায়তার লিংক
     layout_for_public:
       account_layout:

data/config/locales/cs.yml

@@ -89,6 +89,7 @@ cs:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Veškerý obsah je k dispozici pod <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, pokud není uvedeno jinak
+      navigation_links:
       support_links: Odkazy na podporu
     layout_for_public:
       account_layout:

data/config/locales/cy.yml

@@ -88,6 +88,7 @@ cy:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Hawlfraint y Goron</a>
       licence_html: Mae'r holl gynnwys ar gael o dan <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Drwydded Agored y Llywodraeth v3.0</a>, ac eithrio ble nodir yn wahanol
+      navigation_links:
       support_links: Dolenni cefnogi
     layout_for_public:
       account_layout:

data/config/locales/da.yml

@@ -85,6 +85,7 @@ da:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Krown copyright</a>
       licence_html: Alt indhold er tilgængeligt i henhold til <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">åben Forvaltning Licens v3.0</a>, medmindre andet er angivet.
+      navigation_links:
       support_links: Støtte links
     layout_for_public:
       account_layout:

data/config/locales/de.yml

@@ -88,6 +88,7 @@ de:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Alle Inhalte stehen unter der <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, sofern nicht anders angegeben.
+      navigation_links:
       support_links: Links zur Unterstützung
     layout_for_public:
       account_layout:

data/config/locales/dr.yml

@@ -86,6 +86,7 @@ dr:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: همه محتویات در<a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, موجود است، مگر در مواردی که خلاف آن ذکر شده باشد.
+      navigation_links:
       support_links: لنک های حمایوی
     layout_for_public:
       account_layout:

data/config/locales/el.yml

@@ -84,6 +84,7 @@ el:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Πνευματικά δικαιώματα Crown</a>
       licence_html: Όλο το περιεχόμενο είναι διαθέσιμο βάσει της <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Άδειας Ανοικτής Κυβέρνησης v3.0</a> , εκτός εάν αναφέρεται διαφορετικά
+      navigation_links:
       support_links: Σύνδεσμοι υποστήριξης
     layout_for_public:
       account_layout:

data/config/locales/en.yml

@@ -83,6 +83,59 @@ en:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">© Crown copyright</a>
       licence_html: All content is available under the <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated
+      navigation_links:
+      - title: Topics
+        menu_contents:
+        - text: Benefits
+          href: "/browse/benefits"
+        - text: Births, death, marriages and care
+          href: "/browse/births-deaths-marriages"
+        - text: Business and self-employed
+          href: "/browse/business"
+        - text: Childcare and parenting
+          href: "/browse/childcare-parenting"
+        - text: Citizenship and living in the UK
+          href: "/browse/citizenship"
+        - text: Crime, justice and the law
+          href: "/browse/justice"
+        - text: Disabled people
+          href: "/browse/disabilities"
+        - text: Driving and transport
+          href: "/browse/driving"
+        - text: Education and learning
+          href: "/browse/education"
+        - text: Employing people
+          href: "/browse/employing-people"
+        - text: Environment and countryside
+          href: "/browse/environment-countryside"
+        - text: Housing and local services
+          href: "/browse/housing-local-services"
+        - text: Money and tax
+          href: "/browse/tax"
+        - text: Passports, travel and living abroad
+          href: "/browse/abroad"
+        - text: Visas and immigration
+          href: "/browse/visas-immigration"
+        - text: Working, jobs and pensions
+          href: "/browse/working"
+      - title: Government activity
+        menu_contents:
+        - text: Departments
+          href: "/government/organisations"
+        - text: News
+          href: "/search/news-and-communications"
+        - text: Guidance and regulation
+          href: "/search/guidance-and-regulation"
+        - text: Research and statistics
+          href: "/search/research-and-statistics"
+        - text: Policy papers and consultations
+          href: "/search/policy-papers-and-consultations"
+        - text: Transparency
+          href: "/search/transparency-and-freedom-of-information-releases"
+        - text: How government works
+          href: "/government/how-government-works"
+        - text: Get involved
+          href: "/government/get-involved"
       support_links: Support links
     layout_for_public:
       account_layout:
@@ -122,8 +175,6 @@ en:
           href: "/browse/childcare-parenting"
         - label: Citizenship and living in the UK
           href: "/browse/citizenship"
-        - label: Coronavirus (COVID‑19)
-          href: "/coronavirus"
         - label: Crime, justice and the law
           href: "/browse/justice"
         - label: Disabled people
@@ -235,7 +286,7 @@ en:
         link_text: Check what you need to do
         title: Brexit
       ukraine:
-        link_path: "/government/topical-events/russian-invasion-of-ukraine-uk-government-response"
+        link_path: "https://ukstandswithukraine.campaign.gov.uk/"
         link_text: Find out about the UK’s response
         title: Invasion of Ukraine
       world_locations: World locations

data/config/locales/es-419.yml

@@ -84,6 +84,7 @@ es-419:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Todos los contenidos están disponibles bajo la <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Licencia Gubernamental Abierta v3.0</a>, salvo que se indique lo contrario
+      navigation_links:
       support_links: Enlaces de ayuda
     layout_for_public:
       account_layout:

data/config/locales/es.yml

@@ -84,6 +84,7 @@ es:
     layout_footer:
       copyright_html: <a class='govuk-footer__link govuk-footer__copyright-logo' href='http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Derechos de autor de la corona</a>
       licence_html: Todo el contenido está disponible bajo la <a class='govuk-footer__link' href='https://www.nationalarchives.gov.uk/doc/open-government-license/version/3/" rel='license'>Licencia de Gobierno Abierto v3,0</a>, excepto donde se indique lo contrario
+      navigation_links:
       support_links: Enlaces de soporte
     layout_for_public:
       account_layout:

data/config/locales/et.yml

@@ -87,6 +87,7 @@ et:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crowni autoriõigus</a>
       licence_html: Kogu sise on saadaval <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a> all, kui pole märgitud teisiti
+      navigation_links:
       support_links: Tugiteenuste lingid
     layout_for_public:
       account_layout:

data/config/locales/fa.yml

@@ -82,6 +82,7 @@ fa:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">کپی‌رایت © Crown</a>
       licence_html: تمام محتوا تحت <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">مجوز دولت باز نسخه 3.0</a> در دسترس است، مگر در مواردی که خلاف آن بیان شده باشد
+      navigation_links:
       support_links: لینک‌های پشتیبان
     layout_for_public:
       account_layout:

data/config/locales/fi.yml

@@ -86,6 +86,7 @@ fi:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Kruunun tekijänoikeus</a>
       licence_html: Kaikki sisältö on saatavilla osoitteessa <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Avoimen hallinnon lisenssi v3.0</a>, ellei toisin mainita
+      navigation_links:
       support_links: Tukilinkit
     layout_for_public:
       account_layout:

data/config/locales/fr.yml

@@ -84,6 +84,7 @@ fr:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Copyright de la Couronne</a>
       licence_html: L'ensemble du contenu est disponible en vertu de la <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, sauf indication contraire.
+      navigation_links:
       support_links: Liens d'assistance
     layout_for_public:
       account_layout:

data/config/locales/gd.yml

@@ -86,6 +86,7 @@ gd:
     layout_footer:
       copyright_html: <a class="govuk-footer__link govuk-footer__copyright-logo" href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
       licence_html: Tá an t-ábhar go léir ar fáil faoi <a class="govuk-footer__link" href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Oibriú saor in aisce v3.0</a>, mura luaitear a mhalairt
+      navigation_links:
       support_links: Nasc tacaíochta
     layout_for_public:
       account_layout: