Merge pull request #3564 from alphagov/replace_title_components_with_…

…heading_components Replace title components with heading components
alphagov · Feb 19, 2025 · 3af25ad · 3af25ad
2 parents e381c5f + 6a2ff91
commit 3af25ad
Show file tree

Hide file tree

Showing 61 changed files with 215 additions and 119 deletions.
diff --git a/app/presenters/call_for_evidence_presenter.rb b/app/presenters/call_for_evidence_presenter.rb
@@ -6,7 +6,7 @@ class CallForEvidencePresenter < ContentItemPresenter
   include ContentItem::Political
   include ContentItem::Shareable
   include ContentItem::SinglePageNotificationButton
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def opening_date_time
     content_item["details"]["opening_date"]

diff --git a/app/presenters/case_study_presenter.rb b/app/presenters/case_study_presenter.rb
@@ -1,7 +1,7 @@
 class CaseStudyPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::Metadata
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def image
     content_item["details"]["image"]

diff --git a/app/presenters/consultation_presenter.rb b/app/presenters/consultation_presenter.rb
@@ -6,7 +6,7 @@ class ConsultationPresenter < ContentItemPresenter
   include ContentItem::Political
   include ContentItem::Shareable
   include ContentItem::SinglePageNotificationButton
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def opening_date_time
     content_item["details"]["opening_date"]

diff --git a/app/presenters/contact_presenter.rb b/app/presenters/contact_presenter.rb
@@ -1,10 +1,10 @@
 class ContactPresenter < ContentItemPresenter
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::ContactDetails
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
       t.delete(:context)
     end
   end

diff --git a/...senters/content_item/title_and_context.rb → ...nters/content_item/heading_and_context.rb b/...senters/content_item/title_and_context.rb → ...nters/content_item/heading_and_context.rb
@@ -1,11 +1,13 @@
 module ContentItem
-  module TitleAndContext
-    def title_and_context
+  module HeadingAndContext
+    def heading_and_context
       {
-        title:,
+        text: title,
         context: I18n.t("content_item.schema_name.#{document_type}", count: 1),
         context_locale: view_context.t_locale_fallback("content_item.schema_name.#{document_type}", count: 1),
-        average_title_length: "long",
+        heading_level: 1,
+        margin_bottom: 8,
+        font_size: "l",
       }
     end
   end

diff --git a/app/presenters/content_item_presenter.rb b/app/presenters/content_item_presenter.rb
@@ -118,6 +118,10 @@ def show_default_breadcrumbs?
     true
   end
 
+  def exclude_main_wrapper_class?
+    false
+  end
+
 private
 
   def voting_is_open?

diff --git a/app/presenters/corporate_information_page_presenter.rb b/app/presenters/corporate_information_page_presenter.rb
@@ -1,7 +1,7 @@
 class CorporateInformationPagePresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::ContentsList
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::OrganisationBranding
   include ContentItem::CorporateInformationGroups
 
@@ -11,9 +11,9 @@ def page_title
     page_title
   end
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
       t.delete(:context)
     end
   end

diff --git a/app/presenters/detailed_guide_presenter.rb b/app/presenters/detailed_guide_presenter.rb
@@ -4,10 +4,10 @@ class DetailedGuidePresenter < ContentItemPresenter
   include ContentItem::Metadata
   include ContentItem::NationalApplicability
   include ContentItem::Political
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::SinglePageNotificationButton
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       t[:context] = I18n.t("content_item.schema_name.guidance", count: 1)
     end

diff --git a/app/presenters/document_collection_presenter.rb b/app/presenters/document_collection_presenter.rb
@@ -2,7 +2,7 @@ class DocumentCollectionPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::Metadata
   include ContentItem::Political
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::ContentsList
   include ContentItem::SinglePageNotificationButton
   include DocumentCollection::SignupLink

diff --git a/app/presenters/fatality_notice_presenter.rb b/app/presenters/fatality_notice_presenter.rb
@@ -1,6 +1,6 @@
 class FatalityNoticePresenter < ContentItemPresenter
   include ContentItem::Body
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Metadata
 
   def field_of_operation
