diff --git a/app/components/header/header-account-custom-html.njk b/app/components/header/header-account-custom-html.njk index 282c36c58..a1483c82c 100644 --- a/app/components/header/header-account-custom-html.njk +++ b/app/components/header/header-account-custom-html.njk @@ -40,7 +40,7 @@ ] }, service: { - name: "Profile manager" + text: "Profile manager" } }) }} {% endblock %} diff --git a/app/components/header/header-account-logged-in.njk b/app/components/header/header-account-logged-in.njk index 1742ca0e4..e52565593 100644 --- a/app/components/header/header-account-logged-in.njk +++ b/app/components/header/header-account-logged-in.njk @@ -6,7 +6,7 @@ {% block body %} {{ header({ service: { - name: "Manage patients" + text: "Manage patients" }, account: { items: [ diff --git a/app/components/header/header-account-logged-out.njk b/app/components/header/header-account-logged-out.njk index d163701a5..a850703a7 100644 --- a/app/components/header/header-account-logged-out.njk +++ b/app/components/header/header-account-logged-out.njk @@ -6,7 +6,7 @@ {% block body %} {{ header({ service: { - name: "Manage patients" + text: "Manage patients" }, account: { items: [ diff --git a/app/components/header/header-account-rbac.njk b/app/components/header/header-account-rbac.njk index bddcaf2fc..c93f0efdf 100644 --- a/app/components/header/header-account-rbac.njk +++ b/app/components/header/header-account-rbac.njk @@ -6,7 +6,7 @@ {% block body %} {{ header({ service: { - name: "Manage patients" + text: "Manage patients" }, search: { placeholder: "NHS number, Date of birth", diff --git a/app/components/header/header-org-white-account.njk b/app/components/header/header-org-white-account.njk index 08c43f30a..ecaac7b25 100644 --- a/app/components/header/header-org-white-account.njk +++ b/app/components/header/header-org-white-account.njk @@ -7,6 +7,9 @@ {{ header({ classes: "nhsuk-header--white nhsuk-header--white-nav", + logo: { + href: "#" + }, organisation: { name: "Anytown Anyplace", split: "Anywhere", diff --git a/app/components/header/header-org-white-nav.njk b/app/components/header/header-org-white-nav.njk index b34b5bb4b..830f93c37 100644 --- a/app/components/header/header-org-white-nav.njk +++ b/app/components/header/header-org-white-nav.njk @@ -7,6 +7,9 @@ {{ header({ classes: "nhsuk-header--white nhsuk-header--white-nav", + logo: { + href: "#" + }, organisation: { name: "Anytown Anyplace", split: "Anywhere", diff --git a/app/components/header/header-org-white.njk b/app/components/header/header-org-white.njk index 44fdae3d9..2ba967cf0 100644 --- a/app/components/header/header-org-white.njk +++ b/app/components/header/header-org-white.njk @@ -7,6 +7,9 @@ {{ header({ classes: "nhsuk-header--white", + logo: { + href: "#" + }, organisation: { name: "Anytown Anyplace", split: "Anywhere", diff --git a/app/components/header/header-org.njk b/app/components/header/header-org.njk index 16a789099..f570742e6 100644 --- a/app/components/header/header-org.njk +++ b/app/components/header/header-org.njk @@ -6,6 +6,9 @@ {% block body %} {{ header({ + logo: { + href: "#" + }, organisation: { name: "Anytown Anyplace", split: "Anywhere", diff --git a/app/components/header/header-service-name-combined-with-logo.njk b/app/components/header/header-service-name-combined-with-logo.njk new file mode 100644 index 000000000..ec46963c7 --- /dev/null +++ b/app/components/header/header-service-name-combined-with-logo.njk @@ -0,0 +1,18 @@ +{% set html_style = 'background-color: #f0f4f5;' %} +{% set title = 'Header with service name as a combined link' %} +{% from 'components/header/macro.njk' import header %} +{% extends 'layout.njk' %} + +{% block body %} + + {{ header({ + logo: { + includeWithServiceLink: true + }, + service: { + text: "Prototype kit", + href: "#" + } + }) }} + +{% endblock %} diff --git a/app/components/header/header-transactional-service-name.njk b/app/components/header/header-service-name-unlinked.njk similarity index 53% rename from app/components/header/header-transactional-service-name.njk rename to app/components/header/header-service-name-unlinked.njk index c4c12d641..e4ad11cb2 100644 --- a/app/components/header/header-transactional-service-name.njk +++ b/app/components/header/header-service-name-unlinked.njk @@ -1,13 +1,17 @@ {% set html_style = 'background-color: #f0f4f5;' %} -{% set title = 'Header transactional with service name' %} +{% set title = 'Header with unlinked service name' %} {% from 'components/header/macro.njk' import header %} {% extends 'layout.njk' %} {% block body %} {{ header({ - transactionalService: { - name: "Find your NHS number" + logo: { + href: "#", + ariaLabel: "NHS homepage" + }, + service: { + text: "Find your NHS number" } }) }} diff --git a/app/components/header/header-service-name-with-account-search-nav.njk b/app/components/header/header-service-name-with-account-search-nav.njk index dd4d7ddf4..34a3a78c1 100644 --- a/app/components/header/header-service-name-with-account-search-nav.njk +++ b/app/components/header/header-service-name-with-account-search-nav.njk @@ -5,8 +5,12 @@ {% block body %} {{ header({ + logo: { + includeWithServiceLink: true + }, service: { - name: "Search patient directory" + text: "Search patient directory", + href: "#" }, search: { visuallyHiddenLabel: "Search patient directory" diff --git a/app/components/header/header-service-name-with-nav.njk b/app/components/header/header-service-name-with-nav.njk index 6644d94e1..5808816ab 100644 --- a/app/components/header/header-service-name-with-nav.njk +++ b/app/components/header/header-service-name-with-nav.njk @@ -6,8 +6,12 @@ {% block body %} {{ header({ + logo: { + href: "#" + }, service: { - name: "Digital service manual" + text: "Digital service manual", + href: "#" }, search: { visuallyHiddenLabel: "Search the NHS digital service manual" diff --git a/app/components/header/header-service-name.njk b/app/components/header/header-service-name.njk index 3be8c439e..37dda5cd5 100644 --- a/app/components/header/header-service-name.njk +++ b/app/components/header/header-service-name.njk @@ -6,8 +6,13 @@ {% block body %} {{ header({ + logo: { + href: "#", + ariaLabel: "NHS homepage" + }, service: { - name: "Prototype kit" + text: "Find your NHS number", + href: "#" } }) }} diff --git a/app/pages/examples.njk b/app/pages/examples.njk index 51133ab0b..719f014d9 100644 --- a/app/pages/examples.njk +++ b/app/pages/examples.njk @@ -82,11 +82,12 @@
  • Header with account (logged in)
  • Header with account (logged out)
  • Header with account (logged in, RBAC)
  • -
  • Header with logo only
  • +
  • Header with un-linked logo only
  • Header with a service name
  • +
  • Header with an un-linked service name
  • +
  • Header with a service name combined with NHS logo
  • Header with a service name, search and navigation
  • Header with a service name, account, search and navigation
  • -
  • Header transactional with service name
  • Header organisational
  • Header organisational with white header
  • Header organisational with white header and account (logged in)
  • diff --git a/backstop.config.js b/backstop.config.js index 2e100bd63..7483af452 100644 --- a/backstop.config.js +++ b/backstop.config.js @@ -272,10 +272,6 @@ module.exports = { label: 'Header with account, navigation and search', url: `${BASE_URL}/components/header/header-service-name-with-account-search-nav.html` }, - { - label: 'Header transactional with service name', - url: `${BASE_URL}/components/header/header-transactional-service-name.html` - }, { label: 'Header organisational', url: `${BASE_URL}/components/header/header-org.html` diff --git a/packages/components/header/README.md b/packages/components/header/README.md index e15721fcd..e55eccd7a 100644 --- a/packages/components/header/README.md +++ b/packages/components/header/README.md @@ -296,22 +296,22 @@ compiled JavaScript for all components `nhsuk.min.js` or the individual componen --- -### Header transactional with service name +### Header with service name -[Preview the header transactional with service name component](https://nhsuk.github.io/nhsuk-frontend/components/header/header-transactional-service-name.html) +[Preview the header with service name component](https://nhsuk.github.io/nhsuk-frontend/components/header/header-service-name.html) #### HTML markup ```HTML -