diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb index e6dcec8cf..d4df3fc04 100644 --- a/app/controllers/root_controller.rb +++ b/app/controllers/root_controller.rb @@ -22,16 +22,12 @@ class RootController < ApplicationController 502 503 504 - chromeless gem_layout gem_layout_account_manager - gem_layout_explore_header gem_layout_full_width - gem_layout_full_width_explore_header gem_layout_full_width_no_footer_navigation gem_layout_homepage gem_layout_homepage_new - gem_layout_no_emergency_banner gem_layout_no_feedback_form gem_layout_no_footer_navigation scheduled_maintenance diff --git a/app/views/root/_gem_base.html.erb b/app/views/root/_gem_base.html.erb index d3b6de2a2..db3851382 100644 --- a/app/views/root/_gem_base.html.erb +++ b/app/views/root/_gem_base.html.erb @@ -1,7 +1,6 @@ <% logo_link ||= Plek.new.website_root.present? ? Plek.new.website_root : "https://www.gov.uk/" full_width ||= false - omit_emergency_banner ||= false omit_feedback_form ||= nil omit_footer_navigation ||= nil omit_footer_border ||= nil @@ -19,7 +18,7 @@ homepage ||= false homepage_blue_navbar ||= false - @emergency_banner = !omit_emergency_banner && emergency_banner_notification + @emergency_banner = emergency_banner_notification if @emergency_banner emergency_banner = render "govuk_publishing_components/components/emergency_banner", { diff --git a/app/views/root/chromeless.html.erb b/app/views/root/chromeless.html.erb deleted file mode 100644 index 79534716a..000000000 --- a/app/views/root/chromeless.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= render partial: "gem_base" %> diff --git a/app/views/root/gem_layout_explore_header.html.erb b/app/views/root/gem_layout_explore_header.html.erb deleted file mode 100644 index 79534716a..000000000 --- a/app/views/root/gem_layout_explore_header.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= render partial: "gem_base" %> diff --git a/app/views/root/gem_layout_full_width_explore_header.html.erb b/app/views/root/gem_layout_full_width_explore_header.html.erb deleted file mode 100644 index 015061d10..000000000 --- a/app/views/root/gem_layout_full_width_explore_header.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= render partial: 'gem_base', locals: { full_width: true } %> diff --git a/app/views/root/gem_layout_no_emergency_banner.html.erb b/app/views/root/gem_layout_no_emergency_banner.html.erb deleted file mode 100644 index 6a4c0f8c2..000000000 --- a/app/views/root/gem_layout_no_emergency_banner.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<%= render partial: "gem_base", - locals: { - omit_emergency_banner: true - } -%> diff --git a/test/integration/templates_test.rb b/test/integration/templates_test.rb index d40a77607..d0dadb1ac 100644 --- a/test/integration/templates_test.rb +++ b/test/integration/templates_test.rb @@ -3,7 +3,7 @@ class TemplatesTest < ActionDispatch::IntegrationTest context "fetching templates" do should "be 200 for templates that exist" do - %w[404 406 500 chromeless gem_layout scheduled_maintenance].each do |template| + %w[404 406 500 gem_layout scheduled_maintenance].each do |template| get "/templates/#{template}.html.erb" assert_equal 200, last_response.status end