Merge pull request #3474 from alphagov/convert_banner

Use the govuk_web_banners gem to render the currently live UR banner for the AI team
alphagov · Dec 10, 2024 · 139c4a2 · 139c4a2
2 parents 6e194ad + a2c8ef3
commit 139c4a2
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 119 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
       capybara (>= 3.36)
       puma
       selenium-webdriver (>= 4.0)
-    govuk_web_banners (0.1.0)
+    govuk_web_banners (0.2.0)
       govuk_publishing_components
       rails (>= 7)
     hashdiff (1.1.1)

diff --git a/app/helpers/recruitment_banner_helper.rb b/app/helpers/recruitment_banner_helper.rb
diff --git a/app/views/content_items/answer.html.erb b/app/views/content_items/answer.html.erb
@@ -5,5 +5,4 @@
 
   <%= @requested_variant.analytics_meta_tag.html_safe if @requested_variant.present? %>
 <% end %>
-<%= render 'shared/intervention_banner' %>
 <%= render 'content_items/body_with_related_links' %>
diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb
@@ -3,7 +3,6 @@
     schema: :faq
   ) %>
 <% end %>
-<%= render 'shared/intervention_banner' %>
 
 <%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>
 

diff --git a/app/views/content_items/document_collection.html.erb b/app/views/content_items/document_collection.html.erb
@@ -6,7 +6,6 @@
 
 <%= render 'shared/email_subscribe_unsubscribe_flash', { title: @content_item.title_and_context[:title] } %>
 
-<%= render 'shared/intervention_banner' %>
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <%= render 'govuk_publishing_components/components/title',
@@ -32,7 +31,7 @@
     <% if @content_item.important_metadata.any? %>
       <%= content_tag :div, class: "important-metadata inverse-background responsive-bottom-margin" do %>
         <%= render "govuk_publishing_components/components/metadata", {
-          inverse: true, 
+          inverse: true,
           other: @content_item.important_metadata,
           margin_bottom: 0,
         } %>

diff --git a/app/views/content_items/guide.html.erb b/app/views/content_items/guide.html.erb
@@ -18,7 +18,6 @@
 <% content_for :simple_header, true %>
 
 <div class="govuk-grid-row gem-print-columns-none">
-  <%= render 'shared/intervention_banner' %>
   <div class="govuk-grid-column-two-thirds">
     <%= render 'govuk_publishing_components/components/title', { title: @content_item.content_title } %>
     <% if @content_item.show_guide_navigation? %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -27,6 +27,8 @@
       <% end %>
     <% end %>
 
+    <%= render "govuk_web_banners/recruitment_banner" %>
+
     <%= yield :header %>
 
     <main role="main" id="content" class="<%= @content_item.schema_name.dasherize %>" lang="<%= I18n.locale %>">

diff --git a/lib/data/recruitment_banners.yml b/lib/data/recruitment_banners.yml
diff --git a/test/unit/helpers/recruitment_banner_helper_test.rb b/test/unit/helpers/recruitment_banner_helper_test.rb