Merge pull request #2309 from alphagov/revert-overview

Revert PRs #2238 and #2292
alphagov · Dec 8, 2021 · 8cc333a · 8cc333a
2 parents c16a181 + 49e1dc9
commit 8cc333a
Show file tree

Hide file tree

Showing 61 changed files with 8,101 additions and 9,453 deletions.
diff --git a/app/views/content_items/_context_and_title.html.erb b/app/views/content_items/_context_and_title.html.erb
diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb
@@ -6,7 +6,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'context_and_title' %>
+    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
   </div>
   <%= render 'shared/translations' %>
 </div>

diff --git a/app/views/content_items/publication.html.erb b/app/views/content_items/publication.html.erb
@@ -8,7 +8,11 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'context_and_title' %>
+    <%= render 'govuk_publishing_components/components/title',
+      context: t("content_item.schema_name.#{@content_item.document_type}", count: 1),
+      context_locale: t_locale_fallback("content_item.schema_name.#{@content_item.document_type}", count: 1),
+      title: @content_item.title,
+      average_title_length: "long" %>
   </div>
   <%= render 'shared/translations' %>