From c821ac57b9efbbce89af6409bdbc928f48028c44 Mon Sep 17 00:00:00 2001
From: Kat <katrina@madetech.com>
Date: Wed, 24 Nov 2021 12:31:24 +0000
Subject: [PATCH] Fix header styling

---
 app/controllers/case_logs_controller.rb    | 6 ++++--
 app/views/case_logs/edit.html.erb          | 2 +-
 app/views/case_logs/index.html.erb         | 2 +-
 app/views/form/_checkbox_question.html.erb | 2 +-
 app/views/form/_date_question.html.erb     | 2 +-
 app/views/form/_numeric_question.html.erb  | 2 +-
 app/views/form/_radio_question.html.erb    | 2 +-
 app/views/form/_select_question.html.erb   | 2 +-
 app/views/form/_text_question.html.erb     | 2 +-
 app/views/form/page.html.erb               | 7 +++++--
 10 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index 0b55c7c1f..48e546236 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -64,7 +64,8 @@ class CaseLogsController < ApplicationController
       redirect_path = form.next_page_redirect_path(page, @case_log)
       redirect_to(send(redirect_path, @case_log))
     else
-      render "form/page", locals: { form: form, page: page }, status: :unprocessable_entity
+      subsection = form.subsection_for_page(page)
+      render "form/page", locals: { form: form, page: page, subsection: subsection.label }, status: :unprocessable_entity
     end
   end
 
@@ -92,7 +93,8 @@ class CaseLogsController < ApplicationController
   form.pages.map do |page|
     define_method(page.id) do |_errors = {}|
       @case_log = CaseLog.find(params[:case_log_id])
-      render "form/page", locals: { form: form, page: page }
+      subsection = form.subsection_for_page(page)
+      render "form/page", locals: { form: form, page: page, subsection: subsection.label }
     end
   end
 
diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb
index 96ad4b5de..c87ce14f0 100644
--- a/app/views/case_logs/edit.html.erb
+++ b/app/views/case_logs/edit.html.erb
@@ -1,7 +1,7 @@
 <%= turbo_frame_tag "case_log_form", target: "_top" do %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
-      <h1 class="govuk-heading-xl">Tasklist for log
+      <h1 class="govuk-heading-l">Tasklist for log
         <%= @case_log.id %></h1>
 
       <h2 class="govuk-heading-s govuk-!-margin-bottom-2">This submission is
diff --git a/app/views/case_logs/index.html.erb b/app/views/case_logs/index.html.erb
index ea3d45436..ef1bc3975 100644
--- a/app/views/case_logs/index.html.erb
+++ b/app/views/case_logs/index.html.erb
@@ -1,6 +1,6 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
-    <h1 class="govuk-heading-xl">Your logs</h1>
+    <h1 class="govuk-heading-l">Your logs</h1>
   </div>
   <div class="govuk-grid-column-two-thirds-from-desktop">
 
diff --git a/app/views/form/_checkbox_question.html.erb b/app/views/form/_checkbox_question.html.erb
index f02e7fb3f..b327e94d2 100644
--- a/app/views/form/_checkbox_question.html.erb
+++ b/app/views/form/_checkbox_question.html.erb
@@ -1,5 +1,5 @@
 <%= f.govuk_check_boxes_fieldset question.id.to_sym,
-    legend: { text: question.header.html_safe, size: "l" },
+    legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" },
     hint: { text: question.hint_text } do %>
 
     <% question.answer_options.map do |key, val| %>
diff --git a/app/views/form/_date_question.html.erb b/app/views/form/_date_question.html.erb
index 032f9a7c5..61eb34b2a 100644
--- a/app/views/form/_date_question.html.erb
+++ b/app/views/form/_date_question.html.erb
@@ -1,6 +1,6 @@
 <%= f.govuk_date_field question.id.to_sym,
     hint: { text: question.hint_text },
-    legend: { text: question.header.html_safe, size: "l"},
+    legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" },
     width: 20,
     **stimulus_html_attributes(question)
 %>
diff --git a/app/views/form/_numeric_question.html.erb b/app/views/form/_numeric_question.html.erb
index ff6237318..5a75c46c8 100644
--- a/app/views/form/_numeric_question.html.erb
+++ b/app/views/form/_numeric_question.html.erb
@@ -1,6 +1,6 @@
 <%= f.govuk_number_field question.id.to_sym,
     hint: { text: question.hint_text },
-    label: { text: question.header.html_safe, size: "l"},
+    label: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" },
     min: question.min, max: question.max, step: question.step,
     width: 20, :readonly => question.read_only?,
    **stimulus_html_attributes(question)
diff --git a/app/views/form/_radio_question.html.erb b/app/views/form/_radio_question.html.erb
index 2c96f5391..a922fc3e0 100644
--- a/app/views/form/_radio_question.html.erb
+++ b/app/views/form/_radio_question.html.erb
@@ -1,5 +1,5 @@
 <%= f.govuk_radio_buttons_fieldset question.id.to_sym,
-    legend: { text: question.header.html_safe, size: "l" },
+    legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" },
     hint: { text: question.hint_text },
     small: (question.answer_options.size > 5) do %>
 
diff --git a/app/views/form/_select_question.html.erb b/app/views/form/_select_question.html.erb
index 4e43a3d84..b6c431286 100644
--- a/app/views/form/_select_question.html.erb
+++ b/app/views/form/_select_question.html.erb
@@ -3,6 +3,6 @@
     answers,
     :name,
     :name,
-    label: { text: question.header},
+    label: { text: question.header, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" },
     hint: { text: question.hint_text }
  %>
diff --git a/app/views/form/_text_question.html.erb b/app/views/form/_text_question.html.erb
index 50e9f6dec..c062b7e62 100644
--- a/app/views/form/_text_question.html.erb
+++ b/app/views/form/_text_question.html.erb
@@ -1,6 +1,6 @@
 <%= f.govuk_text_field question.id.to_sym,
     hint: { text: question.hint_text },
-    label: { text: question.header.html_safe, size: "l"},
+    label: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" },
     width: 20,
     **stimulus_html_attributes(question)
 %>
diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index 3aa77fc77..0eee408e7 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -5,8 +5,11 @@
 <%= turbo_frame_tag "case_log_form", target: "_top" do %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
+      <span class="govuk-caption-l">
+        <%= subsection %>
+      </span>
       <% if page.header.present? %>
-        <h1 class="govuk-heading-xl">
+        <h1 class="govuk-heading-l">
           <%= page.header %>
         </h1>
       <% end %>
@@ -14,7 +17,7 @@
         <%= f.govuk_error_summary %>
         <% page.questions.map do |question| %>
           <div id=<%= question.id + "_div " %><%= display_question_key_div(page, question) %> >
-            <%= render partial: "form/#{question.type}_question", locals: { question: question, f: f } %>
+            <%= render partial: "form/#{question.type}_question", locals: { question: question, page_header: page.header, f: f } %>
           </div>
         <% end %>