From 8d4155abb5d3a614219d3c4e73e9aafc2a5a6948 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Thu, 17 Oct 2024 13:18:02 +0100 Subject: [PATCH] align FE page titles with h1s --- app/views/claims/_account_details.html.erb | 30 ------------------ app/views/claims/existing_session.html.erb | 8 +++++ .../claims/personal_bank_account.html.erb | 31 ++++++++++++++++++- ...urther_education_provision_search.html.erb | 4 +-- .../hours_teaching_eligible_subjects.html.erb | 2 ++ .../claims/teacher_reference_number.html.erb | 4 +-- .../claims/teaching_responsibilities.html.erb | 4 +-- .../landing_page.html.erb | 2 ++ config/locales/en.yml | 3 ++ 9 files changed, 51 insertions(+), 37 deletions(-) delete mode 100644 app/views/claims/_account_details.html.erb diff --git a/app/views/claims/_account_details.html.erb b/app/views/claims/_account_details.html.erb deleted file mode 100644 index 9bfaf4a70c..0000000000 --- a/app/views/claims/_account_details.html.erb +++ /dev/null @@ -1,30 +0,0 @@ -<%= form_for @form, url: claim_path(current_journey_routing_name), builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %> - <%= f.govuk_error_summary %> - - <%= f.govuk_fieldset legend: { - text: t("questions.account_details"), - tag: "h1", - size: "l" - } do %> - <%= f.govuk_text_field :banking_name, - spellcheck: "false", - label: { text: "Name on your account" }, - hint: { text: t("questions.account_hint") } %> - - <%= f.govuk_text_field :bank_sort_code, - width: "one-quarter", - autocomplete: "off", - label: { text: "Sort code" }, - hint: { text: "For example: 309430" } %> - - <%= f.govuk_text_field :bank_account_number, - width: 20, - autocomplete: "off", - label: { text: "Account number" }, - hint: { text: "For example: 00733445" } %> - <% end %> - - <%= govuk_warning_text(text: t("questions.check_your_account_details")) %> - - <%= f.govuk_submit "Continue" %> -<% end %> diff --git a/app/views/claims/existing_session.html.erb b/app/views/claims/existing_session.html.erb index 704b12c5be..18f7cc7af6 100644 --- a/app/views/claims/existing_session.html.erb +++ b/app/views/claims/existing_session.html.erb @@ -1,3 +1,11 @@ +<% content_for( + :page_title, + page_title( + "You have already started an eligibility check", + journey: current_journey_routing_name + ) +) %> +
diff --git a/app/views/claims/personal_bank_account.html.erb b/app/views/claims/personal_bank_account.html.erb index 4076d7b6bf..ba81d34ee1 100644 --- a/app/views/claims/personal_bank_account.html.erb +++ b/app/views/claims/personal_bank_account.html.erb @@ -2,6 +2,35 @@
- <%= render partial: "account_details", locals: { current_journey_routing_name: current_journey_routing_name} %> + <%= form_for @form, url: claim_path(current_journey_routing_name), builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %> + <%= f.govuk_error_summary %> + + <%= f.govuk_fieldset legend: { + text: t("questions.account_details"), + tag: "h1", + size: "l" + } do %> + <%= f.govuk_text_field :banking_name, + spellcheck: "false", + label: { text: "Name on your account" }, + hint: { text: t("questions.account_hint") } %> + + <%= f.govuk_text_field :bank_sort_code, + width: "one-quarter", + autocomplete: "off", + label: { text: "Sort code" }, + hint: { text: "For example: 309430" } %> + + <%= f.govuk_text_field :bank_account_number, + width: 20, + autocomplete: "off", + label: { text: "Account number" }, + hint: { text: "For example: 00733445" } %> + <% end %> + + <%= govuk_warning_text(text: t("questions.check_your_account_details")) %> + + <%= f.govuk_submit "Continue" %> + <% end %>
diff --git a/app/views/further_education_payments/claims/further_education_provision_search.html.erb b/app/views/further_education_payments/claims/further_education_provision_search.html.erb index fb012ac24d..c37f880883 100644 --- a/app/views/further_education_payments/claims/further_education_provision_search.html.erb +++ b/app/views/further_education_payments/claims/further_education_provision_search.html.erb @@ -1,4 +1,4 @@ -<% content_for(:page_title, page_title(@form.t(:question), journey: current_journey_routing_name, show_error: @form.errors.any?)) %> +<% content_for(:page_title, page_title(@form.t(:heading), journey: current_journey_routing_name, show_error: @form.errors.any?)) %>
@@ -14,7 +14,7 @@ <%= f.hidden_field :possible_school_id %>

