Move organisationName config

Moves the organisationName config option out from the `header` config option to be a top-level config option. This is now only used in the title tag.
x-govuk · Jul 23, 2024 · f117610 · f117610
1 parent 6f58ed4
commit f117610
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/layouts/base.njk b/layouts/base.njk
@@ -61,7 +61,9 @@
   {{- title if title -}}
   {{- " (page " + pageNumber + " of " + pageCount + ")" if pageCount > 1 -}}
   {{- " - " + options.header.productName if options.header.productName -}}
-  {{- " - " + options.header.organisationName -}}
+  {%- if options.organisationName or options.header.organisationName %}
+    {{- " - " + (options.organisationName if options.organisationName else options.header.organisationName) -}}
+  {%- endif %}
 {% endblock %}
 
 {% block header %}

diff --git a/lib/data/options.js b/lib/data/options.js
@@ -17,10 +17,11 @@ const defaultOptions = {
     copyright: 'crown', // Crown copyright
     licence: 'ogl' // Open Government Licence v3.0
   },
+  organisationName: 'GOV.UK',
   header: {
     homepageUrl: '/',
     organisationLogo: 'crown',
-    organisationName: 'GOV.UK',
+    organisationName: 'GOV.UK',  // Deprecated: to be removed
     productName: false
   },
   homeKey: 'Home',