Merge pull request #3510 from alphagov/fix-h1-issue-with-worldwide-or…

…gs-add-h1 Display an H1 of the page title of all worldwide org pages
alphagov · Jan 30, 2025 · 104f325 · 104f325
2 parents 04b1dbc + 2b5bfa6
commit 104f325
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/app/views/content_items/worldwide_corporate_information_page.html.erb b/app/views/content_items/worldwide_corporate_information_page.html.erb
@@ -1,5 +1,6 @@
 <%= render partial: "content_items/worldwide_organisation/header", locals: {
   worldwide_organisation: @content_item.worldwide_organisation,
+  show_header_title: false,
 } %>
 
 <article class="govuk-grid-row">

diff --git a/app/views/content_items/worldwide_office.html.erb b/app/views/content_items/worldwide_office.html.erb
@@ -1,5 +1,6 @@
 <%= render partial: "content_items/worldwide_organisation/header", locals: {
   worldwide_organisation: @content_item.worldwide_organisation,
+  show_header_title: false,
 } %>
 
 <article class="govuk-grid-row">

diff --git a/app/views/content_items/worldwide_organisation.html.erb b/app/views/content_items/worldwide_organisation.html.erb
@@ -1,4 +1,4 @@
-<%= render partial: "content_items/worldwide_organisation/header", locals: { worldwide_organisation: @content_item } %>
+<%= render partial: "content_items/worldwide_organisation/header", locals: { worldwide_organisation: @content_item, show_header_title: true } %>
 
 <section class="govuk-grid-row" id="about-us">
   <div class="govuk-grid-column-two-thirds">

diff --git a/app/views/content_items/worldwide_organisation/_header.html.erb b/app/views/content_items/worldwide_organisation/_header.html.erb
@@ -1,10 +1,20 @@
 <header class="worldwide-organisation-header govuk-grid-row">
   <div class="govuk-grid-column-two-thirds worldwide-organisation-header__logo">
-    <%= render "govuk_publishing_components/components/organisation_logo", {
-      organisation: @content_item.organisation_logo,
-      heading_level: 1,
-      inline: true,
-    } %>
+    <% locals = { organisation: @content_item.organisation_logo, inline: true, heading_level: 1 } %>
+      <% if show_header_title
+        locals.merge!(margin_bottom: 8)
+        locals.delete(:heading_level) %>
+        <%= render "govuk_publishing_components/components/organisation_logo", locals %>
+        <%= render "govuk_publishing_components/components/heading", {
+          text: @content_item.title,
+          heading_level: 1,
+          inline: true,
+          font_size: "l",
+          margin_bottom: 5,
+        } %>
+      <% else %>
+        <%= render "govuk_publishing_components/components/organisation_logo", locals %>
+      <% end %>
   </div>
 
   <div class="govuk-grid-column-one-third govuk-!-padding-top-2">

diff --git a/test/integration/worldwide_organisation_test.rb b/test/integration/worldwide_organisation_test.rb
@@ -3,7 +3,8 @@
 class WorldwideOrganisationTest < ActionDispatch::IntegrationTest
   test "renders basic worldwide organisation page" do
     setup_and_visit_content_item("worldwide_organisation")
-    assert_has_component_title("British Deputy High Commission\nHyderabad")
+    assert_has_component_title("UK Embassy in Country")
+    assert page.has_css?(".gem-c-organisation-logo__name")
     assert page.has_text?(@content_item["description"])
   end