- An eligible further education (FE) provider in England must employ you as a teacher + <%= @form.t(:heading) %>

diff --git a/app/views/further_education_payments/claims/hours_teaching_eligible_subjects.html.erb b/app/views/further_education_payments/claims/hours_teaching_eligible_subjects.html.erb index 86eb945dc8..e3d9762061 100644 --- a/app/views/further_education_payments/claims/hours_teaching_eligible_subjects.html.erb +++ b/app/views/further_education_payments/claims/hours_teaching_eligible_subjects.html.erb @@ -1,3 +1,5 @@ +<% content_for(:page_title, page_title(@form.t(:question), journey: current_journey_routing_name, show_error: @form.errors.any?)) %> +

<%= form_with model: @form, url: claim_path(current_journey_routing_name), method: :patch, builder: GOVUKDesignSystemFormBuilder::FormBuilder, html: { novalidate: false } do |f| %> diff --git a/app/views/further_education_payments/claims/teacher_reference_number.html.erb b/app/views/further_education_payments/claims/teacher_reference_number.html.erb index 5989b7e06d..dd4d3ca440 100644 --- a/app/views/further_education_payments/claims/teacher_reference_number.html.erb +++ b/app/views/further_education_payments/claims/teacher_reference_number.html.erb @@ -1,7 +1,7 @@ <% content_for( :page_title, page_title( - @form.t("questions.teacher_reference_number"), + @form.t("heading"), journey: current_journey_routing_name, show_error: @form.errors.any?) ) %> @@ -12,7 +12,7 @@ <%= f.govuk_error_summary %>

- Teacher reference number (TRN) + <%= @form.t(:heading) %>

diff --git a/app/views/further_education_payments/claims/teaching_responsibilities.html.erb b/app/views/further_education_payments/claims/teaching_responsibilities.html.erb index ecfa6139eb..34e9ef623e 100644 --- a/app/views/further_education_payments/claims/teaching_responsibilities.html.erb +++ b/app/views/further_education_payments/claims/teaching_responsibilities.html.erb @@ -1,4 +1,4 @@ -<% content_for(:page_title, page_title(@form.t(:question), journey: current_journey_routing_name, show_error: @form.errors.any?)) %> +<% content_for(:page_title, page_title(@form.t(:heading), journey: current_journey_routing_name, show_error: @form.errors.any?)) %> <% @backlink_path = landing_page_path %> @@ -8,7 +8,7 @@ <%= f.govuk_error_summary %>

- To apply for a targeted retention incentive payment, you must be employed as a member of staff with teaching responsibilities + <%= @form.t(:heading) %>

diff --git a/app/views/further_education_payments/landing_page.html.erb b/app/views/further_education_payments/landing_page.html.erb index 87088b7793..4542ab26c6 100644 --- a/app/views/further_education_payments/landing_page.html.erb +++ b/app/views/further_education_payments/landing_page.html.erb @@ -1,3 +1,5 @@ +<% content_for(:page_title, page_title(t("further_education_payments.landing_page"), journey: current_journey_routing_name)) %> +

<%= t("further_education_payments.landing_page") %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index dc729a862d..d75c51521a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -968,10 +968,12 @@ en: subject: heading: You are not eligible teaching_responsibilities: + heading: To apply for a targeted retention incentive payment, you must be employed as a member of staff with teaching responsibilities question: Are you a member of staff with teaching responsibilities? errors: inclusion: Select yes if you are a member of staff with teaching responsibilities further_education_provision_search: + heading: An eligible further education (FE) provider in England must employ you as a teacher question: Which FE provider are you employed by? errors: blank: Enter the name of the FE provider you are employed by @@ -1199,6 +1201,7 @@ en: inclusion: Select yes if you spend at least half of your timetabled teaching hours teaching these eligible courses teacher_reference_number: + heading: Teacher reference number (TRN) questions: teacher_reference_number: "What is your TRN? (optional)" personal_details: *reminders_personal_details