@@ -23,7 +23,7 @@ def important_metadata
     end
   end
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       if field_of_operation
         t[:context] = I18n.t("fatality_notice.operations_in", location: field_of_operation.try(:title))

diff --git a/app/presenters/field_of_operation_presenter.rb b/app/presenters/field_of_operation_presenter.rb
@@ -1,13 +1,13 @@
 class FieldOfOperationPresenter < ContentItemPresenter
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   FatalityNotice = Struct.new(:roll_call_introduction, :casualties, :title, :base_path)
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       t[:context] = I18n.t("field_of_operation.context")
-      t[:title] = "#{I18n.t('field_of_operation.title')} #{@content_item['title']}"
-      t.delete(:average_title_length)
+      t[:text] = "#{I18n.t('field_of_operation.title')} #{@content_item['title']}"
+      t[:font_size] = "xl"
     end
   end
 

diff --git a/app/presenters/fields_of_operation_presenter.rb b/app/presenters/fields_of_operation_presenter.rb
@@ -1,14 +1,14 @@
 class FieldsOfOperationPresenter < ContentItemPresenter
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def fields_of_operation
     content_item.dig("links", "fields_of_operation").map { |field| [field["title"], field["base_path"]] }
   end
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       t[:context] = I18n.t("fields_of_operation.context")
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
     end
   end
 end
diff --git a/app/presenters/html_publication_presenter.rb b/app/presenters/html_publication_presenter.rb
@@ -48,6 +48,10 @@ def full_path(request)
     request.base_url + request.path
   end
 
+  def exclude_main_wrapper_class?
+    true
+  end
+
 private
 
   def public_timestamp

diff --git a/app/presenters/news_article_presenter.rb b/app/presenters/news_article_presenter.rb
@@ -4,7 +4,7 @@ class NewsArticlePresenter < ContentItemPresenter
   include ContentItem::Linkable
   include ContentItem::Updatable
   include ContentItem::Shareable
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Metadata
   include ContentItem::NewsImage
 end
diff --git a/app/presenters/specialist_document_presenter.rb b/app/presenters/specialist_document_presenter.rb
@@ -2,12 +2,12 @@ class SpecialistDocumentPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::Updatable
   include ContentItem::Linkable
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Metadata
   include TypographyHelper
   include ContentItem::ContentsList
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
       t.delete(:context)
     end

diff --git a/app/presenters/speech_presenter.rb b/app/presenters/speech_presenter.rb
@@ -3,7 +3,7 @@ class SpeechPresenter < ContentItemPresenter
   include ContentItem::Linkable
   include ContentItem::Political
   include ContentItem::Updatable
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Metadata
   include ContentItem::NewsImage
 

diff --git a/app/presenters/statistical_data_set_presenter.rb b/app/presenters/statistical_data_set_presenter.rb
@@ -1,7 +1,7 @@
 class StatisticalDataSetPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::ContentsList
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include ContentItem::Political
   include ContentItem::Metadata
 end
diff --git a/app/presenters/statistics_announcement_presenter.rb b/app/presenters/statistics_announcement_presenter.rb
@@ -1,7 +1,7 @@
 class StatisticsAnnouncementPresenter < ContentItemPresenter
   include ContentItem::Metadata
   include ContentItem::NationalStatisticsLogo
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
   include StatisticsAnnouncementHelper
 
   FORTHCOMING_NOTICE = I18n.t("statistics_announcement.forthcoming").freeze

diff --git a/app/presenters/topical_event_about_page_presenter.rb b/app/presenters/topical_event_about_page_presenter.rb
@@ -1,11 +1,11 @@
 class TopicalEventAboutPagePresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::ContentsList
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
       t.delete(:context)
     end
   end

diff --git a/app/presenters/working_group_presenter.rb b/app/presenters/working_group_presenter.rb
@@ -1,7 +1,7 @@
 class WorkingGroupPresenter < ContentItemPresenter
   include ContentItem::Body
   include ContentItem::ContentsList
-  include ContentItem::TitleAndContext
+  include ContentItem::HeadingAndContext
 
   def email
     content_item["details"]["email"]
