Fix error message location

Author: syed87

app/views/assessor_interface/assessment_sections/_english_language_exemption_content.html.erb

@@ -1,5 +1,3 @@
-<%= yield :assessment_section_top_of_form %>
-
 <% if application_form.english_language_citizenship_exempt %>
   <h2 class="govuk-heading-m">English language exemption by birth/citizenship</h2>
   <p class="govuk-body">

app/views/assessor_interface/assessment_sections/_form.html.erb

@@ -1,7 +1,5 @@
 <%= form_with model: form, url: [:assessor_interface, view_object.application_form, view_object.assessment, @view_object.assessment_section], method: :put do |f| %>
-  <%= f.govuk_error_summary %>
-  
-  <%= yield :assessment_section_top_of_form %>
+  <% content_for(:error_summary) { f.govuk_error_summary } %>
 
   <% if view_object.show_english_language_exemption_checkbox? %>
     <% if view_object.assessment_section.personal_information? %>

app/views/assessor_interface/assessment_sections/show.html.erb

@@ -5,31 +5,28 @@
 
 <% content_for :page_title, title_with_error_prefix(t(".title.#{preliminary_key}.#{section_key}"), error: @form.errors.any?) %>
 <% content_for :back_link_url, assessor_interface_application_form_path(@application_form) %>
-<% content_for(:assessment_section_top_of_form) do %>
-  <%= render "linked_application_forms",
-            application_forms_contact_email_used_as_teacher: @view_object.work_history_application_forms_contact_email_used_as_teacher,
-            application_forms_contact_email_used_as_reference: @view_object.work_history_application_forms_contact_email_used_as_reference %>
 
-  <%= render "shared/assessor_header",
+<%= render "linked_application_forms",
+          application_forms_contact_email_used_as_teacher: @view_object.work_history_application_forms_contact_email_used_as_teacher,
+          application_forms_contact_email_used_as_reference: @view_object.work_history_application_forms_contact_email_used_as_reference %>
+
+<%= render "shared/assessor_header",
             title: t(".title.#{preliminary_key}.#{section_key}"),
             application_form: @view_object.application_form %>
 
-  <% if @view_object.show_teacher_name_and_date_of_birth? %>
-    <h2 class="govuk-heading-m"><%= @view_object.teacher_name_and_date_of_birth %></h2>
-  <% end %>
+<% if @view_object.show_teacher_name_and_date_of_birth? %>
+  <h2 class="govuk-heading-m"><%= @view_object.teacher_name_and_date_of_birth %></h2>
+<% end %>
 
-  <%= render "#{section_key}_summary",
+<%= render "#{section_key}_summary",
             region: @view_object.region,
             application_form: @view_object.application_form,
             assessment: @view_object.assessment,
             assessment_section: @view_object.assessment_section,
             highlighted_work_history_contact_emails: @view_object.highlighted_work_history_contact_emails %>
-<% end %>
 
 <% if @view_object.show_form? %>
   <%= render "form", form: @form, view_object: @view_object %>
-<% elsif @view_object.show_english_language_exemption_content? %>
+<% else @view_object.show_english_language_exemption_content? %>
   <%= render "english_language_exemption_content", application_form: @view_object.application_form %>
-<% else %>
-  <%= yield :assessment_section_top_of_form %>
 <% end %>

app/views/layouts/application.html.erb

@@ -26,7 +26,7 @@
     <% end %>
 
     <%= govuk_skip_link %>
-
+    
     <%= render partial: "shared/header" %>
 
     <div class="govuk-width-container">
@@ -49,6 +49,7 @@
 
     <div class="govuk-width-container">
       <%= govuk_back_link(href: yield(:back_link_url)) unless yield(:back_link_url).blank? %>
+      <%= yield(:error_summary) %>
       <main class="govuk-main-wrapper" id="main-content" role="main">
         <%= render(FlashMessage::Component.new(flash: flash)) %>
         <%= content_for?(:content) ? yield(:content) : yield %>