Use full layout for failures

DFE-Digital · Oct 8, 2024 · 307e9c7 · 307e9c7
1 parent 1332ecd
commit 307e9c7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/app/controllers/migration/failures_controller.rb b/app/controllers/migration/failures_controller.rb
@@ -1,5 +1,5 @@
 class Migration::FailuresController < ::AdminController
-  layout "migration"
+  layout "full"
 
   def index
     @migration_failures = MigrationFailure.where(data_migration_id: DataMigration.where(model: params[:model]).select(:id))

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -10,14 +10,14 @@ def page_data(title:, header: nil, header_size: "l", error: false, backlink_href
 
     return { page_title: } if header == false
 
-    backlink = govuk_back_link(href: backlink_href) unless backlink_href.nil?
+    backlink_or_breadcrumb = govuk_back_link(href: backlink_href) unless backlink_href.nil?
 
-    content_for(:backlink) { backlink }
+    content_for(:backlink_or_breadcrumb) { backlink_or_breadcrumb }
 
     page_header = tag.h1(header || title, class: "govuk-heading-#{header_size}")
 
     content_for(:page_header) { page_header }
 
-    { page_title:, backlink:, page_header: }
+    { page_title:, backlink_or_breadcrumb:, page_header: }
   end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -13,6 +13,7 @@
 
     <div class="govuk-width-container">
       <%= environment_specific_phase_banner %>
+      <%= yield(:backlink_or_breadcrumb) %>
 
       <main class="govuk-main-wrapper" id="main-content" role="main">
         <div class="govuk-grid-row">

diff --git a/app/views/layouts/migration.html.erb → app/views/layouts/full.html.erb b/app/views/layouts/migration.html.erb → app/views/layouts/full.html.erb
@@ -13,17 +13,16 @@
 
     <div class="govuk-width-container">
       <%= environment_specific_phase_banner %>
+      <%= yield(:backlink_or_breadcrumb) %>
 
       <main class="govuk-main-wrapper" id="main-content" role="main">
         <div class="govuk-grid-row">
-          <div class="govuk-grid-column-full">
-            <%= yield(:backlink) %>
-
+          <div class="govuk-grid-column-two-thirds">
             <%= yield(:page_header) %>
-
-            <%= yield %>
           </div>
         </div>
+
+        <%= yield %>
       </main>
     </div>