Merge pull request #2571 from alphagov/account-layout-wrapper-update

Add new layout template for account-like pages

app/controllers/root_controller.rb

@@ -25,6 +25,7 @@ class RootController < ApplicationController
     campaign
     gem_layout
     gem_layout_account
+    gem_layout_account_manager
     gem_layout_explore_header
     gem_layout_full_width
     gem_layout_full_width_explore_header

app/views/root/_gem_base.html.erb

@@ -5,8 +5,12 @@
   full_width ||= false
   omit_feedback_form ||= nil
   omit_footer_navigation ||= nil
+  omit_global_banner ||= nil
+  omit_user_satisfaction_survey ||= nil
   product_name ||= nil
   show_explore_header ||= false
+  show_account_layout ||= false
+  account_nav_location ||= nil
 
   if @emergency_banner
     emergency_banner = render "components/emergency_banner", {
@@ -17,15 +21,16 @@
       short_description: @emergency_banner.short_description,
     }
   end
-
-  user_satisfaction_survey = '<div id="user-satisfaction-survey-container"></div>'
-  global_bar = render "components/global_bar"
+  global_bar = ''
+  global_banner = render "components/global_bar" unless omit_global_banner
+  global_bar << '<div id="user-satisfaction-survey-container"></div>' unless omit_user_satisfaction_survey
+  global_bar << global_banner if global_banner
 %>
 
 <%= render "govuk_publishing_components/components/layout_for_public", {
   emergency_banner: emergency_banner.presence,
   full_width: full_width,
-  global_bar: user_satisfaction_survey + global_bar,
+  global_bar: global_bar,
   logo_link: logo_link,
   navigation_items: [ # Remember to update the links in _base.html.erb as well.
   {
@@ -57,4 +62,6 @@
   product_name: product_name,
   show_explore_header: show_explore_header,
   title: content_for?(:title) ? yield(:title) : "GOV.UK - The best place to find government services and information",
+  show_account_layout: show_account_layout,
+  account_nav_location: account_nav_location
 } %>

app/views/root/gem_layout_account_manager.html.erb

@@ -0,0 +1,9 @@
+<%= render partial: "gem_base", locals: {
+  product_name: "Account",
+  logo_link: Plek.new.website_root + "/account/home",
+  omit_feedback_form: true,
+  omit_global_banner: true,
+  omit_user_satisfaction_survey: true,
+  show_account_layout: true,
+  account_nav_location: "your-account"
+} %>

docs/slimmer_templates.md

@@ -10,12 +10,23 @@ This is the same as the `gem_layout` template, except that this layout **doesn't
 
 Use this layout if you want to have full width content - such as the blue welcome bar on the GOV.UK homepage.
 
-## `gem_layout_account`
+## `gem_layout_account` (deprecated – use `gem_layout_account_manager` instead)
+
+**NOTE:** `frontend` is still using this layout in [`account_home_controller.rb`](https://github.com/alphagov/frontend/blob/465a00aae52b6bd762debc14a0f1aba3b61d8dd4/app/controllers/account_home_controller.rb#L3). Once `frontend` has been updated to `gem_layout_account_manager`, this layout can be removed.
 
 This is a variation on the `gem_layout` template intended to be used on GOV.UK Account pages. This layout **doesn't** include the feedback component as the account pages use a different one from the rest of GOV.UK.
 
 This also includes the Account product name in the layout header and changes the logo link to the account homepage link.
 
+## `gem_layout_account_manager`
+
+This is intended as a skeleton wrapper for account pages. It is intended to be used when we need a page rendered by another frontend app to look like a page from `govuk-account-manager-prototype`.
+
+This layout omits the default feedback component for GOVUK as the account pages use a different one from the rest of GOV.UK. Instead it introduces an account-specific phase banner, account feedback prompt, and an account nav component. It also purposefully omits the global bar and user satisfaction survey bar.
+
+Like the former `gem_layout_account` template, this also includes the Account product name in the layout header and changes the logo link to the account homepage link.
+
+
 ## `core_layout` (default)
 
 This template contains styles for the black header bar, the footer and core layout classes. By default it will centre your content to the same width as the GOV.UK header. It provides classes for grid layouts using the column mixins from the frontend toolkit.