alphagov · KludgeKML · Feb 4, 2025 · Feb 10, 2025 · Feb 10, 2025 · Feb 10, 2025
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,6 @@ gem "plek"
 gem "rack-utf8_sanitizer"
 gem "rails-i18n"
 gem "rails_translation_manager"
-gem "slimmer"
 gem "sprockets-rails"
 gem "terser"
 gem "uk_postcode"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -697,13 +697,6 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    slimmer (18.7.0)
-      json
-      nokogiri (~> 1.7)
-      null_logger
-      plek (>= 1.1.0)
-      rack (>= 3.0)
-      rest-client
     smart_properties (1.17.0)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
@@ -789,7 +782,6 @@ DEPENDENCIES
   rspec-rails
   rubocop-govuk
   simplecov
-  slimmer
   sprockets-rails
   terser
   timecop

diff --git a/app/assets/javascripts/dependencies.js b/app/assets/javascripts/dependencies.js
@@ -1,9 +1,12 @@
 // This file contains the dependencies required by the application.
+//= require govuk_publishing_components/dependencies
 //= require govuk_publishing_components/lib
 //= require govuk_publishing_components/components/error-summary
+//= require govuk_publishing_components/components/feedback
 //= require govuk_publishing_components/components/govspeak
 //= require govuk_publishing_components/components/image-card
 //= require govuk_publishing_components/components/intervention
+//= require govuk_publishing_components/components/layout-super-navigation-header
 //= require govuk_publishing_components/components/metadata
 //= require govuk_publishing_components/components/print-link
 //= require govuk_publishing_components/components/radio

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -4,6 +4,7 @@
 $govuk-include-default-font-face: false;
 
 @import "govuk_publishing_components/govuk_frontend_support";
+@import "govuk_publishing_components/component_support";
 
 // Helper stylesheets (things on more than one page layout)
 @import "helpers/truncated-url";

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,8 +1,4 @@
 class ApplicationController < ActionController::Base
-  include Slimmer::Headers
-  include Slimmer::Template
-  slimmer_template "gem_layout"
-
   before_action do
     I18n.locale = I18n.default_locale
   end

diff --git a/app/controllers/homepage_controller.rb b/app/controllers/homepage_controller.rb
@@ -1,9 +1,7 @@
 class HomepageController < ContentItemsController
   include Cacheable
 
-  slimmer_template "gem_layout_homepage"
+  layout "homepage"
 
-  def index
-    set_slimmer_headers(template: "gem_layout_homepage_new")
-  end
+  def index;  end
 end
diff --git a/app/controllers/landing_page_controller.rb b/app/controllers/landing_page_controller.rb
@@ -1,7 +1,6 @@
 class LandingPageController < ContentItemsController
-  slimmer_template "gem_layout_full_width"
 
-private
+  private
 
   # SCAFFOLDING: can be removed when basic content items are available
   # from content-store

diff --git a/app/controllers/travel_advice_controller.rb b/app/controllers/travel_advice_controller.rb
@@ -8,7 +8,6 @@ def index
 
     respond_to do |format|
       format.html do
-        slimmer_template "gem_layout"
       end
       format.atom do
         set_expiry(5.minutes)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,66 +1,45 @@
 <% content_for :body do %>
-  <% if @is_account && local_assigns %>
-    <main id="content">
+  <% if content_item&.phase == "beta" %>
+    <%= render "govuk_publishing_components/components/phase_banner", phase: "beta" %>
+  <% end %>
+  <% unless !(content_item || @calendar) || remove_breadcrumbs(content_item) %>
+    <%= render "govuk_publishing_components/components/contextual_breadcrumbs", content_item: content_item.to_h %>
+  <% end %>
+  <%= render "govuk_web_banners/recruitment_banner" %>
+  <% if local_assigns %>
+    <%= yield :before_content %>
+    <main role="main" id="content" class="govuk-main-wrapper <%= yield :main_classes %>" <%= lang_attribute %>>
       <%= yield %>
     </main>
-  <% else %>
-    <% if content_item&.phase == "beta" %>
-      <%= render "govuk_publishing_components/components/phase_banner", phase: "beta" %>
-    <% end %>
-    <% unless current_page?(root_path) || !(content_item || @calendar) || remove_breadcrumbs(content_item) %>
-      <%= render "govuk_publishing_components/components/contextual_breadcrumbs", content_item: content_item.to_h %>
-    <% end %>
-    <%= render "govuk_web_banners/recruitment_banner" %>
-    <% if local_assigns %>
-      <%= yield :before_content %>
-      <main role="main" id="content" class="govuk-main-wrapper <%= yield :main_classes %>" <%= lang_attribute %>>
-        <%= yield %>
-      </main>
-      <%= yield :after_content %>
-    <% end %>
+    <%= yield :after_content %>
   <% end %>
 <% end %>
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title><%=
-      page_title = yield :title
-      if page_title.present?
-        page_title
-      elsif content_item
-        page_title(content_item)
-      else
-        "GOV.UK"
-      end
-           %></title>
-    <%= yield :extra_stylesheets %>
-
-    <link title="Search" rel="search" type="application/opensearchdescription+xml" href="/search/opensearch.xml">
 
