Fix missing headings and replace subpage breadcrumb with back link

* Replaced the landing-page breadcrumb with H2 * Replaced the sub-page breadcrumb with the back link component * Added a "Contents" H2 above the document list * Rewrote tests accordingly
alphagov · Jun 13, 2024 · 8128fb2 · 8128fb2
1 parent 25a72ab
commit 8128fb2
Show file tree

Hide file tree

Showing 77 changed files with 177 additions and 38 deletions.
diff --git a/app/assets/stylesheets/views/_manual.scss b/app/assets/stylesheets/views/_manual.scss
@@ -102,7 +102,7 @@
 
 .manual-body {
   @include govuk-media-query($from: tablet) {
-    margin-top: govuk-spacing(6);
+    margin-top: govuk-spacing(4);
   }
 
   .section-title {

diff --git a/app/views/content_items/manuals/_header.html.erb b/app/views/content_items/manuals/_header.html.erb
@@ -3,6 +3,7 @@
   type ||= nil
 
   classes = %w[govuk-grid-row manuals-header]
+  classes << %w[govuk-!-margin-bottom-4]
   classes << "hmrc" if green_background
 %>
 
@@ -47,8 +48,3 @@
     </div>
   </div>
 <% end %>
-
-<%= render "govuk_publishing_components/components/breadcrumbs", {
-           border: "bottom",
-           breadcrumbs: @content_item.breadcrumbs,
-           collapse_on_mobile: false } %>
diff --git a/app/views/content_items/manuals/_manual_layout.html.erb b/app/views/content_items/manuals/_manual_layout.html.erb
@@ -1,4 +1,8 @@
 <% content_for :main do %>
+  <%= render "govuk_publishing_components/components/heading", {
+    text: t("manuals.summary_title"),
+    margin_bottom: 4
+  } %>
   <div id="manuals-frontend" class="manuals-frontend-body">
 
   <%= machine_readable_metadata(schema: :article) %>
@@ -15,8 +19,13 @@
       <% end %>
     <% end %>
 
+    <%= render "govuk_publishing_components/components/heading", {
+      text: t("manuals.contents_title"),
+      margin_bottom: 4
+    } %>
+
     <%= yield %>
 
     <%= render 'govuk_publishing_components/components/print_link' %>
   </div>
-<% end %>
+<% end %>
diff --git a/app/views/content_items/manuals/_manual_section_layout.html.erb b/app/views/content_items/manuals/_manual_section_layout.html.erb
@@ -1,6 +1,10 @@
 <% show_contents ||= false %>
 
 <% content_for :main do %>
+  <%= render "govuk_publishing_components/components/back_link", {
+    text: t("manuals.breadcrumb_contents"),
+    href: @content_item.base_path
+  } %>
   <div id="manuals-frontend" class="manuals-frontend-body">
     <% if show_contents %>
       <%= render "govuk_publishing_components/components/contents_list", {

diff --git a/app/views/content_items/manuals/_manual_updates_layout.html.erb b/app/views/content_items/manuals/_manual_updates_layout.html.erb
@@ -1,4 +1,8 @@
 <% content_for :main do %>
+  <%= render "govuk_publishing_components/components/back_link", {
+    text: t("manuals.breadcrumb_contents"),
+    href: @content_item.base_path
+  } %>
   <div id="manuals-frontend" class="manuals-frontend-body">
     <%= render "content_items/manuals/updates", content_item: @content_item %>
   </div>

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
@@ -775,8 +775,10 @@ ar:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/az.yml b/config/locales/az.yml
@@ -467,8 +467,10 @@ az:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/be.yml b/config/locales/be.yml
@@ -621,8 +621,10 @@ be:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
@@ -467,8 +467,10 @@ bg:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
@@ -467,8 +467,10 @@ bn:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
@@ -544,8 +544,10 @@ cs:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/cy.yml b/config/locales/cy.yml
@@ -775,8 +775,10 @@ cy:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/da.yml b/config/locales/da.yml
@@ -479,8 +479,10 @@ da:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -467,8 +467,10 @@ de:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/dr.yml b/config/locales/dr.yml
@@ -470,8 +470,10 @@ dr:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/el.yml b/config/locales/el.yml
@@ -467,8 +467,10 @@ el:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -467,8 +467,10 @@ en:
     zh-hk: Cantonese
     zh-tw: Traditional Chinese
   manuals:
-    breadcrumb_contents: Contents
+    summary_title: Summary
+    breadcrumb_contents: Back to contents
     contents_list_breadcrumb_contents: Manual homepage
+    contents_title: Contents
     hmrc_manual_type: HMRC internal manual
     hmrc_title: "%{title}HMRC internal manual"
     next_page: Next page

diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml
@@ -467,8 +467,10 @@ es-419:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -467,8 +467,10 @@ es:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/et.yml b/config/locales/et.yml
@@ -467,8 +467,10 @@ et:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
@@ -467,8 +467,10 @@ fa:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
@@ -467,8 +467,10 @@ fi:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -467,8 +467,10 @@ fr:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
@@ -621,8 +621,10 @@ gd:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/gu.yml b/config/locales/gu.yml
@@ -467,8 +467,10 @@ gu:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/he.yml b/config/locales/he.yml
@@ -467,8 +467,10 @@ he:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
@@ -467,8 +467,10 @@ hi:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
@@ -544,8 +544,10 @@ hr:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
@@ -467,8 +467,10 @@ hu:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/hy.yml b/config/locales/hy.yml
@@ -467,8 +467,10 @@ hy:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/id.yml b/config/locales/id.yml
@@ -390,8 +390,10 @@ id:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/is.yml b/config/locales/is.yml
@@ -467,8 +467,10 @@ is:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -467,8 +467,10 @@ it:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page:

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -390,8 +390,10 @@ ja:
     zh-hk:
     zh-tw:
   manuals:
+    summary_title:
     breadcrumb_contents:
     contents_list_breadcrumb_contents:
+    contents_title:
     hmrc_manual_type:
     hmrc_title:
     next_page: