Skip to content

Commit

Permalink
[653] Update review page titles and h1's
Browse files Browse the repository at this point in the history
To reflect the fact that you are reviewing your answers
  • Loading branch information
avinhurry committed Feb 25, 2025
1 parent c510171 commit c314921
Show file tree
Hide file tree
Showing 15 changed files with 51 additions and 27 deletions.
4 changes: 3 additions & 1 deletion app/helpers/other_qualifications_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module OtherQualificationsHelper
def other_qualifications_title(application_form)
if application_form.international_applicant?
if params[:controller] == 'candidate_interface/other_qualifications/review'
I18n.t('page_titles.other_qualifications_review')
elsif application_form.international_applicant?
I18n.t('page_titles.other_qualifications_international')
else
I18n.t('page_titles.other_qualifications')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<% content_for(
:title,
title_with_error_prefix(t('page_titles.contact_information'), @contact_details_form&.errors&.any?),
title_with_error_prefix(t('page_titles.contact_information_review'), @contact_details_form&.errors&.any?),
) %>
<% content_for :before_content, govuk_back_link_to(application_form_path) %>

<%= form_with model: @section_complete_form, url: candidate_interface_contact_information_complete_path, method: :patch do |f| %>
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl">
<%= t('page_titles.contact_information') %>
<%= t('page_titles.contact_information_review') %>
</h1>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
Expand Down
5 changes: 3 additions & 2 deletions app/views/candidate_interface/degrees/review/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<% content_for :title, t('page_titles.degree') %>
<% content_for :title, t('page_titles.degree_review', count: @application_form.application_qualifications.degrees.size) %>
<% content_for :before_content, govuk_back_link_to(application_form_path) %>

<%= form_with model: @section_complete_form, url: candidate_interface_degree_complete_path, method: :patch do |f| %>
<%= f.govuk_error_summary %>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">

<h1 class="govuk-heading-xl">
<%= t('page_titles.degree') %>
<%= t('page_titles.degree_review', count: @application_form.application_qualifications.degrees.size) %>
</h1>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application: @application_form) %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% content_for :title, 'Check your answers' %>
<% content_for :title, 'Check your answers to equality and diversity questions' %>
<% content_for :before_content, govuk_back_link_to(application_form_path) %>

<div class="govuk-grid-row">
Expand All @@ -8,7 +8,7 @@

<h1 class="govuk-heading-xl">
<span class="govuk-caption-xl"><%= t('equality_and_diversity.title') %></span>
Check your answers
Check your answers to equality and diversity questions
</h1>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/candidate_interface/gcse/review/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<% content_for :title, t("gcse_summary.page_titles.#{@subject}") %>
<% content_for :title, t("gcse_summary.page_titles.review.#{@subject}") %>
<% content_for(:before_content, govuk_back_link_to(application_form_path)) %>

<%= form_with model: @section_complete_form, url: candidate_interface_gcse_complete_path, method: :patch do |f| %>
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl"><%= t("gcse_summary.page_titles.#{@subject}") %></h1>
<h1 class="govuk-heading-xl"><%= t("gcse_summary.page_titles.review.#{@subject}") %></h1>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl">
<%= t('page_titles.interview_preferences.heading') %>
<%= t('page_titles.interview_preferences.review') %>
</h1>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl">
<%= t('page_titles.personal_information.heading') %>
<%= t('page_titles.personal_information.review') %>
</h1>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<% content_for :title, t('page_titles.becoming_a_teacher') %>
<% content_for :title, t('page_titles.personal_statement_review') %>
<% content_for :before_content, govuk_back_link_to(application_form_path) %>

<%= form_with model: @section_complete_form, url: candidate_interface_becoming_a_teacher_complete_path, method: :patch do |f| %>
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl">
<%= t('page_titles.personal_statement') %>
<%= t('page_titles.personal_statement_review') %>
</h1>

<% if @application_form.review_pending?(:becoming_a_teacher) %>
Expand Down
12 changes: 8 additions & 4 deletions app/views/candidate_interface/references/review/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
<% content_for :title, title_with_error_prefix(t('page_titles.references'), @section_complete_form.errors.any?) %>
<% content_for :title, title_with_error_prefix(t(@references.any? ? 'page_titles.references_review' : 'page_titles.references'), @section_complete_form.errors.any?) %>

<% content_for :before_content, govuk_back_link_to(application_form_path) %>

<%= form_with model: @section_complete_form, url: candidate_interface_references_complete_path, method: :patch do |f| %>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<%= f.govuk_error_summary %>
<h1 class="govuk-heading-l">
<%= t('page_titles.references') %>
</h1>

<% if @references.any? %>
<h1 class="govuk-heading-l"><%= t('page_titles.references_review') %></h1>
<% else %>
<h1 class="govuk-heading-l"><%= t('page_titles.references') %></h1>
<% end %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
<%= form_with model: @section_complete_form, url: candidate_interface_restructured_work_history_complete_path(@return_to[:params]), method: :patch do |f| %>
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl"><%= t('page_titles.work_history') %></h1>
<% if @application_form.application_work_experiences.blank? %>
<h1 class="govuk-heading-xl"><%= t('page_titles.work_history') %></h1>
<% else %>
<h1 class="govuk-heading-xl"><%= t('page_titles.restructured_work_history_review') %></h1>
<% end %>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

Expand Down
4 changes: 2 additions & 2 deletions app/views/candidate_interface/safeguarding/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<% content_for :title, t('page_titles.suitability_to_work_with_children') %>
<% content_for :title, t('page_titles.suitability_to_work_with_children_review') %>
<% content_for :before_content, govuk_back_link_to(application_form_path) %>

<%= form_with model: @section_complete_form, url: candidate_interface_complete_safeguarding_path, method: :post do |f| %>
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl">
<%= t('page_titles.suitability_to_work_with_children') %>
<%= t('page_titles.suitability_to_work_with_children_review') %>
</h1>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<% content_for :title, t('page_titles.training_with_a_disability') %>
<% content_for :title, t('page_titles.training_with_a_disability_review') %>
<% content_for :before_content, govuk_back_link_to(application_form_path) %>

<%= form_with model: @section_complete_form, url: candidate_interface_training_with_a_disability_complete_path, method: :patch do |f| %>
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl">
<%= t('page_titles.training_with_a_disability') %>
<%= t('page_titles.training_with_a_disability_review') %>
</h1>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<% content_for :title, t('page_titles.volunteering.short') %>
<% content_for :title, t('page_titles.volunteering.review') %>
<% content_for :before_content, govuk_back_link_to(application_form_path) %>

<%= form_with model: @section_complete_form, url: candidate_interface_complete_volunteering_path, method: :patch do |f| %>
<%= f.govuk_error_summary %>

<h1 class="govuk-heading-xl"><%= t('page_titles.volunteering.short') %></h1>
<h1 class="govuk-heading-xl"><%= t('page_titles.volunteering.review') %></h1>

<%= render CandidateInterface::EditableSectionWarning.new(section_policy: @section_policy, current_application:) %>

Expand Down
4 changes: 4 additions & 0 deletions config/locales/candidate_interface/gcse_details.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ en:
enic_cost: A statement from UK ENIC costs £49.50 and takes 15 working days to arrive.
gcse_summary:
page_titles:
review:
maths: Check your maths GCSE or equivalent
english: Check your English GCSE or equivalent
science: Check your science GCSE or equivalent
maths: Maths GCSE or equivalent
english: English GCSE or equivalent
science: Science GCSE or equivalent
Expand Down
15 changes: 12 additions & 3 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ en:
efl:
ielts: Your IELTS result
other: Your English language assessment result
review: English as a foreign language
review: Check your English as a foreign language assessment
start: English as a foreign language assessment
toefl: Your TOEFL result
type: What English language assessment did you do?
Expand Down Expand Up @@ -172,6 +172,7 @@ en:
roadmap: Changes to services for teacher training providers and candidates
candidate_complaints: Make a complaint or give feedback
contact_information: Contact information
contact_information_review: Check your contact information
contact_details: Contact details
where_do_you_live: Where do you live?
address: What is your address?
Expand All @@ -183,6 +184,9 @@ en:
confirm: Confirm conditions
check: Check conditions
degree: Degree
degree_review:
one: "Check your degree"
other: "Check your degrees"
degree_country: Which country was the degree from?
degree_completion_status: Have you completed your degree?
degree_grade: What grade is your degree?
Expand Down Expand Up @@ -221,24 +225,29 @@ en:
edit_degree_type: Edit degree type
other_qualifications: A levels and other qualifications
other_qualifications_international: Other qualifications
other_qualifications_review: Check your other qualifications
qualification_details: Qualification details
edit_other_qualification: Edit qualification
destroy_other_qualification: Are you sure you want to delete this qualification?
personal_statement: Personal statement
personal_statement_review: Check your personal statement
becoming_a_teacher: Why you want to teach
interview_preferences:
heading: Interview availability
edit: Edit your interview availability
review: Check your interview availability
review: Check your answers to interview availability
training_with_a_disability: Ask for support if you are disabled
training_with_a_disability_review: Check your answers to asking for support if you are disabled
suitability_to_work_with_children: Declare any safeguarding issues
suitability_to_work_with_children_review: Check your safeguarding declaration
thank_you: Thank you for your feedback
english_gcse: English GCSE or equivalent
maths_gcse: Maths GCSE or equivalent
science_gcse: Science GCSE or equivalent
volunteering:
short: Unpaid experience
long: Unpaid experience working with children and other volunteering
review: Check your unpaid experience
add_volunteering_role: Add role
edit_volunteering_role: Edit role
destroy_volunteering_role: Are you sure you want to delete this role?
Expand Down Expand Up @@ -266,7 +275,7 @@ en:
references_request_reference_review: Check your answers before sending your request
references_select: Which 2 references do you want to include in your application?
references_request: Add your references
references_review: Review your references
references_review: Check your references
references_selection: Select 2 references
find_feedback: Help us improve this service
referee:
Expand Down

0 comments on commit c314921

Please sign in to comment.