-    <%= stylesheet_link_tag "application.css", :media => "all", integrity: false %>
+<%
+  title = yield(:title)
+  title = if title.present?
+            title
+          elsif content_item
+            page_title(content_item)
+          else
+            "GOV.UK"
+          end
+%>
 
-    <%=
-      render_component_stylesheets
-    %>
-
-    <%= javascript_include_tag "test-dependencies.js", type: "module" if Rails.env.test? %>
-    <%= javascript_include_tag "application.js", integrity: false, type: "module" %>
+<%= content_for :head do %>
+  <link title="Search" rel="search" type="application/opensearchdescription+xml" href="/search/opensearch.xml">
+  <%= render_component_stylesheets %>
+<% end %>
 
-    <%= yield :extra_javascript %>
-    <%= yield :extra_headers %>
-    <% if content_item.to_h %>
-      <%= render "govuk_publishing_components/components/meta_tags", content_item: content_item.to_h %>
-      <%# TODO: use content_item.meta_content %>
-      <% if content_item&.meta_section.present? %>
-        <meta name="govuk:section" content="<%= content_item.meta_section %>">
-      <% end %>
-    <% end %>
-  </head>
+<%= render "govuk_publishing_components/components/layout_for_public", {
+      title:,
+      show_explore_header: true,
+      # emergency_banner: render("govuk_web_banners/emergency_banner"),
+      global_banner: render("govuk_web_banners/global_banner"),
+  } do %>
+  <div class="govuk-width-container">
+    <%= yield :body %>
+  </div>
+  <%= javascript_include_tag 'application', type: "module" %>
+<% end %>
 
-  <body class="mainstream <%= yield :body_classes %>">
-    <div id="wrapper" class="<%= wrapper_class(content_item) %> direction-<%= page_text_direction %>">
-      <%= yield :body %>
-    </div>
-  </body>
-</html>
diff --git a/app/views/layouts/homepage.html.erb b/app/views/layouts/homepage.html.erb
@@ -0,0 +1,41 @@
+<% content_for :body do %>
+  <%= yield :before_content %>
+  <main role="main" id="content" class="govuk-main-wrapper <%= yield :main_classes %>" <%= lang_attribute %>>
+    <%= yield %>
+  </main>
+  <%= yield :after_content %>
+<% end %>
+
+<%
+  title = yield(:title)
+  title = if title.present?
+            title
+          elsif content_item
+            page_title(content_item)
+          else
+            "GOV.UK"
+          end
+%>
+
+<%= content_for :head do %>
+  <link title="Search" rel="search" type="application/opensearchdescription+xml" href="/search/opensearch.xml">
+  <% add_gem_component_stylesheet("layout-for-public") %>
+  <% add_gem_component_stylesheet("layout-super-navigation-header") %>
+  <% add_gem_component_stylesheet("layout-header") %>
+  <% add_gem_component_stylesheet("layout-footer") %>
+  <%= render_component_stylesheets %>
+<% end %>
+
+<%= render "govuk_publishing_components/components/layout_for_public", {
+      title:,
+	    full_width: true,
+	    homepage: true,
+      show_explore_header: true,
+      # emergency_banner: render("govuk_web_banners/emergency_banner"),
+      global_banner: render("govuk_web_banners/global_banner"),
+      logo_link: Plek.new.website_root.present? ? Plek.new.website_root : "https://www.gov.uk/",
+  } do %>
+  <%= yield :body %>
+  <%= javascript_include_tag 'application', type: "module" %>
+<% end %>
+
diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb
@@ -1,5 +1,6 @@
 if defined?(GovukPublishingComponents)
   GovukPublishingComponents.configure do |c|
     c.component_guide_title = "Frontend Component Guide"
+    c.exclude_css_from_static = false
   end
 end
diff --git a/config/initializers/govuk_web_banners.rb b/config/initializers/govuk_web_banners.rb
@@ -0,0 +1,4 @@
+Rails.application.config.emergency_banner_redis_client = Redis.new(
+  url: ENV["EMERGENCY_BANNER_REDIS_URL"],
+  reconnect_attempts: [15, 30, 45, 60],
+)
diff --git a/config/initializers/slimmer.rb b/config/initializers/slimmer.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -8,7 +8,6 @@
 require File.expand_path("../config/environment", __dir__)
 require "rspec/rails"
 require "capybara/rails"
-require "slimmer/rspec"
 require "timecop"
 require "webmock/rspec"
 WebMock.disable_net_connect!(allow_localhost: true)

diff --git a/spec/system/travel_advice_spec.rb b/spec/system/travel_advice_spec.rb
@@ -52,12 +52,6 @@
       expect(page.title).to eq("Foreign travel advice - GOV.UK")
     end
 
-    it "sets the slimmer #wrapper classes" do
-      visit "/foreign-travel-advice"
-
-      expect(page.find("#wrapper")["class"]).to include("travel-advice")
-    end
-
     it "displays breadcrumbs" do
       visit "/foreign-travel-advice"