@@ -19,9 +19,9 @@ def policies
     content_item["links"]["policies"]
   end
 
-  def title_and_context
+  def heading_and_context
     super.tap do |t|
-      t.delete(:average_title_length)
+      t[:font_size] = "xl"
       t.delete(:context)
     end
   end

diff --git a/app/presenters/worldwide_corporate_information_page_presenter.rb b/app/presenters/worldwide_corporate_information_page_presenter.rb
@@ -21,6 +21,10 @@ def sponsoring_organisations
     worldwide_organisation&.sponsoring_organisations
   end
 
+  def exclude_main_wrapper_class?
+    true
+  end
+
 private
 
   def show_contents_list?

diff --git a/app/presenters/worldwide_office_presenter.rb b/app/presenters/worldwide_office_presenter.rb
@@ -30,6 +30,10 @@ def sponsoring_organisations
     worldwide_organisation&.sponsoring_organisations
   end
 
+  def exclude_main_wrapper_class?
+    true
+  end
+
 private
 
   def show_contents_list?

diff --git a/app/presenters/worldwide_organisation_presenter.rb b/app/presenters/worldwide_organisation_presenter.rb
@@ -123,6 +123,10 @@ def sponsoring_organisations
     content_item.dig("links", "sponsoring_organisations") || []
   end
 
+  def exclude_main_wrapper_class?
+    true
+  end
+
 private
 
   def office(office, contact)

diff --git a/app/views/content_items/_body_with_related_links.html.erb b/app/views/content_items/_body_with_related_links.html.erb
@@ -2,8 +2,12 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title',
-      title: @content_item.title %>
+    <%= render 'govuk_publishing_components/components/heading',
+      text: @content_item.title,
+      heading_level: 1,
+      font_size: "xl",
+      margin_bottom: 8
+    %>
   </div>
 </div>
 <div class="govuk-grid-row">

diff --git a/app/views/content_items/call_for_evidence.html.erb b/app/views/content_items/call_for_evidence.html.erb
@@ -4,11 +4,11 @@
   ) %>
 <% end %>
 
-<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>
+<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.heading_and_context[:text] } %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
 </div>

diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb
@@ -5,8 +5,8 @@
 <% end %>
 
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds responsive-top-margin">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+  <div class="govuk-grid-column-two-thirds">
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
   <div class="govuk-grid-column-two-thirds">

diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb
@@ -4,11 +4,12 @@
   ) %>
 <% end %>
 
-<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>
+<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.heading_and_context[:text] } %>
+
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
 </div>

diff --git a/app/views/content_items/contact.html.erb b/app/views/content_items/contact.html.erb
@@ -8,7 +8,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
 </div>
 

diff --git a/app/views/content_items/corporate_information_page.html.erb b/app/views/content_items/corporate_information_page.html.erb
@@ -29,7 +29,12 @@
 <div class="<%= @content_item.organisation_brand_class %>">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <%= render 'govuk_publishing_components/components/title', title: @content_item.title %>
+      <%= render 'govuk_publishing_components/components/heading', 
+        text: @content_item.title,
+        heading_level: 1,
+        font_size: "xl",
+        margin_bottom: 8
+      %>
     </div>
     <%= render 'shared/translations' %>
     <div class="govuk-grid-column-two-thirds">

diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb
@@ -4,11 +4,11 @@
   ) %>
 <% end %>
 
-<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>
+<%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.heading_and_context[:text] } %>
 
 <div class="govuk-grid-row gem-print-columns-none">
   <div class="govuk-grid-column-two-thirds">
-    <%= render 'govuk_publishing_components/components/title', @content_item.title_and_context %>
+    <%= render 'govuk_publishing_components/components/heading', @content_item.heading_and_context %>
   </div>
   <%= render 'shared/translations' %>
   <div class="govuk-grid-column-two-thirds">
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,6 +118,10 @@ def show_default_breadcrumbs? @@
         true
       end
+      def exclude_main_wrapper_class?
+        false
+      end
     private
       def voting_is_open?
@@ Expand Down @@