From a9a515c0f65196b3fab99fa1a6c9bd2c95c69e29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 15:17:37 +0000
Subject: [PATCH 01/28] build(deps-dev): Bump html-validate from 8.8.0 to 8.9.0

Bumps [html-validate](https://gitlab.com/html-validate/html-validate) from 8.8.0 to 8.9.0.
- [Release notes](https://gitlab.com/html-validate/html-validate/tags)
- [Commits](https://gitlab.com/html-validate/html-validate/compare/v8.8.0...v8.9.0)

---
updated-dependencies:
- dependency-name: html-validate
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 070c2980..b73d00f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
         "grunt-contrib-uglify": "^5.2.2",
         "grunt-contrib-watch": "^1.1.0",
         "grunt-eslint": "^24.3.0",
-        "html-validate": "^8.8.0",
+        "html-validate": "^8.9.0",
         "https-proxy-agent": "^7.0.4",
         "isbinaryfile": "^5.0.2"
       }
@@ -5571,9 +5571,9 @@
       }
     },
     "node_modules/html-validate": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.8.0.tgz",
-      "integrity": "sha512-apL6TzpP9LHylv86V/WCVEmRXMMhNeZVdd2P5p10cD4ZPGC7Gb1fzUOTeGWaKC82RIslHLPW3cenQ8dsrFmeLQ==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.9.0.tgz",
+      "integrity": "sha512-3stj3eoISqSghbOyhWzhHWYybAWlJMULDRVDH/ec45vmKK2JS4lgA09/ZM6VRLQxc4EtZhGl2kcyjFEGXBW3kA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.0",
@@ -15144,9 +15144,9 @@
       }
     },
     "html-validate": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.8.0.tgz",
-      "integrity": "sha512-apL6TzpP9LHylv86V/WCVEmRXMMhNeZVdd2P5p10cD4ZPGC7Gb1fzUOTeGWaKC82RIslHLPW3cenQ8dsrFmeLQ==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.9.0.tgz",
+      "integrity": "sha512-3stj3eoISqSghbOyhWzhHWYybAWlJMULDRVDH/ec45vmKK2JS4lgA09/ZM6VRLQxc4EtZhGl2kcyjFEGXBW3kA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.0",
diff --git a/package.json b/package.json
index a0eaf092..3c8e6013 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "grunt-contrib-uglify": "^5.2.2",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-eslint": "^24.3.0",
-    "html-validate": "^8.8.0",
+    "html-validate": "^8.9.0",
     "https-proxy-agent": "^7.0.4",
     "isbinaryfile": "^5.0.2"
   }

From 5e670c31d092ea42efea371a2aaaa214663c022c Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Wed, 10 Jan 2024 13:26:43 -0500
Subject: [PATCH 02/28] still wip, fix html validator error in gcweb footer-en

---
 src/gcweb/footer.ejs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gcweb/footer.ejs b/src/gcweb/footer.ejs
index 0176eed8..627698c8 100644
--- a/src/gcweb/footer.ejs
+++ b/src/gcweb/footer.ejs
@@ -8,7 +8,7 @@
  * @param? hideFooterMain Used to determine if the main footer will be displayed.
  * @param? hideFooterCorporate Used to determine if the corportate footer links will be displayed.
 -%>
-<footer id="wb-info">
+<footer role="contentinfo" id="wb-info">
     <h2 class="wb-inv"><^- msg('About this site') ^></h2>
     <%_ if (pr.contextualFooter != null) { -%>
         <div class="gc-contextual">
@@ -69,8 +69,8 @@
     <%_ } -%>
     <div class="gc-sub-footer">
         <div class="container d-flex align-items-center">
-            <nav>
-                <h3 class="wb-inv"><^- msg('Government of Canada Corporate') ^></h3>
+            <nav aria-labelledby="aboutGcweb">
+                <h3 class="wb-inv" id="aboutGcweb"><^- msg('Government of Canada Corporate') ^></h3>
                 <%_ if (pr.showFooter != false) { -%>
                     <ul>
                         <%_ if (pr.hideFooterCorporate != true) { -%>

From 4c31f298e40d2178eccd1c0a5e619ecc4729f4a6 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:05:57 -0500
Subject: [PATCH 03/28] still wip, remaining html validate error in WET code

---
 src/gcweb/footer.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gcweb/footer.ejs b/src/gcweb/footer.ejs
index 627698c8..442aa3ed 100644
--- a/src/gcweb/footer.ejs
+++ b/src/gcweb/footer.ejs
@@ -8,7 +8,7 @@
  * @param? hideFooterMain Used to determine if the main footer will be displayed.
  * @param? hideFooterCorporate Used to determine if the corportate footer links will be displayed.
 -%>
-<footer role="contentinfo" id="wb-info">
+<footer id="wb-info">
     <h2 class="wb-inv"><^- msg('About this site') ^></h2>
     <%_ if (pr.contextualFooter != null) { -%>
         <div class="gc-contextual">

From 2f4586ab0f70adf4b373fca333dd632bc313ef22 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Thu, 11 Jan 2024 13:10:34 -0500
Subject: [PATCH 04/28] still wip, fixed 2 html-validate errors, fix to
 generate static pages before html-validation

---
 StaticFileCreator.js | 9 ++++++---
 src/gcweb/footer.ejs | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/StaticFileCreator.js b/StaticFileCreator.js
index 9fb768eb..adceb9d7 100644
--- a/StaticFileCreator.js
+++ b/StaticFileCreator.js
@@ -50,6 +50,11 @@ function createStaticFallbackFile(grunt, definition, language) {
     output = defaultContentFilter(grunt, output, definition, language, targetFileName);
     if (definition.filterContent) output = definition.filterContent(grunt, output, definition, language, targetFileName);
 
+    //---[ Output to file
+    //NOTE: Generate the files before validating the HTML, for troubleshooting
+    if (!fs.existsSync(distStaticTargetDirName)) fs.mkdirSync(distStaticTargetDirName); //create target directory if it doesn't exist
+    fs.writeFileSync(targetFileName, output, { encoding: 'utf8' });
+
     //---[ Validate HTML before we save
     const htmlValidate = new HtmlValidate(require('./htmlvalidator.conf.js'));
     const htmlValidateFormatReport = formatterFactory('stylish'); //possible formatters: checkstyle, codeframe, json, stylish, text
@@ -60,9 +65,7 @@ function createStaticFallbackFile(grunt, definition, language) {
         if (report.errorCount > 0) throw new Error('HTML validator error reported, aborting.');
     }
 
-    //---[ Output to file
-    if (!fs.existsSync(distStaticTargetDirName)) fs.mkdirSync(distStaticTargetDirName); //create target directory if it doesn't exist
-    fs.writeFileSync(targetFileName, output, { encoding: 'utf8' });
+   
 }
 
 module.exports = function generateStaticFile(grunt, themeName, definitionFileBasename, getStaticFileDefinition) {
diff --git a/src/gcweb/footer.ejs b/src/gcweb/footer.ejs
index 442aa3ed..bed3e29d 100644
--- a/src/gcweb/footer.ejs
+++ b/src/gcweb/footer.ejs
@@ -30,8 +30,8 @@
     <%_ if (pr.showFooter != false && pr.hideFooterMain != true) { -%>
         <div id="transactFooter" class="gc-main-footer">
             <div class="container">
-                <nav>
-                    <h3><^- msg('Government of Canada') ^></h3>
+                <nav aria-labelledby="transactGcweb">
+                    <h3 id="transactGcweb"><^- msg('Government of Canada') ^></h3>
                     <ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
                         <%_ if (pr.contactLinks != null && pr.contactLinks.length > 0) {
                             const link=pr.contactLinks[0]; -%>

From 318981a4c51becf07920488c421f51a171501212 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Wed, 17 Jan 2024 09:38:17 -0500
Subject: [PATCH 05/28] still wip, fix html validator errors in
 gcintranet-secmenu-en.html

---
 src/gcintranet/appTop.ejs  | 28 ++++++++++++++--------------
 src/gcintranet/secmenu.ejs |  2 +-
 src/gcweb/appFooter.ejs    |  4 ++--
 src/gcweb/splash.ejs       |  4 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 47bbacf1..d3bf0147 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -60,7 +60,7 @@ if (pr.subTheme === 'eccc') {
         <div id="app-brand">
             <div class="container">
                 <div class="row">
-                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8">
+                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="cdts-gcIntranetLink">
                         <div class="app-name<%- (pr.intranetTitle != null)? ' app-name-lg': '' %>">
                             <%_ if (pr.intranetTitle != null && pr.intranetTitle.length > 0) {
                                 const item=pr.intranetTitle[0]; -%>
@@ -82,7 +82,7 @@ if (pr.subTheme === 'eccc') {
                         </div>
                     </section>
                     <%_ if (pr.GCToolsModal == true) { -%>
-                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right">
+                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-label="cdts-gctoolsModalLinks">
                             <h2 class="wb-inv"><^- msg('GCTools links') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
@@ -108,7 +108,7 @@ if (pr.subTheme === 'eccc') {
                             </section>
                         </section>
                     <%_ } else if (pr.intranetTitle == null) { /* (...== null) is intentional, not (...!= null) */-%>
-                        <section id="wb-gctools" class="col-lg-6 visible-lg">
+                        <section id="wb-gctools" class="col-lg-6 visible-lg" aria-label="cdts-gctoolsLinks">
                             <div class="pull-left tool-link">
                                 <a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>">
                                 <^- msg('<span class="bold-gc">GC</span>connex') ^></a>
@@ -128,8 +128,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.lngLinks != null) { -%>
-                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>">
-                            <h2 class="wb-inv"><^- msg('Language selection') ^></h2>
+                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-labelledby="cdts-languageLinks">
+                            <h2 class="wb-inv" id="cdts-languageLinks"><^- msg('Language selection') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -143,8 +143,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.search != false) { -%>
-                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md">
-                            <h2><^- msg('Search') ^></h2>
+                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-labelledby="cdts-search">
+                            <h2 id="cdts-search"><^- msg('Search') ^></h2>
                             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                                 const item=pr.customSearch[0]; -%>
                                 <form action="<%- (item.action != null)? item.action: '<^- msg('https://intranet.canada.ca/search-recherche/query-recherche-eng.aspx') ^>' %>" method="<%= (item.method != null)? item.method: 'get' %>" name="<%= (item.name != null)? item.name: 'cse-search-box'%>" role="search" class="form-inline">
@@ -182,9 +182,9 @@ if (pr.subTheme === 'eccc') {
                             <%_ } -%>
                         </section>
                     <%_ } -%>
-                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs">
+                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs" aria-labelledby="cdts-searchAndMenu">
                         <%_ var pluralSuffix = (pr.topSecMenu != null)? 's': ''; -%>
-                        <h2><%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%></h2>
+                        <h2 id="cdts-searchAndMenu"><%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%></h2>
                         <ul class="list-inline text-right chvrn">
                             <li><a href="#mb-pnl" title="<%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%>" aria-controls="mb-pnl" class="overlay-lnk" role="button">
                                 <%_ if (pr.search != false) { -%><span class="glyphicon glyphicon-search"><%_ } -%>
@@ -199,7 +199,7 @@ if (pr.subTheme === 'eccc') {
                 </div>
                 <%_ if (pr.GCToolsModal != true) { -%>
                     <div id="tools-sm" class="row<%- (pr.intranetTitle != null)? '': ' visible-md' %>">
-                        <section id="tool-container-sm" class="col-md-12 col-sm-12">
+                        <section id="tool-container-sm" class="col-md-12 col-sm-12" aria-label="cdts-gctoolsModalLinks">
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>connex') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://www.gcpedia.gc.ca/wiki/?setlang=en') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>pedia') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcdirectory-gcannuaire.gc.ca/en/GCD/?pgid=002') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>directory') ^></a></div>
@@ -251,7 +251,7 @@ if (pr.subTheme === 'eccc') {
         </div>
     </div>
     <%_ if (pr.menuLinks != null) { -%>
-        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement">
+        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-menuLinks">
             <div class="pnl-strt container nvbar">
                 <h2 class="wb-inv"><^- msg('Main navigation menu') ^></h2>
                 <div class="row">
@@ -289,13 +289,13 @@ if (pr.subTheme === 'eccc') {
             </div>
         </nav>
     <%_ } else if (pr.menuPath != null) { -%>
-        <nav role="navigation" id="wb-smapp" data-ajax-replace="<%= pr.menuPath %>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement"></nav>
+        <nav role="navigation" id="wb-smapp" data-ajax-replace="<%= pr.menuPath %>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-menuPath"></nav>
     <%_ } else { -%>
         <div id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('appmenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu hidden-sm hidden-xs"></div>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != null) { -%>
-        <nav role="navigation" id="wb-bc" property="breadcrumb">
-            <h2><^- msg('You are here:') ^></h2>
+        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbs">
+            <h2 id="cdts-breadcrumbs"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ for (var breadcrumbIndex=0; breadcrumbIndex<pr.breadcrumbs.length; breadcrumbIndex++) {
diff --git a/src/gcintranet/secmenu.ejs b/src/gcintranet/secmenu.ejs
index d435f686..f200330f 100644
--- a/src/gcintranet/secmenu.ejs
+++ b/src/gcintranet/secmenu.ejs
@@ -5,7 +5,7 @@
 <h2 id="wb-sec-h" class="wb-inv"><^- msg('Section menu') ^></h2>
 <%_ for (var sectionIndex=0; sectionIndex<pr.sections.length; sectionIndex++) { 
     const section=pr.sections[sectionIndex];-%>
-    <section class="list-group menu list-unstyled">
+    <section class="list-group menu list-unstyled" aria-label="cdts-gcIntranetLink">
         <h3><%_ if (section.sectionLink != null) { -%>
                 <%_ -%><a href="<%- section.sectionLink %>"<%- (section.newWindow==true)? ' target="_blank"  rel="noopener"': '' %>><%_ -%>
             <%_ } -%>
diff --git a/src/gcweb/appFooter.ejs b/src/gcweb/appFooter.ejs
index 3348de45..4a317edf 100644
--- a/src/gcweb/appFooter.ejs
+++ b/src/gcweb/appFooter.ejs
@@ -11,8 +11,8 @@
         <%_ if (pr.footerSections != null && Array.isArray(pr.footerSections)) pr.footerSections = { links: pr.footerSections } -%>
         <div class="gc-contextual">
             <div class="container">
-                <nav>
-                    <h2 class="wb-inv"><^- msg('Related links') ^></h2>
+                <nav aria-labelledby="cdts-appFooterLinks">
+                    <h2 class="wb-inv" id="cdts-appFooterLinks"><^- msg('Related links') ^></h2>
                     <%_ if (pr.footerSections != null && pr.footerSections.title != null) { -%> <h3><%= pr.footerSections.title %></h3> <%_ } -%>
                     <ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
                         <%_ if (pr.contactLink != null && pr.contactLink.length > 0) { -%>
diff --git a/src/gcweb/splash.ejs b/src/gcweb/splash.ejs
index f96215cb..1626afcc 100644
--- a/src/gcweb/splash.ejs
+++ b/src/gcweb/splash.ejs
@@ -27,14 +27,14 @@
                 </div>
             </div>
             <div class="row cdts-splash">
-                <section class="col-xs-6 text-right" lang="en">
+                <section class="col-xs-6 text-right" lang="en" aria-label="cdts-enGovCanada">
                     <%_ if (pr.nameEng != null) { -%>
                         <h2><%= pr.nameEng %></h2>
                     <%_ } else { -%>
                         <h2 class="wb-inv">Government of Canada</h2>
                     <%_ } -%>
                 </section>
-                <section class="col-xs-6" lang="fr">
+                <section class="col-xs-6" lang="fr" aria-label="cdts-frGovCanada">
                     <%_ if (pr.nameFra != null) { -%>
                         <h2><%= pr.nameFra %></h2>
                     <%_ } else { -%>

From 60cf7cba39cadfb49e4bcdcabcbc7aa3c0ff5d11 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:33:55 -0500
Subject: [PATCH 06/28] fixes html-validate errors in build

---
 src/gcintranet/appTop.ejs  |  2 +-
 src/gcintranet/secmenu.ejs |  2 +-
 src/gcintranet/splash.ejs  |  4 ++--
 src/gcintranet/top.ejs     | 20 ++++++++++----------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index d3bf0147..0c899050 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -60,7 +60,7 @@ if (pr.subTheme === 'eccc') {
         <div id="app-brand">
             <div class="container">
                 <div class="row">
-                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="cdts-gcIntranetLink">
+                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="cdts-intranetTitle">
                         <div class="app-name<%- (pr.intranetTitle != null)? ' app-name-lg': '' %>">
                             <%_ if (pr.intranetTitle != null && pr.intranetTitle.length > 0) {
                                 const item=pr.intranetTitle[0]; -%>
diff --git a/src/gcintranet/secmenu.ejs b/src/gcintranet/secmenu.ejs
index f200330f..d435f686 100644
--- a/src/gcintranet/secmenu.ejs
+++ b/src/gcintranet/secmenu.ejs
@@ -5,7 +5,7 @@
 <h2 id="wb-sec-h" class="wb-inv"><^- msg('Section menu') ^></h2>
 <%_ for (var sectionIndex=0; sectionIndex<pr.sections.length; sectionIndex++) { 
     const section=pr.sections[sectionIndex];-%>
-    <section class="list-group menu list-unstyled" aria-label="cdts-gcIntranetLink">
+    <section class="list-group menu list-unstyled">
         <h3><%_ if (section.sectionLink != null) { -%>
                 <%_ -%><a href="<%- section.sectionLink %>"<%- (section.newWindow==true)? ' target="_blank"  rel="noopener"': '' %>><%_ -%>
             <%_ } -%>
diff --git a/src/gcintranet/splash.ejs b/src/gcintranet/splash.ejs
index f2565a49..003acfbc 100644
--- a/src/gcintranet/splash.ejs
+++ b/src/gcintranet/splash.ejs
@@ -27,14 +27,14 @@
                 </div>
             </div>
             <div class="row cdts-splash">
-                <section class="col-xs-6 text-right" lang="en">
+                <section class="col-xs-6 text-right" lang="en" aria-label="cdts-governmentOfCanada">
                     <%_ if (pr.nameEng != null) { -%>
                         <h2><%= pr.nameEng %></h2>
                     <%_ } else { -%>
                         <h2 class="wb-inv">Government of Canada</h2>
                     <%_ } -%>
                 </section>
-                <section class="col-xs-6" lang="fr">
+                <section class="col-xs-6" lang="fr" aria-label="cdts-gouvernementDuCanada">
                     <%_ if (pr.nameFra != null) { -%>
                         <h2><%= pr.nameFra %></h2>
                     <%_ } else { -%>
diff --git a/src/gcintranet/top.ejs b/src/gcintranet/top.ejs
index efcaea99..5b21731b 100644
--- a/src/gcintranet/top.ejs
+++ b/src/gcintranet/top.ejs
@@ -58,7 +58,7 @@ if (pr.subTheme === 'eccc') {
         <div id="app-brand">
             <div class="container">
                 <div class="row">
-                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8">
+                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="cdts-intranetTitle">
                         <div class="app-name<%- (pr.intranetTitle != null)? ' app-name-lg': '' %>">
                             <%_ if (pr.intranetTitle != null && pr.intranetTitle.length > 0) {
                                 const item=pr.intranetTitle[0]; -%>
@@ -89,7 +89,7 @@ if (pr.subTheme === 'eccc') {
                                     </ul>
                                 </div>
                             </div>
-                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def">
+                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def" aria-label="cdts-intraGctools">
                                 <header class="modal-header">
                                     <h2 class="modal-title"><^- msg('<span class="bold-gc">GC</span>Tools') ^></h2>
                                 </header>
@@ -106,7 +106,7 @@ if (pr.subTheme === 'eccc') {
                             </section>
                         </section>
                     <%_ } else if (pr.intranetTitle == null) { /* (...== null) is intentional, not (...!= null) */-%>
-                        <section id="wb-gctools" class="col-lg-6 visible-lg">
+                        <section id="wb-gctools" class="col-lg-6 visible-lg" aria-label="cdts-webGctools">
                             <div class="pull-left tool-link">
                                 <a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>">
                                 <^- msg('<span class="bold-gc">GC</span>connex') ^></a>
@@ -141,7 +141,7 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.search != false) { -%>
-                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md">
+                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-label="cdts-search">
                             <h2><^- msg('Search') ^></h2>
                             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                                 const item=pr.customSearch[0]; -%>
@@ -180,7 +180,7 @@ if (pr.subTheme === 'eccc') {
                             <%_ } -%>
                         </section>
                     <%_ } -%>
-                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs">
+                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs" aria-label="cdts-searchAndMenu">
                         <%_ var pluralSuffix = (pr.topSecMenu != null)? 's': ''; -%>
                         <h2><%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%></h2>
                         <ul class="list-inline text-right chvrn">
@@ -197,7 +197,7 @@ if (pr.subTheme === 'eccc') {
                 </div>
                 <%_ if (pr.GCToolsModal != true) { -%>
                     <div id="tools-sm" class="row<%- (pr.intranetTitle != null)? '': ' visible-md' %>">
-                        <section id="tool-container-sm" class="col-md-12 col-sm-12">
+                        <section id="tool-container-sm" class="col-md-12 col-sm-12" aria-label="cdts-tools">
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>connex') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://www.gcpedia.gc.ca/wiki/?setlang=en') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>pedia') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcdirectory-gcannuaire.gc.ca/en/GCD/?pgid=002') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>directory') ^></a></div>
@@ -210,7 +210,7 @@ if (pr.subTheme === 'eccc') {
     </div>
     <%_ if (pr.siteMenu != false) { -%>
         <%_ if (pr.subTheme == 'esdc' || pr.subTheme == 'labour') { -%>
-            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: '/app/cls/WET/global/<^- msg('esdcmenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement">
+            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: '/app/cls/WET/global/<^- msg('esdcmenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-esdcLabourMenu">
                 <div class="container nvbar">
                     <h2><^- msg('Topics menu') ^></h2>
                     <div class="row">
@@ -230,7 +230,7 @@ if (pr.subTheme === 'eccc') {
             </nav>
         <%_ } else if (pr.subTheme == 'eccc') { -%>
             <%# Todo: Change with eccc Menu -%>
-            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: wet.builder.environment(pr.cdnEnv) + 'cdts/ajax/<^- msg('sitemenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement">
+            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: wet.builder.environment(pr.cdnEnv) + 'cdts/ajax/<^- msg('sitemenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-ecccMenu">
                 <div class="container nvbar">
                     <h2><^- msg('Topics menu') ^></h2>
                     <div class="row">
@@ -251,7 +251,7 @@ if (pr.subTheme === 'eccc') {
                 </div>
             </nav>
         <%_ } else { -%>
-            <nav role="navigation" id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('sitemenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement">
+            <nav role="navigation" id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('sitemenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-webMenu">
                 <div class="container nvbar">
                     <h2><^- msg('Topics menu') ^></h2>
                     <div class="row">
@@ -267,7 +267,7 @@ if (pr.subTheme === 'eccc') {
         <%_ } -%>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != false) { -%>
-        <nav role="navigation" id="wb-bc" property="breadcrumb">
+        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-label="cdts-breadcrumbTrail">
             <h2><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">

From 239745ede35fcf0eb723979dac8e9b91ad2addf0 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Fri, 19 Jan 2024 14:28:42 -0500
Subject: [PATCH 07/28] still wip, fix npm test html-validate errors

---
 TestFileGenerator.js                |  6 +++---
 src/gcintranet/appTop.ejs           |  2 +-
 src/gcintranet/footer.ejs           |  2 +-
 src/gcintranet/wet-messages.en.json |  4 ++++
 src/gcintranet/wet-messages.fr.json |  4 ++++
 src/gcweb/top.ejs                   | 12 ++++++------
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/TestFileGenerator.js b/TestFileGenerator.js
index 711cc67a..50474ce4 100644
--- a/TestFileGenerator.js
+++ b/TestFileGenerator.js
@@ -159,7 +159,7 @@ module.exports = function generateTestFile(inputFilePath, theme, outputFileName,
         }
         return;
     }
-
+    console.log(`TestFileGenerator processing ${inputFilePath} -> ${theme}/${outputFileName}`);
     let data = fs.readFileSync(inputFilePath, 'utf8');
 
     if (data.match(/wet\.builder\.[\S]*[sS]etup\(/gm) !== null || data.match(setupAttributeRegex) !== null) {
@@ -197,8 +197,8 @@ module.exports = function generateTestFile(inputFilePath, theme, outputFileName,
         data = data.replace('"~' + Object.keys(sections)[i] + '~"', sections[Object.keys(sections)[i]]);
     }
 
+    fs.writeFileSync(filePath, data, 'utf8');
+
     //---[ Before writing data to disk, validate the output of the various 'wet.builder.*' functions.
     validateBuilderFunctions(data, theme, version);
-
-    fs.writeFileSync(filePath, data, 'utf8');
 }
diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 0c899050..37699049 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -128,7 +128,7 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.lngLinks != null) { -%>
-                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-labelledby="cdts-languageLinks">
+                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-label="cdts-languageLinks">
                             <h2 class="wb-inv" id="cdts-languageLinks"><^- msg('Language selection') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
diff --git a/src/gcintranet/footer.ejs b/src/gcintranet/footer.ejs
index b968cf87..be471f86 100644
--- a/src/gcintranet/footer.ejs
+++ b/src/gcintranet/footer.ejs
@@ -5,7 +5,7 @@
  * @param? footerPath Local path for footer.
 -%>
 <%_ if (pr.showFeatures == true) { -%>
-    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>"></section>
+    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>" aria-label="<^- msg('Activities and initiatives') ^>"></section>
 <%_ } -%>
 <footer role="contentinfo" id="wb-info">
     <%_ if (pr.footerPath != null) { -%>
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index 6bde20b8..e8a6139a 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -317,6 +317,10 @@
         "source": "You are here:",
         "target": null
     },
+    "d8cde1c29b61c58e4ef757161e59991a22d66763": {
+        "source": "Activities and initiatives",
+        "target": null
+    },
     "0052b2c1760a4b2697c109bc3a864419bf33ecd2": {
         "source": "https://intranet.canada.ca/contact-eng.asp",
         "target": null
diff --git a/src/gcintranet/wet-messages.fr.json b/src/gcintranet/wet-messages.fr.json
index aea51a07..40f81cae 100644
--- a/src/gcintranet/wet-messages.fr.json
+++ b/src/gcintranet/wet-messages.fr.json
@@ -440,5 +440,9 @@
     "0ca3e700f4ad7f0a2cb04efdc52361be64516d04": {
         "source": "<span class=\"bold-gc\">GC</span>Xchange",
         "target": "<span class=\"bold-gc\">GC</span>Échange"
+    },
+    "d8cde1c29b61c58e4ef757161e59991a22d66763": {
+        "source": "Activities and initiatives",
+        "target": "Activités et initiatives"
     }
 }
\ No newline at end of file
diff --git a/src/gcweb/top.ejs b/src/gcweb/top.ejs
index 3b175336..3b4414c7 100644
--- a/src/gcweb/top.ejs
+++ b/src/gcweb/top.ejs
@@ -21,8 +21,8 @@
     <div id="wb-bnr" class="container">
         <div class="row">
             <%_ if (pr.lngLinks != null) { -%>
-                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right">
-                    <h2 class="wb-inv"><^- msg('Language selection') ^></h2>
+                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right" aria-labelledby="cdts-languageLinks">
+                    <h2 class="wb-inv" id="cdts-languageLinks"><^- msg('Language selection') ^></h2>
                     <ul class="list-inline mrgn-bttm-0">
                         <%_ for (var linkIndex=0; linkIndex<pr.lngLinks.length; linkIndex++) { 
                             const link=pr.lngLinks[linkIndex];-%>
@@ -45,8 +45,8 @@
             <%_ if (pr.search != false) { -%>
                 <%_ if (pr.customSearch != null && pr.customSearch.length > 0) { 
                     const item=pr.customSearch[0]; -%>
-                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg">
-                        <h2><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
+                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-webSearch">
+                        <h2 id="cdts-webSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
                         <form action="<%- item.action %>" method="<%= item.method %>" name="cse-search-box" role="search">
                             <div class="form-group wb-srch-qry">
                                 <label for="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
@@ -64,8 +64,8 @@
                         </form>
                     </section>
                 <%_ } else { -%>
-                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4">
-                        <h2><^- msg('Search') ^></h2>
+                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4" aria-labelledby="cdts-webSearch">
+                        <h2 id="cdts-webSearch"><^- msg('Search') ^></h2>
                         <form action="<^- msg('https://www.canada.ca/en/sr/srb.html') ^>" method="get" name="cse-search-box" role="search" accept-charset="utf-8">
                             <div class="form-group wb-srch-qry">
                                 <label for="wb-srch-q" class="wb-inv"><^- msg('Search Canada.ca') ^></label>

From c497f3a094692f09efbe1aee1b485db71697a6f7 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Mon, 22 Jan 2024 17:03:10 -0500
Subject: [PATCH 08/28] still wip, continue fixing html-validate errors
 intranet-top

---
 src/gcintranet/appFooter.ejs        | 10 +++++-----
 src/gcintranet/top.ejs              | 28 ++++++++++++++--------------
 src/gcintranet/wet-messages.en.json |  4 ++++
 src/gcintranet/wet-messages.fr.json |  4 ++++
 src/gcweb/appTop.ejs                | 28 ++++++++++++++--------------
 src/gcweb/footer.ejs                |  4 ++--
 src/gcweb/refFooter.ejs             |  2 +-
 7 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs
index 4f920f47..93ff9624 100644
--- a/src/gcintranet/appFooter.ejs
+++ b/src/gcintranet/appFooter.ejs
@@ -8,20 +8,20 @@
  * @param? cdnEnv Used to switch between qat, nonprod, and prod CDN implementations.
 -%>
 <%_ if (pr.showFeatures == true) { -%>
-    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>"></section>
+    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>" aria-label="<^- msg('activities-footer-eng.html') ^>"></section>
 <%_ } -%>
 <footer role="contentinfo" id="wb-info">
     <%_ if (pr.footerSections != null) { -%>
-        <nav role="navigation" class="container wb-navcurr">
-            <h2 class="wb-inv"><^- msg('Related links') ^></h2>
+        <nav role="navigation" class="container wb-navcurr" aria-labelledby="cdts-relatedLinks">
+            <h2 class="wb-inv" id="cdts-relatedLinks"><^- msg('Related links') ^></h2>
             <div class="row">
                 <%_ for (var sectionIndex=0; sectionIndex<pr.footerSections.length; sectionIndex++) {
                     const footerSection=pr.footerSections[sectionIndex];-%>
                     <%_ if (footerSection.customFooterLinks != null) { -%>
                         <%_ if (sectionIndex < 3) { -%>
-                            <section class="col-md-3 col-sm-6 col-lg-3">
+                            <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-footerSectionLinks">
                                 <%_ if (footerSection.sectionName != null) { -%>
-                                    <h3><%= footerSection.sectionName %></h3>
+                                    <h3 id="cdts-footerSectionLinks"><%= footerSection.sectionName %></h3>
                                 <%_ } -%>
                                 <ul class="list-unstyled">
                                     <%_ for (var linkIndex=0; linkIndex<footerSection.customFooterLinks.length; linkIndex++) {
diff --git a/src/gcintranet/top.ejs b/src/gcintranet/top.ejs
index 5b21731b..58fbc393 100644
--- a/src/gcintranet/top.ejs
+++ b/src/gcintranet/top.ejs
@@ -58,7 +58,7 @@ if (pr.subTheme === 'eccc') {
         <div id="app-brand">
             <div class="container">
                 <div class="row">
-                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="cdts-intranetTitle">
+                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="<^- msg('intranet') ^>">
                         <div class="app-name<%- (pr.intranetTitle != null)? ' app-name-lg': '' %>">
                             <%_ if (pr.intranetTitle != null && pr.intranetTitle.length > 0) {
                                 const item=pr.intranetTitle[0]; -%>
@@ -80,8 +80,8 @@ if (pr.subTheme === 'eccc') {
                         </div>
                     </section>
                     <%_ if (pr.GCToolsModal == true) { -%>
-                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right">
-                            <h2 class="wb-inv"><^- msg('GCTools links') ^></h2>
+                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-labelledby="cdts-hiddenGcToolsLinks">
+                            <h2 class="wb-inv" id="cdts-hiddenGcToolsLinks"><^- msg('GCTools links') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -89,7 +89,7 @@ if (pr.subTheme === 'eccc') {
                                     </ul>
                                 </div>
                             </div>
-                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def" aria-label="cdts-intraGctools">
+                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def" aria-label="<^- msg('GC Tools') ^>">
                                 <header class="modal-header">
                                     <h2 class="modal-title"><^- msg('<span class="bold-gc">GC</span>Tools') ^></h2>
                                 </header>
@@ -106,7 +106,7 @@ if (pr.subTheme === 'eccc') {
                             </section>
                         </section>
                     <%_ } else if (pr.intranetTitle == null) { /* (...== null) is intentional, not (...!= null) */-%>
-                        <section id="wb-gctools" class="col-lg-6 visible-lg" aria-label="cdts-webGctools">
+                        <section id="wb-gctools" class="col-lg-6 visible-lg" aria-label="<^- msg('GCTools links') ^>">
                             <div class="pull-left tool-link">
                                 <a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>">
                                 <^- msg('<span class="bold-gc">GC</span>connex') ^></a>
@@ -126,8 +126,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.lngLinks != null) { -%>
-                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.subTheme == 'esdc' || pr.GCToolsModal == true)? '': 'lang-with-search'%>">
-                            <h2 class="wb-inv"><^- msg('Language selection') ^></h2>
+                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.subTheme == 'esdc' || pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-labelledby="cdts-languageSelection">
+                            <h2 class="wb-inv" id="cdts-languageSelection"><^- msg('Language selection') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -180,9 +180,9 @@ if (pr.subTheme === 'eccc') {
                             <%_ } -%>
                         </section>
                     <%_ } -%>
-                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs" aria-label="cdts-searchAndMenu">
+                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs" aria-labelledby="cdts-menu">
                         <%_ var pluralSuffix = (pr.topSecMenu != null)? 's': ''; -%>
-                        <h2><%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%></h2>
+                        <h2 id="cdts-menu"><%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%></h2>
                         <ul class="list-inline text-right chvrn">
                             <li><a href="#mb-pnl" title="<%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%>" aria-controls="mb-pnl" class="overlay-lnk" role="button">
                                 <%_ if (pr.search != false) { -%><span class="glyphicon glyphicon-search"><%_ } -%>
@@ -210,7 +210,7 @@ if (pr.subTheme === 'eccc') {
     </div>
     <%_ if (pr.siteMenu != false) { -%>
         <%_ if (pr.subTheme == 'esdc' || pr.subTheme == 'labour') { -%>
-            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: '/app/cls/WET/global/<^- msg('esdcmenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-esdcLabourMenu">
+            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: '/app/cls/WET/global/<^- msg('esdcmenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-esdcLabourMenu" aria-label="<^- msg('Topics menu') ^>">
                 <div class="container nvbar">
                     <h2><^- msg('Topics menu') ^></h2>
                     <div class="row">
@@ -230,7 +230,7 @@ if (pr.subTheme === 'eccc') {
             </nav>
         <%_ } else if (pr.subTheme == 'eccc') { -%>
             <%# Todo: Change with eccc Menu -%>
-            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: wet.builder.environment(pr.cdnEnv) + 'cdts/ajax/<^- msg('sitemenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-ecccMenu">
+            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: wet.builder.environment(pr.cdnEnv) + 'cdts/ajax/<^- msg('sitemenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Topics menu') ^>">
                 <div class="container nvbar">
                     <h2><^- msg('Topics menu') ^></h2>
                     <div class="row">
@@ -251,7 +251,7 @@ if (pr.subTheme === 'eccc') {
                 </div>
             </nav>
         <%_ } else { -%>
-            <nav role="navigation" id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('sitemenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-webMenu">
+            <nav role="navigation" id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('sitemenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Topics menu') ^>">
                 <div class="container nvbar">
                     <h2><^- msg('Topics menu') ^></h2>
                     <div class="row">
@@ -267,8 +267,8 @@ if (pr.subTheme === 'eccc') {
         <%_ } -%>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != false) { -%>
-        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-label="cdts-breadcrumbTrail">
-            <h2><^- msg('You are here:') ^></h2>
+        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumb">
+            <h2 id="cdts-breadcrumb"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ if (pr.breadcrumbs != null) { -%>
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index e8a6139a..3c5369b1 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -365,6 +365,10 @@
         "source": "Section menu",
         "target": null
     },
+    "5a4356b4e754ea9c3775e8c156860a6e18ab6b54": {
+        "source": "GC Tools",
+        "target": null
+    },
     "f43ac2b672a1db811dd7168a1e7cc1add2fb79b0": {
         "source": "esdcmenu-eng.html",
         "target": null
diff --git a/src/gcintranet/wet-messages.fr.json b/src/gcintranet/wet-messages.fr.json
index 40f81cae..699f97d8 100644
--- a/src/gcintranet/wet-messages.fr.json
+++ b/src/gcintranet/wet-messages.fr.json
@@ -444,5 +444,9 @@
     "d8cde1c29b61c58e4ef757161e59991a22d66763": {
         "source": "Activities and initiatives",
         "target": "Activités et initiatives"
+    },
+    "5a4356b4e754ea9c3775e8c156860a6e18ab6b54": {
+        "source": "GC Tools",
+        "target": "Outils GC"
     }
 }
\ No newline at end of file
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index bfa63219..3f562a1f 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -50,8 +50,8 @@
     <div id="wb-bnr" class="container">
         <div class="row">
             <%_ if (pr.lngLinks != null) { -%>
-                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right">
-                    <h2 class="wb-inv"><^- msg('Language selection') ^></h2>
+                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right" aria-labelledby="cdts-languageLinks">
+                    <h2 class="wb-inv" id="cdts-languageLinks"><^- msg('Language selection') ^></h2>
                     <ul class="list-inline mrgn-bttm-0">
                         <%_ for (var linkIndex=0; linkIndex<pr.lngLinks.length; linkIndex++) {
                             const link=pr.lngLinks[linkIndex];-%>
@@ -74,9 +74,9 @@
             </div>
             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                 const item=pr.customSearch[0]; -%>
-                <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg">
+                <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labell="<^- msg('Search') ^>">
                     <h2><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
-                    <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search">
+                    <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" aria-label="<^- msg('Search') ^>">
                         <div class="form-group wb-srch-qry">
                             <label for="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
                             <input id="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-srch-q form-control" name="<%= item.name != null? item.name: 'q' %>" type="search" value="" size="34" maxlength="170" placeholder="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>">
@@ -99,7 +99,7 @@
         <div class="container">
             <div class="row">
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                    <section class="col-xs-12 col-sm-7">
+                    <section class="col-xs-12 col-sm-7" aria-label="<^- msg('Name of Web application') ^>">
                 <%_ } else if (pr.headerMenu != null) { -%>
                     <section class="col-xs-12 col-sm-9 cdts-app-title-menu">
                 <%_ } else { -%>
@@ -138,7 +138,7 @@
                     </nav>
                 <%_ } -%>
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                    <nav class="col-sm-5 hidden-xs hidden-print">
+                    <nav class="col-sm-5 hidden-xs hidden-print" aria-label="<^- msg('Account menu') ^>">
                         <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
                         <ul class="app-list-account list-unstyled">
                             <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
@@ -165,7 +165,7 @@
     <%_ if (pr.customSearch != null || pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true || pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
         <div class="app-bar-mb container visible-xs-block hidden-print">
             <%_ if (pr.customSearch != null || pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%>
-                <nav>
+                <nav aria-label="<^- msg('and search') ^>">
                     <h2 class="wb-inv"><%_ if (pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%>Menu<%= (pr.customSearch != null)? ' <^- msg('and search') ^>': ''%><%_ } else { -%><^- msg('Search') ^><%_ } -%></h2>
                     <ul class="app-list-main list-unstyled">
                         <%_ if (pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%><li class="wb-mb-links" id="wb-glb-mn"><a href="#mb-pnl" aria-controls="mb-pnl" class="btn overlay-lnk" role="button"><^- msg('Menu') ^></a><h2><^- msg('Menu') ^></h2></li><%_ } -%>
@@ -174,12 +174,12 @@
                     <div id="mb-pnl"></div>
                     <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                         const item=pr.customSearch[0]; -%>
-                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t">
+                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t" arial-label="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>">
                             <div class="modal-header">
                                 <h3 class="modal-title"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h3>
                             </div>
                             <div class="modal-body">
-                                <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" class="form-inline">
+                                <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" class="form-inline" aria-label="<^- msg('Search') ^>">
                                     <div class="input-group">
                                         <label for="<%= item.id != null? 'app-' + item.id: 'app-srch-q-mb' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
                                         <input placeholder="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>" id="<%= item.id != null? 'app-' + item.id: 'app-srch-q-mb' %>" class="app-srch-q-mb form-control" name="q" type="search" value="" size="27" maxlength="150">
@@ -198,7 +198,7 @@
                 </nav>
             <%_ } -%>
             <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-            <nav>
+            <nav aria-label="<^- msg('Account menu') ^>">
                 <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
                 <ul class="app-list-account list-unstyled">
                     <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
@@ -222,9 +222,9 @@
         </div>
 
         <%_ if (pr.menuLinks != null) { -%>
-            <nav id="wb-sm" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-labelledby="appNavMenu">
+            <nav id="wb-sm" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Main navigation menu') ^>">
                 <div class="pnl-strt container nvbar">
-                    <h2 class="wb-inv" id="appNavMenu"><^- msg('Main navigation menu') ^></h2>
+                    <h2 class="wb-inv"><^- msg('Main navigation menu') ^></h2>
                     <div class="row">
                         <ul class="list-inline menu" role="menubar">
                             <%_ for (var menuLinkIndex=0; menuLinkIndex<pr.menuLinks.length; menuLinkIndex++) {
@@ -256,8 +256,8 @@
         <%_ } -%>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != null) { -%>
-        <nav id="wb-bc" property="breadcrumb">
-            <h2><^- msg('You are here:') ^></h2>
+        <nav id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumb">
+            <h2 id="cdts-breadcrumb"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ for (var breadcrumbIndex=0; breadcrumbIndex<pr.breadcrumbs.length; breadcrumbIndex++) {
diff --git a/src/gcweb/footer.ejs b/src/gcweb/footer.ejs
index bed3e29d..2c682db7 100644
--- a/src/gcweb/footer.ejs
+++ b/src/gcweb/footer.ejs
@@ -13,8 +13,8 @@
     <%_ if (pr.contextualFooter != null) { -%>
         <div class="gc-contextual">
             <div class="container">
-                <nav>
-                    <h3><%= pr.contextualFooter.title %></h3>
+                <nav aria-labelledby="cdts-contextualFooter">
+                    <h3 id="cdts-contextualFooter"><%= pr.contextualFooter.title %></h3>
                     <%_ if (pr.contextualFooter.links != null) { -%>
                         <ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
                             <%_ for (var footerIndex=0; footerIndex<(pr.contextualFooter.links.length > 3 ? 3 : pr.contextualFooter.links.length); footerIndex++) {
diff --git a/src/gcweb/refFooter.ejs b/src/gcweb/refFooter.ejs
index aea08c5e..9cacb4a0 100644
--- a/src/gcweb/refFooter.ejs
+++ b/src/gcweb/refFooter.ejs
@@ -27,7 +27,7 @@
 <%_ if (pr.exitSecureSite != null) { -%>
     <%_ if (pr.exitSecureSite.exitScript == true) { -%>
         <%# This is a placeholder link to trigger the WET exitscript intialization in the event the no external link is present on the page -%>
-        <a href="#" id="cdts-exitscript-placeholder-link" aria-hidden="true" class="wb-exitscript cdts-hidden">Exit Link</a>
+        <a href="#" id="cdts-exitscript-placeholder-link" hidden class="wb-exitscript cdts-hidden">Exit Link</a>
         <%# When is "setup" mode, we avoid inserting an inline script element to support clients who want to use Content-Security-Policy -%>
         <%_ if (wet.utilities.isCDTSSetupMode()) {
             wet.utilities.addSetupCompletitionListener(function() {

From 7aa8cb18fa0251743a9efbdce61456445552f6a4 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Tue, 23 Jan 2024 16:48:33 -0500
Subject: [PATCH 09/28] still wip, fix appTop html-validate errors

---
 TestFileGenerator.js         |  3 ++-
 src/gcintranet/appFooter.ejs | 12 ++++++------
 src/gcintranet/top.ejs       | 12 ++++++------
 src/gcweb/appTop.ejs         | 18 +++++++++---------
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/TestFileGenerator.js b/TestFileGenerator.js
index 50474ce4..554410c6 100644
--- a/TestFileGenerator.js
+++ b/TestFileGenerator.js
@@ -29,7 +29,8 @@ function searchFunctionCalls(content) {
 
 function validateBuilderFunctions(content, theme, version) {
     const htmlValidate = new HtmlValidate(require('./htmlvalidator.conf.js')); //config path relative
-    const htmlValidateFormatReport = formatterFactory('stylish'); //possible formatters: checkstyle, codeframe, json, stylish, text
+    //const htmlValidateFormatReport = formatterFactory('stylish'); //possible formatters: checkstyle, codeframe, json, stylish, text
+    const htmlValidateFormatReport = formatterFactory('codeframe'); //possible formatters: checkstyle, codeframe, json, stylish, text
 
     function validateHTML(functionName, htmlContent) {
         const report = htmlValidate.validateStringSync(htmlContent);
diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs
index 93ff9624..a67955c2 100644
--- a/src/gcintranet/appFooter.ejs
+++ b/src/gcintranet/appFooter.ejs
@@ -19,9 +19,9 @@
                     const footerSection=pr.footerSections[sectionIndex];-%>
                     <%_ if (footerSection.customFooterLinks != null) { -%>
                         <%_ if (sectionIndex < 3) { -%>
-                            <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-footerSectionLinks">
+                            <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="<%= footerSection.sectionName %>">
                                 <%_ if (footerSection.sectionName != null) { -%>
-                                    <h3 id="cdts-footerSectionLinks"><%= footerSection.sectionName %></h3>
+                                    <h3 id="<%= footerSection.sectionName %>"><%= footerSection.sectionName %></h3>
                                 <%_ } -%>
                                 <ul class="list-unstyled">
                                     <%_ for (var linkIndex=0; linkIndex<footerSection.customFooterLinks.length; linkIndex++) {
@@ -32,9 +32,9 @@
                             </section>
                         <%_ } -%>
                     <%_ } else if (sectionIndex == 0) { /*For backward compatibility */ -%>
-                        <section class="col-md-3 col-sm-6 col-lg-3">
+                        <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="<%= footerSection.sectionName %>">
                             <%_ if (footerSection.sectionName != null) { -%>
-                                <h3><%= footerSection.sectionName %></h3>
+                                <h3 id="<%= footerSection.sectionName %>"><%= footerSection.sectionName %></h3>
                             <%_ } -%>
                             <ul class="list-unstyled">
                                 <%_ for (var linkIndex=0; linkIndex<pr.footerSections.length; linkIndex++) {
@@ -46,8 +46,8 @@
                     <%_ } -%>
                 <%_ } -%>
                 <%_ if (pr.subTheme == 'esdc' || pr.subTheme == 'labour') { -%>
-                    <section class="col-md-3 col-sm-6 col-lg-3">
-                        <h3><^- msg('Corporate') ^></h3>
+                    <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-customSection3">
+                        <h3 id="cdts-customSection3"><^- msg('Corporate') ^></h3>
                         <ul class="list-unstyled">
                             <li><a href="<^- msg('https://esdc.prv/en/branches_regions/index.shtml') ^>"><^- msg('ESDC/SC Intranet') ^></a></li>
                             <li><a href="<^- msg('https://esdc.prv/en/news/index.shtml') ^>"><^- msg('News') ^></a></li>
diff --git a/src/gcintranet/top.ejs b/src/gcintranet/top.ejs
index 58fbc393..bc07de27 100644
--- a/src/gcintranet/top.ejs
+++ b/src/gcintranet/top.ejs
@@ -53,7 +53,7 @@ if (pr.subTheme === 'eccc') {
         <%_ } -%>
     </ul>
 </nav>
-<header role="banner">
+<header role="banner" aria-label="Intranet Banner">
     <div id="wb-bnr">
         <div id="app-brand">
             <div class="container">
@@ -80,8 +80,8 @@ if (pr.subTheme === 'eccc') {
                         </div>
                     </section>
                     <%_ if (pr.GCToolsModal == true) { -%>
-                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-labelledby="cdts-hiddenGcToolsLinks">
-                            <h2 class="wb-inv" id="cdts-hiddenGcToolsLinks"><^- msg('GCTools links') ^></h2>
+                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-labelledby="cdts-gcToolsLinks">
+                            <h2 class="wb-inv" id="cdts-gcToolsLinks"><^- msg('GCTools links') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -90,8 +90,8 @@ if (pr.subTheme === 'eccc') {
                                 </div>
                             </div>
                             <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def" aria-label="<^- msg('GC Tools') ^>">
-                                <header class="modal-header">
-                                    <h2 class="modal-title"><^- msg('<span class="bold-gc">GC</span>Tools') ^></h2>
+                                <header class="modal-header" aria-labelledby="cdts-gcToolsModal">
+                                    <h2 class="modal-title" id="cdts-gcToolsModal"><^- msg('<span class="bold-gc">GC</span>Tools') ^></h2>
                                 </header>
                                 <div class="modal-body">
                                     <ul class="list-unstyled lst-spcd">
@@ -210,7 +210,7 @@ if (pr.subTheme === 'eccc') {
     </div>
     <%_ if (pr.siteMenu != false) { -%>
         <%_ if (pr.subTheme == 'esdc' || pr.subTheme == 'labour') { -%>
-            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: '/app/cls/WET/global/<^- msg('esdcmenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-esdcLabourMenu" aria-label="<^- msg('Topics menu') ^>">
+            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: '/app/cls/WET/global/<^- msg('esdcmenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Topics menu') ^>">
                 <div class="container nvbar">
                     <h2><^- msg('Topics menu') ^></h2>
                     <div class="row">
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index 3f562a1f..650101b9 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -74,9 +74,9 @@
             </div>
             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                 const item=pr.customSearch[0]; -%>
-                <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labell="<^- msg('Search') ^>">
-                    <h2><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
-                    <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" aria-label="<^- msg('Search') ^>">
+                <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-webSearch">
+                    <h2 id="cdts-webSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
+                    <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" aria-label="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>">
                         <div class="form-group wb-srch-qry">
                             <label for="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
                             <input id="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-srch-q form-control" name="<%= item.name != null? item.name: 'q' %>" type="search" value="" size="34" maxlength="170" placeholder="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>">
@@ -138,8 +138,8 @@
                     </nav>
                 <%_ } -%>
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                    <nav class="col-sm-5 hidden-xs hidden-print" aria-label="<^- msg('Account menu') ^>">
-                        <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
+                    <nav class="col-sm-5 hidden-xs hidden-print" aria-labelledby="cdts-hiddenAccountMenu">
+                        <h2 class="wb-inv" id="cdts-hiddenAccountMenu"><^- msg('Account menu') ^></h2>
                         <ul class="app-list-account list-unstyled">
                             <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
                                 const item=pr.appSettings[0]; -%>
@@ -165,8 +165,8 @@
     <%_ if (pr.customSearch != null || pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true || pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
         <div class="app-bar-mb container visible-xs-block hidden-print">
             <%_ if (pr.customSearch != null || pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%>
-                <nav aria-label="<^- msg('and search') ^>">
-                    <h2 class="wb-inv"><%_ if (pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%>Menu<%= (pr.customSearch != null)? ' <^- msg('and search') ^>': ''%><%_ } else { -%><^- msg('Search') ^><%_ } -%></h2>
+                <nav aria-labelledby="cdts-menuAndSearch">
+                    <h2 class="wb-inv" id="cdts-menuAndSearch"><%_ if (pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%>Menu<%= (pr.customSearch != null)? ' <^- msg('and search') ^>': ''%><%_ } else { -%><^- msg('Search') ^><%_ } -%></h2>
                     <ul class="app-list-main list-unstyled">
                         <%_ if (pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%><li class="wb-mb-links" id="wb-glb-mn"><a href="#mb-pnl" aria-controls="mb-pnl" class="btn overlay-lnk" role="button"><^- msg('Menu') ^></a><h2><^- msg('Menu') ^></h2></li><%_ } -%>
                         <%_ if (pr.customSearch != null) { -%><li><a href="#app-srch-mb" title="<^- msg('Search') ^>" aria-controls="app-srch-mb" class="btn overlay-lnk" role="button"><span class="glyphicon-search glyphicon" aria-hidden="true"></span><span class="wb-inv"><^- msg('Search') ^></span></a></li><%_ } -%>
@@ -198,8 +198,8 @@
                 </nav>
             <%_ } -%>
             <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-            <nav aria-label="<^- msg('Account menu') ^>">
-                <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
+            <nav aria-labelledby="cdts-accountMenu">
+                <h2 class="wb-inv" id="cdts-accountMenu"><^- msg('Account menu') ^></h2>
                 <ul class="app-list-account list-unstyled">
                     <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
                         const item=pr.appSettings[0]; -%>

From 0888b3a9ae3d7b580ff8ca1435a3c94c357c8e1f Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:07:10 -0500
Subject: [PATCH 10/28] still wip, fix gcweb-appTop-externalLinkMenu-en errors

---
 src/gcintranet/appFooter.ejs | 12 ++++++------
 src/gcintranet/appTop.ejs    |  4 ++--
 src/gcintranet/refFooter.ejs |  4 ++--
 src/gcweb/appTop.ejs         | 16 ++++++++--------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs
index a67955c2..383af3cb 100644
--- a/src/gcintranet/appFooter.ejs
+++ b/src/gcintranet/appFooter.ejs
@@ -19,9 +19,9 @@
                     const footerSection=pr.footerSections[sectionIndex];-%>
                     <%_ if (footerSection.customFooterLinks != null) { -%>
                         <%_ if (sectionIndex < 3) { -%>
-                            <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="<%= footerSection.sectionName %>">
+                            <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="<%= (footerSection.sectionName).replaceAll(/\s/g,'') %>">
                                 <%_ if (footerSection.sectionName != null) { -%>
-                                    <h3 id="<%= footerSection.sectionName %>"><%= footerSection.sectionName %></h3>
+                                    <h3 id="<%= (footerSection.sectionName).replaceAll(/\s/g,'') %>"><%= footerSection.sectionName %></h3>
                                 <%_ } -%>
                                 <ul class="list-unstyled">
                                     <%_ for (var linkIndex=0; linkIndex<footerSection.customFooterLinks.length; linkIndex++) {
@@ -32,9 +32,9 @@
                             </section>
                         <%_ } -%>
                     <%_ } else if (sectionIndex == 0) { /*For backward compatibility */ -%>
-                        <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="<%= footerSection.sectionName %>">
+                        <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-sectionName">
                             <%_ if (footerSection.sectionName != null) { -%>
-                                <h3 id="<%= footerSection.sectionName %>"><%= footerSection.sectionName %></h3>
+                                <h3 id="cdts-sectionName"><%= footerSection.sectionName %></h3>
                             <%_ } -%>
                             <ul class="list-unstyled">
                                 <%_ for (var linkIndex=0; linkIndex<pr.footerSections.length; linkIndex++) {
@@ -57,8 +57,8 @@
                         </ul>
                     </section>
                 <%_ } else if (pr.subTheme == 'eccc') { -%>
-                    <section class="col-md-3 col-sm-6 col-lg-3">
-                        <h3><^- msg('Contact Us') ^></h3>
+                    <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-contactUs">
+                        <h3 id="cdts-contactUs"><^- msg('Contact Us') ^></h3>
                         <ul class="list-unstyled">
                             <li><a href="#"><^- msg('EnviroTel') ^></a></li>
                             <li><a href="#"><^- msg('GEDS') ^></a></li>
diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 37699049..1419bbe0 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -143,8 +143,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.search != false) { -%>
-                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-labelledby="cdts-search">
-                            <h2 id="cdts-search"><^- msg('Search') ^></h2>
+                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-labelledby="cdts-gcintranetSearch">
+                            <h2 id="cdts-gcintranetSearch"><^- msg('Search') ^></h2>
                             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                                 const item=pr.customSearch[0]; -%>
                                 <form action="<%- (item.action != null)? item.action: '<^- msg('https://intranet.canada.ca/search-recherche/query-recherche-eng.aspx') ^>' %>" method="<%= (item.method != null)? item.method: 'get' %>" name="<%= (item.name != null)? item.name: 'cse-search-box'%>" role="search" class="form-inline">
diff --git a/src/gcintranet/refFooter.ejs b/src/gcintranet/refFooter.ejs
index 91750d42..75b47141 100644
--- a/src/gcintranet/refFooter.ejs
+++ b/src/gcintranet/refFooter.ejs
@@ -26,7 +26,7 @@
 <%_ if (pr.exitSecureSite != null) { -%>
     <%_ if (pr.exitSecureSite.exitScript == true) { -%>
         <%# This is a placeholder link to trigger the WET exitscript intialization in the event the no external link is present on the page -%>
-        <a href="#" id="cdts-exitscript-placeholder-link" aria-hidden="true" class="wb-exitscript cdts-hidden">Exit Link</a>
+        <a href="#" id="cdts-exitscript-placeholder-link" hidden class="wb-exitscript cdts-hidden">Exit Link</a>
         <%# When is "setup" mode, we avoid inserting an inline script element to support clients who wnat to use Content-Security-Policy -%>
         <%_ if (wet.utilities.isCDTSSetupMode()) {
             wet.utilities.addSetupCompletitionListener(function() {
@@ -38,7 +38,7 @@
     <%_ } -%>
 <%_ } else if (pr.exitScript == true) { -%>
     <%# This is only for backwards compatibility where a user implements exitscript using parameters instead of an object. -%>
-    <a href="#" id="cdts-exitscript-placeholder-link" style="display: none" aria-hidden="true" class="wb-exitscript">Exit Link</a>
+    <a href="#" id="cdts-exitscript-placeholder-link" style="display: none" hidden class="wb-exitscript">Exit Link</a>
     <script data-id="exitScript">wet.utilities.cdtsApplyExitScriptToLinks("<%=pr.displayModal != null? pr.displayModal: 'undefined'%>", "<%-pr.exitURL != null? pr.exitURL: 'undefined'%>", "<%=pr.exitDomains != null? pr.exitDomains: 'undefined'%>", "<%=pr.exitMsg != null? pr.exitMsg: 'undefined'%>", "<%=pr.yesMsg != null? pr.yesMsg: 'undefined'%>", "<%=pr.cancelMsg != null? pr.cancelMsg: 'undefined'%>", "<%=pr.msgBoxHeader != null? pr.msgBoxHeader: 'undefined'%>", "<%=pr.targetWarning != null? pr.targetWarning: 'undefined'%>", "<%=pr.displayModalForNewWindow != null? pr.displayModalForNewWindow: 'undefined'%>");</script>
 <%_ } -%>
 <%_ if (pr.webAnalytics != null && pr.webAnalytics != false && !wet.utilities.isCDTSSetupMode()) { -%>
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index 650101b9..173ed08c 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -74,8 +74,8 @@
             </div>
             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                 const item=pr.customSearch[0]; -%>
-                <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-webSearch">
-                    <h2 id="cdts-webSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
+                <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-topSearch">
+                    <h2 id="cdts-topSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
                     <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" aria-label="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>">
                         <div class="form-group wb-srch-qry">
                             <label for="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
@@ -138,8 +138,8 @@
                     </nav>
                 <%_ } -%>
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                    <nav class="col-sm-5 hidden-xs hidden-print" aria-labelledby="cdts-hiddenAccountMenu">
-                        <h2 class="wb-inv" id="cdts-hiddenAccountMenu"><^- msg('Account menu') ^></h2>
+                    <nav class="col-sm-5 hidden-xs hidden-print" aria-label="Navigation Account Menu">
+                        <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
                         <ul class="app-list-account list-unstyled">
                             <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
                                 const item=pr.appSettings[0]; -%>
@@ -174,12 +174,12 @@
                     <div id="mb-pnl"></div>
                     <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                         const item=pr.customSearch[0]; -%>
-                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t" arial-label="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>">
+                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t" aria-label="Application Search">
                             <div class="modal-header">
                                 <h3 class="modal-title"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h3>
                             </div>
                             <div class="modal-body">
-                                <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" class="form-inline" aria-label="<^- msg('Search') ^>">
+                                <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" class="form-inline" aria-label="Enter search criteria">
                                     <div class="input-group">
                                         <label for="<%= item.id != null? 'app-' + item.id: 'app-srch-q-mb' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
                                         <input placeholder="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>" id="<%= item.id != null? 'app-' + item.id: 'app-srch-q-mb' %>" class="app-srch-q-mb form-control" name="q" type="search" value="" size="27" maxlength="150">
@@ -198,8 +198,8 @@
                 </nav>
             <%_ } -%>
             <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-            <nav aria-labelledby="cdts-accountMenu">
-                <h2 class="wb-inv" id="cdts-accountMenu"><^- msg('Account menu') ^></h2>
+            <nav aria-label="Application Account Menu">
+                <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
                 <ul class="app-list-account list-unstyled">
                     <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
                         const item=pr.appSettings[0]; -%>

From d00bf59897f607ae41404432e2ed388d425eb6a3 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:30:10 -0500
Subject: [PATCH 11/28] still wip, fix the aria-label to contain text

---
 src/gcintranet/appFooter.ejs        | 12 ++++++----
 src/gcintranet/wet-messages.en.json |  4 ++++
 src/gcintranet/wet-messages.fr.json |  4 ++++
 test/pageobjects/appFooter.page.js  |  1 +
 test/specs/appFooter.js             | 36 +++++++++++++++++++++++++++++
 wdio.conf.js                        |  3 ++-
 6 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs
index 383af3cb..d03668ec 100644
--- a/src/gcintranet/appFooter.ejs
+++ b/src/gcintranet/appFooter.ejs
@@ -19,9 +19,11 @@
                     const footerSection=pr.footerSections[sectionIndex];-%>
                     <%_ if (footerSection.customFooterLinks != null) { -%>
                         <%_ if (sectionIndex < 3) { -%>
-                            <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="<%= (footerSection.sectionName).replaceAll(/\s/g,'') %>">
                                 <%_ if (footerSection.sectionName != null) { -%>
-                                    <h3 id="<%= (footerSection.sectionName).replaceAll(/\s/g,'') %>"><%= footerSection.sectionName %></h3>
+                                    <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-footerSection<%= sectionIndex %>">
+                                    <h3 id="cdts-footerSection<%= sectionIndex %>"><%= footerSection.sectionName %></h3>
+                                <%_ } else { -%>
+                                    <section class="col-md-3 col-sm-6 col-lg-3" aria-label="<^- msg('Footer') ^>">
                                 <%_ } -%>
                                 <ul class="list-unstyled">
                                     <%_ for (var linkIndex=0; linkIndex<footerSection.customFooterLinks.length; linkIndex++) {
@@ -32,9 +34,11 @@
                             </section>
                         <%_ } -%>
                     <%_ } else if (sectionIndex == 0) { /*For backward compatibility */ -%>
-                        <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-sectionName">
                             <%_ if (footerSection.sectionName != null) { -%>
-                                <h3 id="cdts-sectionName"><%= footerSection.sectionName %></h3>
+                                <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-footerSection">
+                                <h3 id="cdts-footerSection"><%= footerSection.sectionName %></h3>
+                            <%_ } else { -%>
+                                <section class="col-md-3 col-sm-6 col-lg-3" aria-label="<^- msg('Footer') ^>">
                             <%_ } -%>
                             <ul class="list-unstyled">
                                 <%_ for (var linkIndex=0; linkIndex<pr.footerSections.length; linkIndex++) {
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index 3c5369b1..fb57ae4e 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -9,6 +9,10 @@
         "source": "Related links",
         "target": null
     },
+    "26c01e70a337f208f56dae1c3bc18f60c4bff453": {
+        "source": "Footer",
+        "target": null
+    },
     "1d8b1236d7b70a9ca73929aa23ac4bfd96450bb1": {
         "source": "This link will open in a new window",
         "target": null
diff --git a/src/gcintranet/wet-messages.fr.json b/src/gcintranet/wet-messages.fr.json
index 699f97d8..e622e225 100644
--- a/src/gcintranet/wet-messages.fr.json
+++ b/src/gcintranet/wet-messages.fr.json
@@ -448,5 +448,9 @@
     "5a4356b4e754ea9c3775e8c156860a6e18ab6b54": {
         "source": "GC Tools",
         "target": "Outils GC"
+    },
+    "26c01e70a337f208f56dae1c3bc18f60c4bff453": {
+        "source": "Footer",
+        "target": "Pied de page"
     }
 }
\ No newline at end of file
diff --git a/test/pageobjects/appFooter.page.js b/test/pageobjects/appFooter.page.js
index 1bd61494..29d7ca5d 100644
--- a/test/pageobjects/appFooter.page.js
+++ b/test/pageobjects/appFooter.page.js
@@ -26,6 +26,7 @@ class AppFooterPage extends Page {
     get customFooterLinkTextSubTheme() { return $('//footer[@id="wb-info"]/nav/h2/following-sibling::div/section[4]/h3'); }
     get cssScriptESDC() { return $('//head/link[contains(@href, "/cdts/esdc.css")] | //head/link[contains(@href, "cdts-esdc-styles.css")] | //head/link[contains(@href, "cdts-labour-styles.css")]'); }
     get cssScriptECCC() { return $('//head/link[contains(@href, "/cdts/eccc.css")] | //head/link[contains(@href, "cdts-eccc-styles.css")]'); }
+    get footerSectionIntranet() { return $('//footer/nav/div/section[@class="col-md-3 col-sm-6 col-lg-3"]')}
 
     /**
     * Opens a sub page of the page
diff --git a/test/specs/appFooter.js b/test/specs/appFooter.js
index ab955103..b02d74ce 100644
--- a/test/specs/appFooter.js
+++ b/test/specs/appFooter.js
@@ -241,6 +241,22 @@ describe('AppFooter section tests for GCIntranet', () => {
         refFooter: '{"cdnEnv": "localhost"}'
 	});
 
+    generateTestFile('./test/html/gcintranet/template-gcintranetapp-en.html', 'gcintranet', 'gcintranet-appFooter-noFooterSectionName-en', {
+        refTop: '{"cdnEnv": "localhost", "subTheme": "labour"}',
+        appTop: '{"cdnEnv": "localhost", "appName": [{"text": "Application name", "href": "#"}]}',
+        preFooter: '{"cdnEnv": "localhost"}',
+        appFooter: '{"subTheme":"labour", "footerSections":[{ "customFooterLinks":[{ "href":"#", "text":"link1-1-new Window", "newWindow":true }] }, { "sectionName":"Custom Section 2", "customFooterLinks":[{ "href":"#", "text":"link2-1-new Window", "newWindow":true }] }, { "sectionName":"Custom Section 3", "customFooterLinks":[{ "href":"#", "text":"link3-1-new Window", "newWindow":true }] }], "cdnEnv": "localhost"}',
+        refFooter: '{"cdnEnv": "localhost"}'
+	});
+
+    generateTestFile('./test/html/gcintranet/template-gcintranetapp-fr.html', 'gcintranet', 'gcintranet-appFooter-noFooterSectionName-fr', {
+        refTop: '{"cdnEnv": "localhost"}',
+        appTop: '{"cdnEnv": "localhost", "appName": [{"text": "Application name", "href": "#"}]}',
+        preFooter: '{"cdnEnv": "localhost"}',
+        appFooter: '{"subTheme":"labour", "footerSections":[{ "customFooterLinks":[{ "href":"#", "text":"link1-1-new Window", "newWindow":true }] }, { "sectionName":"Custom Section 2", "customFooterLinks":[{ "href":"#", "text":"link2-1-new Window", "newWindow":true }] }, { "sectionName":"Custom Section 3", "customFooterLinks":[{ "href":"#", "text":"link3-1-new Window", "newWindow":true }] }], "cdnEnv": "localhost"}',
+        refFooter: '{"cdnEnv": "localhost"}'
+	});
+
     it('Validate the footer links', async () => {
         await footerLinksIntranet(theme, 'en');
         await footerLinksIntranet(theme, 'fr');
@@ -294,6 +310,16 @@ describe('AppFooter section tests for GCIntranet', () => {
         await cssScriptECCC(theme, 'en');
     });
 
+    it('Test if aria-label when no footer section name', async () => {
+        await customFooterNoSectionName(theme, 'en');
+        await customFooterNoSectionName(theme, 'fr');
+    });
+
+    it('Test if aria-labelledby with footer section name', async () => {
+        await customFooterWithSectionName(theme, 'en');
+        await customFooterWithSectionName(theme, 'fr');
+    });
+
     it('Accessibility', async () => {
         await accessibility(theme, 'en');
         await accessibility(theme, 'fr');
@@ -415,6 +441,16 @@ async function footerContactLink(theme, lang){
     await expect(appFooterPage.contactLink).toHaveHrefContaining('contactLinksTest');
 }
 
+async function customFooterNoSectionName(theme, lang){
+    await appFooterPage.open(theme, lang, 'noFooterSectionName');
+    await expect(appFooterPage.footerSectionIntranet).toHaveAttribute('aria-label');
+}
+
+async function customFooterWithSectionName(theme, lang){
+    await appFooterPage.open(theme, lang);
+    await expect(appFooterPage.footerSectionIntranet).toHaveAttribute('aria-labelledby');
+}
+
 async function accessibility(theme, lang) {
     await appFooterPage.open(theme, lang);
     await runAccessbilityTest();
diff --git a/wdio.conf.js b/wdio.conf.js
index 495679d6..0156c13b 100644
--- a/wdio.conf.js
+++ b/wdio.conf.js
@@ -36,7 +36,8 @@ exports.config = {
     // directory is where your package.json resides, so `wdio` will be called from there.
     //
     specs: [
-        './test/specs/**/*.js'
+        // './test/specs/**/*.js'
+        './test/specs/**/appFooter.js'
     ],
     // Patterns to exclude.
     exclude: [

From 2954dbfb0280ed89731a98d0ddc2b65f3f3aa1ee Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:59:10 -0500
Subject: [PATCH 12/28] still wip, finish correcting appTop gcintranet

---
 TestFileGenerator.js                |  1 -
 src/gcintranet/appFooter.ejs        |  2 +-
 src/gcintranet/appTop.ejs           | 16 ++++++++--------
 src/gcintranet/wet-messages.en.json | 16 ++++++++--------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/TestFileGenerator.js b/TestFileGenerator.js
index 554410c6..831f6d94 100644
--- a/TestFileGenerator.js
+++ b/TestFileGenerator.js
@@ -29,7 +29,6 @@ function searchFunctionCalls(content) {
 
 function validateBuilderFunctions(content, theme, version) {
     const htmlValidate = new HtmlValidate(require('./htmlvalidator.conf.js')); //config path relative
-    //const htmlValidateFormatReport = formatterFactory('stylish'); //possible formatters: checkstyle, codeframe, json, stylish, text
     const htmlValidateFormatReport = formatterFactory('codeframe'); //possible formatters: checkstyle, codeframe, json, stylish, text
 
     function validateHTML(functionName, htmlContent) {
diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs
index d03668ec..9141fdf8 100644
--- a/src/gcintranet/appFooter.ejs
+++ b/src/gcintranet/appFooter.ejs
@@ -8,7 +8,7 @@
  * @param? cdnEnv Used to switch between qat, nonprod, and prod CDN implementations.
 -%>
 <%_ if (pr.showFeatures == true) { -%>
-    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>" aria-label="<^- msg('activities-footer-eng.html') ^>"></section>
+    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>" aria-label="<^- msg('Activities and initiatives') ^>"></section>
 <%_ } -%>
 <footer role="contentinfo" id="wb-info">
     <%_ if (pr.footerSections != null) { -%>
diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 1419bbe0..93efa339 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -60,7 +60,7 @@ if (pr.subTheme === 'eccc') {
         <div id="app-brand">
             <div class="container">
                 <div class="row">
-                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="cdts-intranetTitle">
+                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="<^- msg('GC') ^><^- msg('intranet') ^>">
                         <div class="app-name<%- (pr.intranetTitle != null)? ' app-name-lg': '' %>">
                             <%_ if (pr.intranetTitle != null && pr.intranetTitle.length > 0) {
                                 const item=pr.intranetTitle[0]; -%>
@@ -82,8 +82,8 @@ if (pr.subTheme === 'eccc') {
                         </div>
                     </section>
                     <%_ if (pr.GCToolsModal == true) { -%>
-                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-label="cdts-gctoolsModalLinks">
-                            <h2 class="wb-inv"><^- msg('GCTools links') ^></h2>
+                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-labelledby="cdts-hiddenGctools">
+                            <h2 class="wb-inv" id="cdts-hiddenGctools"><^- msg('GCTools links') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -108,7 +108,7 @@ if (pr.subTheme === 'eccc') {
                             </section>
                         </section>
                     <%_ } else if (pr.intranetTitle == null) { /* (...== null) is intentional, not (...!= null) */-%>
-                        <section id="wb-gctools" class="col-lg-6 visible-lg" aria-label="cdts-gctoolsLinks">
+                        <section id="wb-gctools" class="col-lg-6 visible-lg" aria-label="<^- msg('GC Tools') ^>">
                             <div class="pull-left tool-link">
                                 <a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>">
                                 <^- msg('<span class="bold-gc">GC</span>connex') ^></a>
@@ -128,7 +128,7 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.lngLinks != null) { -%>
-                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-label="cdts-languageLinks">
+                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-labelledby="cdts-languageLinks">
                             <h2 class="wb-inv" id="cdts-languageLinks"><^- msg('Language selection') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
@@ -143,8 +143,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.search != false) { -%>
-                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-labelledby="cdts-gcintranetSearch">
-                            <h2 id="cdts-gcintranetSearch"><^- msg('Search') ^></h2>
+                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-labelledby="cdts-hiddenSearch">
+                            <h2 id="cdts-hiddenSearch"><^- msg('Search') ^></h2>
                             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                                 const item=pr.customSearch[0]; -%>
                                 <form action="<%- (item.action != null)? item.action: '<^- msg('https://intranet.canada.ca/search-recherche/query-recherche-eng.aspx') ^>' %>" method="<%= (item.method != null)? item.method: 'get' %>" name="<%= (item.name != null)? item.name: 'cse-search-box'%>" role="search" class="form-inline">
@@ -199,7 +199,7 @@ if (pr.subTheme === 'eccc') {
                 </div>
                 <%_ if (pr.GCToolsModal != true) { -%>
                     <div id="tools-sm" class="row<%- (pr.intranetTitle != null)? '': ' visible-md' %>">
-                        <section id="tool-container-sm" class="col-md-12 col-sm-12" aria-label="cdts-gctoolsModalLinks">
+                        <section id="tool-container-sm" class="col-md-12 col-sm-12" aria-label="<^- msg('GCTools links') ^>">
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>connex') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://www.gcpedia.gc.ca/wiki/?setlang=en') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>pedia') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcdirectory-gcannuaire.gc.ca/en/GCD/?pgid=002') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>directory') ^></a></div>
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index fb57ae4e..34685bd2 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -5,6 +5,10 @@
         "source": "activities-footer-eng.html",
         "target": null
     },
+    "d8cde1c29b61c58e4ef757161e59991a22d66763": {
+        "source": "Activities and initiatives",
+        "target": null
+    },
     "2256cc6ee2a5d077491a8a63ef76ac743c25d2d2": {
         "source": "Related links",
         "target": null
@@ -273,6 +277,10 @@
         "source": "<span class=\"bold-gc\">GC</span>intranet",
         "target": null
     },
+    "5a4356b4e754ea9c3775e8c156860a6e18ab6b54": {
+        "source": "GC Tools",
+        "target": null
+    },
     "4715fce1fdbafc47a29ff9d0c1be459d8eafd034": {
         "source": "Language selection",
         "target": null
@@ -321,10 +329,6 @@
         "source": "You are here:",
         "target": null
     },
-    "d8cde1c29b61c58e4ef757161e59991a22d66763": {
-        "source": "Activities and initiatives",
-        "target": null
-    },
     "0052b2c1760a4b2697c109bc3a864419bf33ecd2": {
         "source": "https://intranet.canada.ca/contact-eng.asp",
         "target": null
@@ -369,10 +373,6 @@
         "source": "Section menu",
         "target": null
     },
-    "5a4356b4e754ea9c3775e8c156860a6e18ab6b54": {
-        "source": "GC Tools",
-        "target": null
-    },
     "f43ac2b672a1db811dd7168a1e7cc1add2fb79b0": {
         "source": "esdcmenu-eng.html",
         "target": null

From 24d3561adf4c0910fd8e7e971c918725b28bb298 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Tue, 30 Jan 2024 17:12:15 -0500
Subject: [PATCH 13/28] still wip, continue fixing errors

---
 StaticFileCreator.js                | 2 +-
 src/gcintranet/appTop.ejs           | 4 ++--
 src/gcintranet/wet-messages.en.json | 4 ++++
 src/gcintranet/wet-messages.fr.json | 4 ++++
 src/gcweb/appTop.ejs                | 4 ++--
 wdio.conf.js                        | 3 +--
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/StaticFileCreator.js b/StaticFileCreator.js
index adceb9d7..4376bdc6 100644
--- a/StaticFileCreator.js
+++ b/StaticFileCreator.js
@@ -57,7 +57,7 @@ function createStaticFallbackFile(grunt, definition, language) {
 
     //---[ Validate HTML before we save
     const htmlValidate = new HtmlValidate(require('./htmlvalidator.conf.js'));
-    const htmlValidateFormatReport = formatterFactory('stylish'); //possible formatters: checkstyle, codeframe, json, stylish, text
+    const htmlValidateFormatReport = formatterFactory('codeframe'); //possible formatters: checkstyle, codeframe, json, stylish, text
     const report = htmlValidate.validateStringSync(output);
     if ((!report.valid) || (report.warningCount > 0)) {
         grunt.log.error(`${targetFileName}: ${report.errorCount} error(s), ${report.warningCount} warning(s) reported:`);
diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 93efa339..654392d1 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -251,7 +251,7 @@ if (pr.subTheme === 'eccc') {
         </div>
     </div>
     <%_ if (pr.menuLinks != null) { -%>
-        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-menuLinks">
+        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Main navigation menu') ^>">
             <div class="pnl-strt container nvbar">
                 <h2 class="wb-inv"><^- msg('Main navigation menu') ^></h2>
                 <div class="row">
@@ -289,7 +289,7 @@ if (pr.subTheme === 'eccc') {
             </div>
         </nav>
     <%_ } else if (pr.menuPath != null) { -%>
-        <nav role="navigation" id="wb-smapp" data-ajax-replace="<%= pr.menuPath %>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="cdts-menuPath"></nav>
+        <nav role="navigation" id="wb-smapp" data-ajax-replace="<%= pr.menuPath %>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Application menu') ^>"></nav>
     <%_ } else { -%>
         <div id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('appmenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu hidden-sm hidden-xs"></div>
     <%_ } -%>
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index 34685bd2..a009cda9 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -321,6 +321,10 @@
         "source": "GCTools",
         "target": null
     },
+    "4fd0ed7e7a474d24b9db775b6bf8fa2727beaa1d": {
+        "source": "Application menu",
+        "target": null
+    },
     "616127b124840170bb853584ca52fbb610817859": {
         "source": "appmenu-eng.html",
         "target": null
diff --git a/src/gcintranet/wet-messages.fr.json b/src/gcintranet/wet-messages.fr.json
index e622e225..4604b088 100644
--- a/src/gcintranet/wet-messages.fr.json
+++ b/src/gcintranet/wet-messages.fr.json
@@ -452,5 +452,9 @@
     "26c01e70a337f208f56dae1c3bc18f60c4bff453": {
         "source": "Footer",
         "target": "Pied de page"
+    },
+    "4fd0ed7e7a474d24b9db775b6bf8fa2727beaa1d": {
+        "source": "Application menu",
+        "target": "Menu de l'application"
     }
 }
\ No newline at end of file
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index 173ed08c..3cc0c99d 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -101,9 +101,9 @@
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
                     <section class="col-xs-12 col-sm-7" aria-label="<^- msg('Name of Web application') ^>">
                 <%_ } else if (pr.headerMenu != null) { -%>
-                    <section class="col-xs-12 col-sm-9 cdts-app-title-menu">
+                    <section class="col-xs-12 col-sm-9 cdts-app-title-menu" aria-label="<^- msg('Name of Web application') ^>">
                 <%_ } else { -%>
-                    <section class="col-xs-12">
+                    <section class="col-xs-12" aria-label="<^- msg('Name of Web application') ^>">
                 <%_ } -%>
                 <%_ if (pr.appName != null && pr.appName.length > 0) {
                     const item=pr.appName[0]; -%>
diff --git a/wdio.conf.js b/wdio.conf.js
index 0156c13b..495679d6 100644
--- a/wdio.conf.js
+++ b/wdio.conf.js
@@ -36,8 +36,7 @@ exports.config = {
     // directory is where your package.json resides, so `wdio` will be called from there.
     //
     specs: [
-        // './test/specs/**/*.js'
-        './test/specs/**/appFooter.js'
+        './test/specs/**/*.js'
     ],
     // Patterns to exclude.
     exclude: [

From 0b0972b0901ed83c2466d0829fb347bb80bbf7ca Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Wed, 31 Jan 2024 16:55:02 -0500
Subject: [PATCH 14/28] still wip, fix errors in
 gcintranet-appTop-externalLinkMenu-en

---
 src/gcintranet/appFooter.ejs   |  4 ++--
 src/gcintranet/appTop.ejs      |  4 ++--
 src/gcweb/appTop.ejs           | 36 +++++++++++++++++-----------------
 src/gcweb/wet-messages.en.json | 36 ++++++++++++++++++++++++++++++----
 src/gcweb/wet-messages.fr.json | 28 ++++++++++++++++++++++++++
 5 files changed, 82 insertions(+), 26 deletions(-)

diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs
index 9141fdf8..21c87804 100644
--- a/src/gcintranet/appFooter.ejs
+++ b/src/gcintranet/appFooter.ejs
@@ -50,8 +50,8 @@
                     <%_ } -%>
                 <%_ } -%>
                 <%_ if (pr.subTheme == 'esdc' || pr.subTheme == 'labour') { -%>
-                    <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-customSection3">
-                        <h3 id="cdts-customSection3"><^- msg('Corporate') ^></h3>
+                    <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-sectionCorporate">
+                        <h3 id="cdts-sectionCorporate"><^- msg('Corporate') ^></h3>
                         <ul class="list-unstyled">
                             <li><a href="<^- msg('https://esdc.prv/en/branches_regions/index.shtml') ^>"><^- msg('ESDC/SC Intranet') ^></a></li>
                             <li><a href="<^- msg('https://esdc.prv/en/news/index.shtml') ^>"><^- msg('News') ^></a></li>
diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 654392d1..037a73c4 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -128,8 +128,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.lngLinks != null) { -%>
-                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-labelledby="cdts-languageLinks">
-                            <h2 class="wb-inv" id="cdts-languageLinks"><^- msg('Language selection') ^></h2>
+                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-labelledby="cdts-languageSelection">
+                            <h2 class="wb-inv" id="cdts-languageSelection"><^- msg('Language selection') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index 3cc0c99d..c41bf017 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -25,8 +25,8 @@
     </ul>
 </nav>
 <%_ if (pr.infoBanner != null) { -%>
-    <header>
-        <section class="bg-info">
+    <header aria-label="<^- msg('Header background') ^>">
+        <section class="bg-info" aria-label="<^- msg('Info background') ^>">
             <div class="container">
                 <%_ if (pr.infoBanner.mainHTML != null) { -%>
                     <p class="cdts-banner-text"><%- pr.infoBanner.mainHTML %></p>
@@ -46,12 +46,12 @@
         </section>
     </header>
 <%_ } -%>
-<header>
+<header aria-label="<^- msg('Government of Canada header') ^>">
     <div id="wb-bnr" class="container">
         <div class="row">
             <%_ if (pr.lngLinks != null) { -%>
-                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right" aria-labelledby="cdts-languageLinks">
-                    <h2 class="wb-inv" id="cdts-languageLinks"><^- msg('Language selection') ^></h2>
+                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right" aria-labelledby="cdts-languageSelection">
+                    <h2 class="wb-inv" id="cdts-languageSelection"><^- msg('Language selection') ^></h2>
                     <ul class="list-inline mrgn-bttm-0">
                         <%_ for (var linkIndex=0; linkIndex<pr.lngLinks.length; linkIndex++) {
                             const link=pr.lngLinks[linkIndex];-%>
@@ -76,7 +76,7 @@
                 const item=pr.customSearch[0]; -%>
                 <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-topSearch">
                     <h2 id="cdts-topSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
-                    <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" aria-label="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>">
+                    <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" aria-label="<^- msg('Search Canada.ca') ^>">
                         <div class="form-group wb-srch-qry">
                             <label for="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
                             <input id="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-srch-q form-control" name="<%= item.name != null? item.name: 'q' %>" type="search" value="" size="34" maxlength="170" placeholder="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>">
@@ -113,12 +113,12 @@
                 </section>
                 <%_ if (pr.headerMenu != null && pr.menuPath == null && pr.menuLinks == null) {
                     const item=pr.headerMenu[0]; -%>
-                    <div class="cdts-hidden" aria-hidden="true">
+                    <div class="cdts-hidden" hidden>
                         <ul><li id="wb-glb-mn"><a href="#mb-pnl"></a><h2><^- msg('Menu') ^></h2></li></ul>
                         <div id="mb-pnl"></div>
                     </div>
-                    <nav id="cdts-header-menu" data-trgt="mb-pnl" class="cdts-menu-rectangle wb-menu" typeof="SiteNavigationElement" aria-labelledby="appNavMenu">
-                        <h2 class="wb-inv" id="appNavMenu"><^- msg('Header navigation menu') ^></h2>
+                    <nav id="cdts-header-menu" data-trgt="mb-pnl" class="cdts-menu-rectangle wb-menu" typeof="SiteNavigationElement" aria-labelledby="cdts-headerMenu">
+                        <h2 class="wb-inv" id="cdts-headerMenu"><^- msg('Header navigation menu') ^></h2>
                         <ul class="list-inline menu" role="menubar">
                             <li role="none" class="cdts-menu-list-width">
                             <a href="#" class="cdts-menu-label item" role="menuitem" aria-haspopup="true"><span class="glyphicon glyphicon-user cdts-menu-icon"></span><%= (pr.headerMenu.text == null)? ' <^- msg('Account') ^>': pr.headerMenu.text %><span class="glyphicon glyphicon-chevron-down cdts-menu-chevron"></span><span class="glyphicon glyphicon-chevron-up cdts-menu-chevron-up"></span></a>
@@ -138,7 +138,7 @@
                     </nav>
                 <%_ } -%>
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                    <nav class="col-sm-5 hidden-xs hidden-print" aria-label="Navigation Account Menu">
+                    <nav class="col-sm-5 hidden-xs hidden-print" aria-label="<^- msg('Hidden Account menu') ^>">
                         <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
                         <ul class="app-list-account list-unstyled">
                             <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
@@ -165,8 +165,8 @@
     <%_ if (pr.customSearch != null || pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true || pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
         <div class="app-bar-mb container visible-xs-block hidden-print">
             <%_ if (pr.customSearch != null || pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%>
-                <nav aria-labelledby="cdts-menuAndSearch">
-                    <h2 class="wb-inv" id="cdts-menuAndSearch"><%_ if (pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%>Menu<%= (pr.customSearch != null)? ' <^- msg('and search') ^>': ''%><%_ } else { -%><^- msg('Search') ^><%_ } -%></h2>
+                <nav aria-labelledby="cdts-hiddenMenuAndSearch">
+                    <h2 class="wb-inv" id="cdts-hiddenMenuAndSearch"><%_ if (pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%>Menu<%= (pr.customSearch != null)? ' <^- msg('and search') ^>': ''%><%_ } else { -%><^- msg('Search') ^><%_ } -%></h2>
                     <ul class="app-list-main list-unstyled">
                         <%_ if (pr.menuPath != null || pr.menuLinks != null || pr.topSecMenu == true) { -%><li class="wb-mb-links" id="wb-glb-mn"><a href="#mb-pnl" aria-controls="mb-pnl" class="btn overlay-lnk" role="button"><^- msg('Menu') ^></a><h2><^- msg('Menu') ^></h2></li><%_ } -%>
                         <%_ if (pr.customSearch != null) { -%><li><a href="#app-srch-mb" title="<^- msg('Search') ^>" aria-controls="app-srch-mb" class="btn overlay-lnk" role="button"><span class="glyphicon-search glyphicon" aria-hidden="true"></span><span class="wb-inv"><^- msg('Search') ^></span></a></li><%_ } -%>
@@ -174,12 +174,12 @@
                     <div id="mb-pnl"></div>
                     <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                         const item=pr.customSearch[0]; -%>
-                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t" aria-label="Application Search">
+                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t" aria-label="<^- msg('Application Search') ^>">
                             <div class="modal-header">
                                 <h3 class="modal-title"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h3>
                             </div>
                             <div class="modal-body">
-                                <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" class="form-inline" aria-label="Enter search criteria">
+                                <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" class="form-inline" aria-label="<^- msg('Enter Search Criteria') ^>">
                                     <div class="input-group">
                                         <label for="<%= item.id != null? 'app-' + item.id: 'app-srch-q-mb' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
                                         <input placeholder="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>" id="<%= item.id != null? 'app-' + item.id: 'app-srch-q-mb' %>" class="app-srch-q-mb form-control" name="q" type="search" value="" size="27" maxlength="150">
@@ -198,7 +198,7 @@
                 </nav>
             <%_ } -%>
             <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-            <nav aria-label="Application Account Menu">
+            <nav aria-label="<^- msg('Account menu') ^>">
                 <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
                 <ul class="app-list-account list-unstyled">
                     <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
@@ -252,12 +252,12 @@
                 </div>
             </nav>
         <%_ } else if (pr.menuPath != null) { -%>
-            <nav id="wb-sm" data-ajax-replace="<%= pr.menuPath %>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement"></nav>
+            <nav id="wb-sm" data-ajax-replace="<%= pr.menuPath %>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Application menu') ^>"></nav>
         <%_ } -%>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != null) { -%>
-        <nav id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumb">
-            <h2 id="cdts-breadcrumb"><^- msg('You are here:') ^></h2>
+        <nav id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbs">
+            <h2 id="cdts-breadcrumbs"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ for (var breadcrumbIndex=0; breadcrumbIndex<pr.breadcrumbs.length; breadcrumbIndex++) {
diff --git a/src/gcweb/wet-messages.en.json b/src/gcweb/wet-messages.en.json
index 1ce911d1..282e2b9d 100644
--- a/src/gcweb/wet-messages.en.json
+++ b/src/gcweb/wet-messages.en.json
@@ -69,6 +69,18 @@
         "source": "Skip to section menu",
         "target": null
     },
+    "394ff0854e04312b74d6e66e842c922a57d46bc0": {
+        "source": "Header background",
+        "target": null
+    },
+    "b9ed4d3f767502a5a2d7accc300f7d3bca531528": {
+        "source": "Info background",
+        "target": null
+    },
+    "fbe4fbceb306983b8ba26aace9d291ecee0b86e0": {
+        "source": "Government of Canada header",
+        "target": null
+    },
     "4715fce1fdbafc47a29ff9d0c1be459d8eafd034": {
         "source": "Language selection",
         "target": null
@@ -93,6 +105,10 @@
         "source": "Search",
         "target": null
     },
+    "3c685f9af92701f89a80a8bd6b342f8b6309b1ff": {
+        "source": "Search Canada.ca",
+        "target": null
+    },
     "63f3f0da3e2031cedf938ea18363e51a893e095d": {
         "source": "Name of Web application",
         "target": null
@@ -109,6 +125,10 @@
         "source": "Account",
         "target": null
     },
+    "1b11927165d524f390cf506603ce1954e9328507": {
+        "source": "Hidden Account menu",
+        "target": null
+    },
     "60f5a30c306c03775734e687edd561829f213769": {
         "source": "Account menu",
         "target": null
@@ -129,10 +149,22 @@
         "source": "and search",
         "target": null
     },
+    "32a81f0e50f1707a800cb747fcccc527f6dc0bd3": {
+        "source": "Application Search",
+        "target": null
+    },
+    "04f64416e81d58b4370c341b9dad48567c058e9f": {
+        "source": "Enter Search Criteria",
+        "target": null
+    },
     "11b5a68a90c1de36a7f61d1b289fa4a9e547c19a": {
         "source": "Main navigation menu",
         "target": null
     },
+    "4fd0ed7e7a474d24b9db775b6bf8fa2727beaa1d": {
+        "source": "Application menu",
+        "target": null
+    },
     "a902791b8ecb6e346f745709cdd2db1287db6fa5": {
         "source": "You are here:",
         "target": null
@@ -373,10 +405,6 @@
         "source": "https://www.canada.ca/en/sr/srb.html",
         "target": null
     },
-    "3c685f9af92701f89a80a8bd6b342f8b6309b1ff": {
-        "source": "Search Canada.ca",
-        "target": null
-    },
     "cb711be644fab2f119f120823991b3fedd7ea523": {
         "source": "<span class=\"wb-inv\">Main </span>Menu",
         "target": null
diff --git a/src/gcweb/wet-messages.fr.json b/src/gcweb/wet-messages.fr.json
index fd0b4d21..26d6d96e 100644
--- a/src/gcweb/wet-messages.fr.json
+++ b/src/gcweb/wet-messages.fr.json
@@ -396,5 +396,33 @@
     "1a0c4e17cf587221c1eb52d9b205afc3525a91a2": {
         "source": "Report a problem on this page",
         "target": "Signaler un problème sur cette page"
+    },
+    "4fd0ed7e7a474d24b9db775b6bf8fa2727beaa1d": {
+        "source": "Application menu",
+        "target": "Menu de l'application"
+    },
+    "32a81f0e50f1707a800cb747fcccc527f6dc0bd3": {
+        "source": "Application Search",
+        "target": "Recherche de l'application"
+    },
+    "04f64416e81d58b4370c341b9dad48567c058e9f": {
+        "source": "Enter Search Criteria",
+        "target": "Entrez les critères de recherche"
+    },
+    "1b11927165d524f390cf506603ce1954e9328507": {
+        "source": "Hidden Account menu",
+        "target": "Menu compte masqué"
+    },
+    "b9ed4d3f767502a5a2d7accc300f7d3bca531528": {
+        "source": "Info background",
+        "target": "Arrière-plan de renseignements"
+    },
+    "394ff0854e04312b74d6e66e842c922a57d46bc0": {
+        "source": "Header background",
+        "target": "Le fond de l'en-tête"
+    },
+    "fbe4fbceb306983b8ba26aace9d291ecee0b86e0": {
+        "source": "Government of Canada header",
+        "target": "En-tête du gouvernement du Canada"
     }
 }
\ No newline at end of file

From 09ec7ce91677e0904615f9e9c90b3eccb404416a Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:33:59 -0500
Subject: [PATCH 15/28] tests passed html-validate

---
 src/gcintranet/appTop.ejs           | 12 ++++++------
 src/gcintranet/wet-messages.en.json |  8 ++++++++
 src/gcintranet/wet-messages.fr.json |  8 ++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 037a73c4..09c80815 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -55,7 +55,7 @@ if (pr.subTheme === 'eccc') {
         <%_ } -%>
     </ul>
 </nav>
-<header role="banner">
+<header role="banner" aria-label="<^- msg('GCintranet header') ^>">
     <div id="wb-bnr">
         <div id="app-brand">
             <div class="container">
@@ -82,8 +82,8 @@ if (pr.subTheme === 'eccc') {
                         </div>
                     </section>
                     <%_ if (pr.GCToolsModal == true) { -%>
-                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-labelledby="cdts-hiddenGctools">
-                            <h2 class="wb-inv" id="cdts-hiddenGctools"><^- msg('GCTools links') ^></h2>
+                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-labelledby="cdts-hiddenGctoolsLinks">
+                            <h2 class="wb-inv" id="cdts-hiddenGctoolsLinks"><^- msg('GCTools links') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -91,9 +91,9 @@ if (pr.subTheme === 'eccc') {
                                     </ul>
                                 </div>
                             </div>
-                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def">
-                                <header class="modal-header">
-                                    <h2 class="modal-title"><^- msg('<span class="bold-gc">GC</span>Tools') ^></h2>
+                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def" aria-label="<^- msg('Hidden GCTools popup content') ^>">
+                                <header class="modal-header" aria-labelledby="cdts-gctoolsPopupHeader">
+                                    <h2 class="modal-title" id="cdts-gctoolsPopupHeader"><^- msg('<span class="bold-gc">GC</span>Tools') ^></h2>
                                 </header>
                                 <div class="modal-body">
                                     <ul class="list-unstyled lst-spcd">
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index a009cda9..f0df6d05 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -205,6 +205,10 @@
         "source": "Skip to section menu",
         "target": null
     },
+    "baab55ac4da1ff0e442b592dda1b4a9b16e8e1f4": {
+        "source": "GCintranet header",
+        "target": null
+    },
     "99a3e18460e703b6b52b26b4155c66c3e3ba24bc": {
         "source": "GC",
         "target": null
@@ -229,6 +233,10 @@
         "source": "<span class=\"bold-gc\">GC</span>Tools",
         "target": null
     },
+    "21e65c3c23066632e286af17a46dc6431bfea8ab": {
+        "source": "Hidden GCTools popup content",
+        "target": null
+    },
     "6fa25ec11095940211895447eed6bc5911d17358": {
         "source": "https://iservice.prv/eng/imit/catalogue/gcxchange/index.shtml",
         "target": null
diff --git a/src/gcintranet/wet-messages.fr.json b/src/gcintranet/wet-messages.fr.json
index 4604b088..97873051 100644
--- a/src/gcintranet/wet-messages.fr.json
+++ b/src/gcintranet/wet-messages.fr.json
@@ -456,5 +456,13 @@
     "4fd0ed7e7a474d24b9db775b6bf8fa2727beaa1d": {
         "source": "Application menu",
         "target": "Menu de l'application"
+    },
+    "baab55ac4da1ff0e442b592dda1b4a9b16e8e1f4": {
+        "source": "GCintranet header",
+        "target": "En-tête GCintranet"
+    },
+    "21e65c3c23066632e286af17a46dc6431bfea8ab": {
+        "source": "Hidden GCTools popup content",
+        "target": "Le contenu contextuel GCTools masqué"
     }
 }
\ No newline at end of file

From 9a072611da74d08a0cd98f5c38e355132928d8b2 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Thu, 1 Feb 2024 15:41:07 -0500
Subject: [PATCH 16/28] tests passed with change

---
 src/gcintranet/appTop.ejs           | 2 +-
 src/gcintranet/wet-messages.en.json | 4 ++--
 src/gcintranet/wet-messages.fr.json | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 09c80815..aab7b2df 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -91,7 +91,7 @@ if (pr.subTheme === 'eccc') {
                                     </ul>
                                 </div>
                             </div>
-                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def" aria-label="<^- msg('Hidden GCTools popup content') ^>">
+                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def" aria-label="<^- msg('GCTools section') ^>">
                                 <header class="modal-header" aria-labelledby="cdts-gctoolsPopupHeader">
                                     <h2 class="modal-title" id="cdts-gctoolsPopupHeader"><^- msg('<span class="bold-gc">GC</span>Tools') ^></h2>
                                 </header>
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index f0df6d05..5d64adaf 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -233,8 +233,8 @@
         "source": "<span class=\"bold-gc\">GC</span>Tools",
         "target": null
     },
-    "21e65c3c23066632e286af17a46dc6431bfea8ab": {
-        "source": "Hidden GCTools popup content",
+    "e6c08df891206ab48e50e3539af1d87363b593e3": {
+        "source": "GCTools section",
         "target": null
     },
     "6fa25ec11095940211895447eed6bc5911d17358": {
diff --git a/src/gcintranet/wet-messages.fr.json b/src/gcintranet/wet-messages.fr.json
index 97873051..a9f9303b 100644
--- a/src/gcintranet/wet-messages.fr.json
+++ b/src/gcintranet/wet-messages.fr.json
@@ -461,8 +461,8 @@
         "source": "GCintranet header",
         "target": "En-tête GCintranet"
     },
-    "21e65c3c23066632e286af17a46dc6431bfea8ab": {
-        "source": "Hidden GCTools popup content",
-        "target": "Le contenu contextuel GCTools masqué"
+    "e6c08df891206ab48e50e3539af1d87363b593e3": {
+        "source": "GCTools section",
+        "target": "Section Outils GC"
     }
 }
\ No newline at end of file

From 6b0f48b52af293288b40c67fa30cca023b5d2dce Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Mon, 5 Feb 2024 17:09:28 -0500
Subject: [PATCH 17/28] still wip, renamed to match top.ejs

---
 src/gcintranet/appTop.ejs | 4 ++--
 src/gcintranet/top.ejs    | 4 ++--
 src/gcweb/appTop.ejs      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index aab7b2df..ed7864dd 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -294,8 +294,8 @@ if (pr.subTheme === 'eccc') {
         <div id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('appmenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu hidden-sm hidden-xs"></div>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != null) { -%>
-        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbs">
-            <h2 id="cdts-breadcrumbs"><^- msg('You are here:') ^></h2>
+        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="breadcrumbPosition">
+            <h2 id="breadcrumbPosition"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ for (var breadcrumbIndex=0; breadcrumbIndex<pr.breadcrumbs.length; breadcrumbIndex++) {
diff --git a/src/gcintranet/top.ejs b/src/gcintranet/top.ejs
index bc07de27..6cae46a0 100644
--- a/src/gcintranet/top.ejs
+++ b/src/gcintranet/top.ejs
@@ -267,8 +267,8 @@ if (pr.subTheme === 'eccc') {
         <%_ } -%>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != false) { -%>
-        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumb">
-            <h2 id="cdts-breadcrumb"><^- msg('You are here:') ^></h2>
+        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="breadcrumbPosition">
+            <h2 id="breadcrumbPosition"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ if (pr.breadcrumbs != null) { -%>
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index c41bf017..6dcb4cca 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -256,8 +256,8 @@
         <%_ } -%>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != null) { -%>
-        <nav id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbs">
-            <h2 id="cdts-breadcrumbs"><^- msg('You are here:') ^></h2>
+        <nav id="wb-bc" property="breadcrumb" aria-labelledby="breadcrumbPosition">
+            <h2 id="breadcrumbPosition"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ for (var breadcrumbIndex=0; breadcrumbIndex<pr.breadcrumbs.length; breadcrumbIndex++) {

From 9b3e7297307388705640a515648cffb6a854a7d8 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Wed, 7 Feb 2024 16:50:45 -0500
Subject: [PATCH 18/28] still wip, new corrections for aria-labels

---
 src/gcintranet/top.ejs              | 8 ++++----
 src/gcintranet/wet-messages.en.json | 4 ++++
 src/gcintranet/wet-messages.fr.json | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/gcintranet/top.ejs b/src/gcintranet/top.ejs
index 6cae46a0..ca54114f 100644
--- a/src/gcintranet/top.ejs
+++ b/src/gcintranet/top.ejs
@@ -53,7 +53,7 @@ if (pr.subTheme === 'eccc') {
         <%_ } -%>
     </ul>
 </nav>
-<header role="banner" aria-label="Intranet Banner">
+<header role="banner" aria-label="<^- msg('Intranet Banner') ^>">
     <div id="wb-bnr">
         <div id="app-brand">
             <div class="container">
@@ -141,8 +141,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.search != false) { -%>
-                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-label="cdts-search">
-                            <h2><^- msg('Search') ^></h2>
+                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-labelledby="cdts-search">
+                            <h2 id="cdts-search"><^- msg('Search') ^></h2>
                             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                                 const item=pr.customSearch[0]; -%>
                                 <form action="<%- (item.action != null)? item.action: '<^- msg('https://intranet.canada.ca/search-recherche/query-recherche-eng.aspx') ^>' %>" method="<%= (item.method != null)? item.method: 'get' %>" name="<%= (item.name != null)? item.name: 'cse-search-box'%>" role="search" class="form-inline">
@@ -197,7 +197,7 @@ if (pr.subTheme === 'eccc') {
                 </div>
                 <%_ if (pr.GCToolsModal != true) { -%>
                     <div id="tools-sm" class="row<%- (pr.intranetTitle != null)? '': ' visible-md' %>">
-                        <section id="tool-container-sm" class="col-md-12 col-sm-12" aria-label="cdts-tools">
+                        <section id="tool-container-sm" class="col-md-12 col-sm-12" aria-label="<^- msg('GC Tools') ^>">
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>connex') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://www.gcpedia.gc.ca/wiki/?setlang=en') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>pedia') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcdirectory-gcannuaire.gc.ca/en/GCD/?pgid=002') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>directory') ^></a></div>
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index 5d64adaf..5c71844f 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -385,6 +385,10 @@
         "source": "Section menu",
         "target": null
     },
+    "5b82747d146bcb033f073f1c4465847546261d56": {
+        "source": "Intranet Banner",
+        "target": null
+    },
     "f43ac2b672a1db811dd7168a1e7cc1add2fb79b0": {
         "source": "esdcmenu-eng.html",
         "target": null
diff --git a/src/gcintranet/wet-messages.fr.json b/src/gcintranet/wet-messages.fr.json
index a9f9303b..f89a0d85 100644
--- a/src/gcintranet/wet-messages.fr.json
+++ b/src/gcintranet/wet-messages.fr.json
@@ -464,5 +464,9 @@
     "e6c08df891206ab48e50e3539af1d87363b593e3": {
         "source": "GCTools section",
         "target": "Section Outils GC"
+    },
+    "5b82747d146bcb033f073f1c4465847546261d56": {
+        "source": "Intranet Banner",
+        "target": "Bannière intranet"
     }
 }
\ No newline at end of file

From 2fc3bb061273be1c3027ffde8a86679be5b1f23b Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Thu, 8 Feb 2024 17:03:59 -0500
Subject: [PATCH 19/28] still wip, new corrections

---
 src/gcintranet/splash.ejs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gcintranet/splash.ejs b/src/gcintranet/splash.ejs
index 003acfbc..992b875d 100644
--- a/src/gcintranet/splash.ejs
+++ b/src/gcintranet/splash.ejs
@@ -27,18 +27,18 @@
                 </div>
             </div>
             <div class="row cdts-splash">
-                <section class="col-xs-6 text-right" lang="en" aria-label="cdts-governmentOfCanada">
+                <section class="col-xs-6 text-right" lang="en" aria-labelledby="cdts-governmentOfCanada">
                     <%_ if (pr.nameEng != null) { -%>
-                        <h2><%= pr.nameEng %></h2>
+                        <h2 id="cdts-governmentOfCanada"><%= pr.nameEng %></h2>
                     <%_ } else { -%>
-                        <h2 class="wb-inv">Government of Canada</h2>
+                        <h2 class="wb-inv" id="cdts-governmentOfCanada">Government of Canada</h2>
                     <%_ } -%>
                 </section>
-                <section class="col-xs-6" lang="fr" aria-label="cdts-gouvernementDuCanada">
+                <section class="col-xs-6" lang="fr" aria-labelledby="cdts-gouvernementDuCanada">
                     <%_ if (pr.nameFra != null) { -%>
-                        <h2><%= pr.nameFra %></h2>
+                        <h2 id="cdts-gouvernementDuCanada"><%= pr.nameFra %></h2>
                     <%_ } else { -%>
-                        <h2 class="wb-inv">Gouvernement du Canada</h2>
+                        <h2 class="wb-inv" id="cdts-gouvernementDuCanada">Gouvernement du Canada</h2>
                     <%_ } -%>
                 </section>
             </div>

From 36bcc38de490b9659a78cd825b7e92ccec3fd05f Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Thu, 7 Mar 2024 17:48:12 -0500
Subject: [PATCH 20/28] still wip, fix remaining errors

---
 src/gcintranet/appTop.ejs      |  4 ++--
 src/gcintranet/top.ejs         | 12 +++++-----
 src/gcweb/appTop.ejs           | 38 ++++++++++++++++----------------
 src/gcweb/splash.ejs           | 12 +++++-----
 src/gcweb/top.ejs              | 12 +++++-----
 src/gcweb/wet-messages.en.json | 40 ++++++++++++++--------------------
 src/gcweb/wet-messages.fr.json | 32 ++++++++++-----------------
 7 files changed, 67 insertions(+), 83 deletions(-)

diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index ed7864dd..4369c578 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -251,9 +251,9 @@ if (pr.subTheme === 'eccc') {
         </div>
     </div>
     <%_ if (pr.menuLinks != null) { -%>
-        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Main navigation menu') ^>">
+        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement">
             <div class="pnl-strt container nvbar">
-                <h2 class="wb-inv"><^- msg('Main navigation menu') ^></h2>
+                <h2 class="wb-inv" aria-labelledby="cdts-mainMenu"><^- msg('Main navigation menu') ^></h2>
                 <div class="row">
                     <ul class="list-inline menu" role="menubar">
                         <%_ for (var menuLinkIndex=0; menuLinkIndex<pr.menuLinks.length; menuLinkIndex++) {
diff --git a/src/gcintranet/top.ejs b/src/gcintranet/top.ejs
index ca54114f..65e10b30 100644
--- a/src/gcintranet/top.ejs
+++ b/src/gcintranet/top.ejs
@@ -210,9 +210,9 @@ if (pr.subTheme === 'eccc') {
     </div>
     <%_ if (pr.siteMenu != false) { -%>
         <%_ if (pr.subTheme == 'esdc' || pr.subTheme == 'labour') { -%>
-            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: '/app/cls/WET/global/<^- msg('esdcmenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Topics menu') ^>">
+            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: '/app/cls/WET/global/<^- msg('esdcmenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-labelledby="cdts-topicsMenu">
                 <div class="container nvbar">
-                    <h2><^- msg('Topics menu') ^></h2>
+                    <h2 id="cdts-topicsMenu"><^- msg('Topics menu') ^></h2>
                     <div class="row">
                         <ul class="list-inline menu">
                             <%_ if (pr.hidePlaceholderMenu == true) { -%>
@@ -230,9 +230,9 @@ if (pr.subTheme === 'eccc') {
             </nav>
         <%_ } else if (pr.subTheme == 'eccc') { -%>
             <%# Todo: Change with eccc Menu -%>
-            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: wet.builder.environment(pr.cdnEnv) + 'cdts/ajax/<^- msg('sitemenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Topics menu') ^>">
+            <nav role="navigation" id="wb-sm" data-wb-ajax='{"url": "<%- (pr.menuPath != null)? pr.menuPath: wet.builder.environment(pr.cdnEnv) + 'cdts/ajax/<^- msg('sitemenu-eng.html') ^>' %>", "type": "replace", "nocache": true }' data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-labelledby="cdts-topicsMenu">
                 <div class="container nvbar">
-                    <h2><^- msg('Topics menu') ^></h2>
+                    <h2 id="cdts-topicsMenu"><^- msg('Topics menu') ^></h2>
                     <div class="row">
                         <ul class="list-inline menu">
                             <%_ if (pr.hidePlaceholderMenu == true) { -%>
@@ -251,9 +251,9 @@ if (pr.subTheme === 'eccc') {
                 </div>
             </nav>
         <%_ } else { -%>
-            <nav role="navigation" id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('sitemenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Topics menu') ^>">
+            <nav role="navigation" id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('sitemenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-labelledby="cdts-topicsMenu">
                 <div class="container nvbar">
-                    <h2><^- msg('Topics menu') ^></h2>
+                    <h2 id="cdts-topicsMenu"><^- msg('Topics menu') ^></h2>
                     <div class="row">
                         <ul class="list-inline menu">
                             <li><a href="<^- msg('https://intranet.canada.ca/psc-fsc/index-eng.asp') ^>"><^- msg('News') ^></a></li>
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index 6dcb4cca..c66e667f 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -25,8 +25,8 @@
     </ul>
 </nav>
 <%_ if (pr.infoBanner != null) { -%>
-    <header aria-label="<^- msg('Header background') ^>">
-        <section class="bg-info" aria-label="<^- msg('Info background') ^>">
+    <header aria-label="<^- msg('Information Banner') ^>">
+        <section class="bg-info" aria-label="<^- msg('Information') ^>">
             <div class="container">
                 <%_ if (pr.infoBanner.mainHTML != null) { -%>
                     <p class="cdts-banner-text"><%- pr.infoBanner.mainHTML %></p>
@@ -46,7 +46,7 @@
         </section>
     </header>
 <%_ } -%>
-<header aria-label="<^- msg('Government of Canada header') ^>">
+<header aria-label="<^- msg('Government of Canada') ^>">
     <div id="wb-bnr" class="container">
         <div class="row">
             <%_ if (pr.lngLinks != null) { -%>
@@ -76,7 +76,7 @@
                 const item=pr.customSearch[0]; -%>
                 <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-topSearch">
                     <h2 id="cdts-topSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
-                    <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" aria-label="<^- msg('Search Canada.ca') ^>">
+                    <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" aria-label="<^- msg('Search Criteria') ^>">
                         <div class="form-group wb-srch-qry">
                             <label for="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
                             <input id="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-srch-q form-control" name="<%= item.name != null? item.name: 'q' %>" type="search" value="" size="34" maxlength="170" placeholder="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>">
@@ -99,11 +99,11 @@
         <div class="container">
             <div class="row">
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                    <section class="col-xs-12 col-sm-7" aria-label="<^- msg('Name of Web application') ^>">
+                    <section class="col-xs-12 col-sm-7" aria-label="<^- msg('Application') ^>">
                 <%_ } else if (pr.headerMenu != null) { -%>
-                    <section class="col-xs-12 col-sm-9 cdts-app-title-menu" aria-label="<^- msg('Name of Web application') ^>">
+                    <section class="col-xs-12 col-sm-9 cdts-app-title-menu" aria-label="<^- msg('Application') ^>">
                 <%_ } else { -%>
-                    <section class="col-xs-12" aria-label="<^- msg('Name of Web application') ^>">
+                    <section class="col-xs-12" aria-label="<^- msg('Application') ^>">
                 <%_ } -%>
                 <%_ if (pr.appName != null && pr.appName.length > 0) {
                     const item=pr.appName[0]; -%>
@@ -117,8 +117,8 @@
                         <ul><li id="wb-glb-mn"><a href="#mb-pnl"></a><h2><^- msg('Menu') ^></h2></li></ul>
                         <div id="mb-pnl"></div>
                     </div>
-                    <nav id="cdts-header-menu" data-trgt="mb-pnl" class="cdts-menu-rectangle wb-menu" typeof="SiteNavigationElement" aria-labelledby="cdts-headerMenu">
-                        <h2 class="wb-inv" id="cdts-headerMenu"><^- msg('Header navigation menu') ^></h2>
+                    <nav id="cdts-header-menu" data-trgt="mb-pnl" class="cdts-menu-rectangle wb-menu" typeof="SiteNavigationElement" aria-labelledby="appNavMenu">
+                        <h2 class="wb-inv" id="appNavMenu"><^- msg('Header navigation menu') ^></h2>
                         <ul class="list-inline menu" role="menubar">
                             <li role="none" class="cdts-menu-list-width">
                             <a href="#" class="cdts-menu-label item" role="menuitem" aria-haspopup="true"><span class="glyphicon glyphicon-user cdts-menu-icon"></span><%= (pr.headerMenu.text == null)? ' <^- msg('Account') ^>': pr.headerMenu.text %><span class="glyphicon glyphicon-chevron-down cdts-menu-chevron"></span><span class="glyphicon glyphicon-chevron-up cdts-menu-chevron-up"></span></a>
@@ -138,8 +138,8 @@
                     </nav>
                 <%_ } -%>
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                    <nav class="col-sm-5 hidden-xs hidden-print" aria-label="<^- msg('Hidden Account menu') ^>">
-                        <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
+                    <nav class="col-sm-5 hidden-xs hidden-print" aria-labelledby="cdts-hiddenAccountMenu">
+                        <h2 class="wb-inv" is="cdts-hiddenAccountMenu"><^- msg('Account menu') ^></h2>
                         <ul class="app-list-account list-unstyled">
                             <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
                                 const item=pr.appSettings[0]; -%>
@@ -173,13 +173,13 @@
                     </ul>
                     <div id="mb-pnl"></div>
                     <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
-                        const item=pr.customSearch[0]; -%>
-                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t" aria-label="<^- msg('Application Search') ^>">
+                        const item=pr.customSearch[0]; -%><%#using aria-label instead of aria-labelledby because the VALUE of the label must be unique and we already have another search, we're adding a period to make it unique-%>
+                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t" aria-label="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>.">
                             <div class="modal-header">
-                                <h3 class="modal-title"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h3>
+                                <h3 class="modal-title" id="cdts-appSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h3>
                             </div>
                             <div class="modal-body">
-                                <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" class="form-inline" aria-label="<^- msg('Enter Search Criteria') ^>">
+                                <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" class="form-inline" aria-label="<^- msg('Search Criteria') ^>.">
                                     <div class="input-group">
                                         <label for="<%= item.id != null? 'app-' + item.id: 'app-srch-q-mb' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
                                         <input placeholder="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>" id="<%= item.id != null? 'app-' + item.id: 'app-srch-q-mb' %>" class="app-srch-q-mb form-control" name="q" type="search" value="" size="27" maxlength="150">
@@ -198,8 +198,8 @@
                 </nav>
             <%_ } -%>
             <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-            <nav aria-label="<^- msg('Account menu') ^>">
-                <h2 class="wb-inv"><^- msg('Account menu') ^></h2>
+            <nav aria-labelledby="cdts-accountMenu">
+                <h2 class="wb-inv" id="cdts-accountMenu"><^- msg('Account menu') ^></h2>
                 <ul class="app-list-account list-unstyled">
                     <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
                         const item=pr.appSettings[0]; -%>
@@ -223,8 +223,8 @@
 
         <%_ if (pr.menuLinks != null) { -%>
             <nav id="wb-sm" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Main navigation menu') ^>">
-                <div class="pnl-strt container nvbar">
-                    <h2 class="wb-inv"><^- msg('Main navigation menu') ^></h2>
+                <div class="pnl-strt container nvbar" aria-labelledby="appNavMenu">
+                    <h2 class="wb-inv" id="appNavMenu"><^- msg('Main navigation menu') ^></h2>
                     <div class="row">
                         <ul class="list-inline menu" role="menubar">
                             <%_ for (var menuLinkIndex=0; menuLinkIndex<pr.menuLinks.length; menuLinkIndex++) {
diff --git a/src/gcweb/splash.ejs b/src/gcweb/splash.ejs
index 1626afcc..3a0638a5 100644
--- a/src/gcweb/splash.ejs
+++ b/src/gcweb/splash.ejs
@@ -27,18 +27,18 @@
                 </div>
             </div>
             <div class="row cdts-splash">
-                <section class="col-xs-6 text-right" lang="en" aria-label="cdts-enGovCanada">
+                <section class="col-xs-6 text-right" lang="en" aria-labelledby="cdts-governmentOfCanada">
                     <%_ if (pr.nameEng != null) { -%>
-                        <h2><%= pr.nameEng %></h2>
+                        <h2 id="cdts-governmentOfCanada"><%= pr.nameEng %></h2>
                     <%_ } else { -%>
-                        <h2 class="wb-inv">Government of Canada</h2>
+                        <h2 class="wb-inv" id="cdts-governmentOfCanada">Government of Canada</h2>
                     <%_ } -%>
                 </section>
-                <section class="col-xs-6" lang="fr" aria-label="cdts-frGovCanada">
+                <section class="col-xs-6" lang="fr" aria-labelledby="cdts-gouvernementDuCanada">
                     <%_ if (pr.nameFra != null) { -%>
-                        <h2><%= pr.nameFra %></h2>
+                        <h2 id="cdts-gouvernementDuCanada"><%= pr.nameFra %></h2>
                     <%_ } else { -%>
-                        <h2 class="wb-inv">Gouvernement du Canada</h2>
+                        <h2 class="wb-inv" id="cdts-gouvernementDuCanada">Gouvernement du Canada</h2>
                     <%_ } -%>
                 </section>
             </div>
diff --git a/src/gcweb/top.ejs b/src/gcweb/top.ejs
index 3b4414c7..445dfb4e 100644
--- a/src/gcweb/top.ejs
+++ b/src/gcweb/top.ejs
@@ -21,8 +21,8 @@
     <div id="wb-bnr" class="container">
         <div class="row">
             <%_ if (pr.lngLinks != null) { -%>
-                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right" aria-labelledby="cdts-languageLinks">
-                    <h2 class="wb-inv" id="cdts-languageLinks"><^- msg('Language selection') ^></h2>
+                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right" aria-labelledby="cdts-languageSelection">
+                    <h2 class="wb-inv" id="cdts-languageSelection"><^- msg('Language selection') ^></h2>
                     <ul class="list-inline mrgn-bttm-0">
                         <%_ for (var linkIndex=0; linkIndex<pr.lngLinks.length; linkIndex++) { 
                             const link=pr.lngLinks[linkIndex];-%>
@@ -45,8 +45,8 @@
             <%_ if (pr.search != false) { -%>
                 <%_ if (pr.customSearch != null && pr.customSearch.length > 0) { 
                     const item=pr.customSearch[0]; -%>
-                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-webSearch">
-                        <h2 id="cdts-webSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
+                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-topSearch">
+                        <h2 id="cdts-topSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
                         <form action="<%- item.action %>" method="<%= item.method %>" name="cse-search-box" role="search">
                             <div class="form-group wb-srch-qry">
                                 <label for="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
@@ -64,8 +64,8 @@
                         </form>
                     </section>
                 <%_ } else { -%>
-                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4" aria-labelledby="cdts-webSearch">
-                        <h2 id="cdts-webSearch"><^- msg('Search') ^></h2>
+                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4" aria-labelledby="cdts-topSearch">
+                        <h2 id="cdts-topSearch"><^- msg('Search') ^></h2>
                         <form action="<^- msg('https://www.canada.ca/en/sr/srb.html') ^>" method="get" name="cse-search-box" role="search" accept-charset="utf-8">
                             <div class="form-group wb-srch-qry">
                                 <label for="wb-srch-q" class="wb-inv"><^- msg('Search Canada.ca') ^></label>
diff --git a/src/gcweb/wet-messages.en.json b/src/gcweb/wet-messages.en.json
index 282e2b9d..ad966134 100644
--- a/src/gcweb/wet-messages.en.json
+++ b/src/gcweb/wet-messages.en.json
@@ -69,16 +69,16 @@
         "source": "Skip to section menu",
         "target": null
     },
-    "394ff0854e04312b74d6e66e842c922a57d46bc0": {
-        "source": "Header background",
+    "394d95b2f4889cff8f10f25de0f0ded7068e32de": {
+        "source": "Information Banner",
         "target": null
     },
-    "b9ed4d3f767502a5a2d7accc300f7d3bca531528": {
-        "source": "Info background",
+    "0eb5ed506e4923c28d7f4a8aa69efe99b3ad75d1": {
+        "source": "Information",
         "target": null
     },
-    "fbe4fbceb306983b8ba26aace9d291ecee0b86e0": {
-        "source": "Government of Canada header",
+    "9b0c2133d530bdd7b3b7e239c94faf83a2097da9": {
+        "source": "Government of Canada",
         "target": null
     },
     "4715fce1fdbafc47a29ff9d0c1be459d8eafd034": {
@@ -89,10 +89,6 @@
         "source": "sig-blk-en.svg",
         "target": null
     },
-    "9b0c2133d530bdd7b3b7e239c94faf83a2097da9": {
-        "source": "Government of Canada",
-        "target": null
-    },
     "b858a87c07b04c4568f51b0dce655f78d73c02b3": {
         "source": "fr",
         "target": null
@@ -105,8 +101,12 @@
         "source": "Search",
         "target": null
     },
-    "3c685f9af92701f89a80a8bd6b342f8b6309b1ff": {
-        "source": "Search Canada.ca",
+    "763a7b2777f9a6e9bc4b33c3a4350867def6f1d3": {
+        "source": "Search Criteria",
+        "target": null
+    },
+    "b291beb8793f4f3308c463951165dad483715a6c": {
+        "source": "Application",
         "target": null
     },
     "63f3f0da3e2031cedf938ea18363e51a893e095d": {
@@ -125,10 +125,6 @@
         "source": "Account",
         "target": null
     },
-    "1b11927165d524f390cf506603ce1954e9328507": {
-        "source": "Hidden Account menu",
-        "target": null
-    },
     "60f5a30c306c03775734e687edd561829f213769": {
         "source": "Account menu",
         "target": null
@@ -149,14 +145,6 @@
         "source": "and search",
         "target": null
     },
-    "32a81f0e50f1707a800cb747fcccc527f6dc0bd3": {
-        "source": "Application Search",
-        "target": null
-    },
-    "04f64416e81d58b4370c341b9dad48567c058e9f": {
-        "source": "Enter Search Criteria",
-        "target": null
-    },
     "11b5a68a90c1de36a7f61d1b289fa4a9e547c19a": {
         "source": "Main navigation menu",
         "target": null
@@ -405,6 +393,10 @@
         "source": "https://www.canada.ca/en/sr/srb.html",
         "target": null
     },
+    "3c685f9af92701f89a80a8bd6b342f8b6309b1ff": {
+        "source": "Search Canada.ca",
+        "target": null
+    },
     "cb711be644fab2f119f120823991b3fedd7ea523": {
         "source": "<span class=\"wb-inv\">Main </span>Menu",
         "target": null
diff --git a/src/gcweb/wet-messages.fr.json b/src/gcweb/wet-messages.fr.json
index 26d6d96e..5b639bea 100644
--- a/src/gcweb/wet-messages.fr.json
+++ b/src/gcweb/wet-messages.fr.json
@@ -401,28 +401,20 @@
         "source": "Application menu",
         "target": "Menu de l'application"
     },
-    "32a81f0e50f1707a800cb747fcccc527f6dc0bd3": {
-        "source": "Application Search",
-        "target": "Recherche de l'application"
+    "394d95b2f4889cff8f10f25de0f0ded7068e32de": {
+        "source": "Information Banner",
+        "target": "Bannière d'information"
     },
-    "04f64416e81d58b4370c341b9dad48567c058e9f": {
-        "source": "Enter Search Criteria",
-        "target": "Entrez les critères de recherche"
+    "0eb5ed506e4923c28d7f4a8aa69efe99b3ad75d1": {
+        "source": "Information",
+        "target": "Information"
     },
-    "1b11927165d524f390cf506603ce1954e9328507": {
-        "source": "Hidden Account menu",
-        "target": "Menu compte masqué"
+    "b291beb8793f4f3308c463951165dad483715a6c": {
+        "source": "Application",
+        "target": "Application"
     },
-    "b9ed4d3f767502a5a2d7accc300f7d3bca531528": {
-        "source": "Info background",
-        "target": "Arrière-plan de renseignements"
-    },
-    "394ff0854e04312b74d6e66e842c922a57d46bc0": {
-        "source": "Header background",
-        "target": "Le fond de l'en-tête"
-    },
-    "fbe4fbceb306983b8ba26aace9d291ecee0b86e0": {
-        "source": "Government of Canada header",
-        "target": "En-tête du gouvernement du Canada"
+    "763a7b2777f9a6e9bc4b33c3a4350867def6f1d3": {
+        "source": "Search Criteria",
+        "target": "Critères de recherche"
     }
 }
\ No newline at end of file

From ed9c5f167f034aad412bea7256ed842e7dcea2b6 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Fri, 8 Mar 2024 13:27:39 -0500
Subject: [PATCH 21/28] resolved code comments

---
 src/gcintranet/appTop.ejs           | 2 +-
 src/gcintranet/wet-messages.en.json | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 4369c578..f5212b8e 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -251,7 +251,7 @@ if (pr.subTheme === 'eccc') {
         </div>
     </div>
     <%_ if (pr.menuLinks != null) { -%>
-        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement">
+        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Application menu') ^>">
             <div class="pnl-strt container nvbar">
                 <h2 class="wb-inv" aria-labelledby="cdts-mainMenu"><^- msg('Main navigation menu') ^></h2>
                 <div class="row">
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index 5c71844f..acc3f56e 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -321,6 +321,10 @@
         "source": "Sign in",
         "target": null
     },
+    "4fd0ed7e7a474d24b9db775b6bf8fa2727beaa1d": {
+        "source": "Application menu",
+        "target": null
+    },
     "11b5a68a90c1de36a7f61d1b289fa4a9e547c19a": {
         "source": "Main navigation menu",
         "target": null
@@ -329,10 +333,6 @@
         "source": "GCTools",
         "target": null
     },
-    "4fd0ed7e7a474d24b9db775b6bf8fa2727beaa1d": {
-        "source": "Application menu",
-        "target": null
-    },
     "616127b124840170bb853584ca52fbb610817859": {
         "source": "appmenu-eng.html",
         "target": null

From 1cc0180ae0808a7470a95ce44b14148b155dc593 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Fri, 8 Mar 2024 14:06:41 -0500
Subject: [PATCH 22/28] forgot to chg code for a comment

---
 src/gcintranet/appTop.ejs           | 2 +-
 src/gcintranet/wet-messages.en.json | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index f5212b8e..b687d3f6 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -251,7 +251,7 @@ if (pr.subTheme === 'eccc') {
         </div>
     </div>
     <%_ if (pr.menuLinks != null) { -%>
-        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Application menu') ^>">
+        <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-labelledby="cdts-mainMenu">
             <div class="pnl-strt container nvbar">
                 <h2 class="wb-inv" aria-labelledby="cdts-mainMenu"><^- msg('Main navigation menu') ^></h2>
                 <div class="row">
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index acc3f56e..5c71844f 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -321,10 +321,6 @@
         "source": "Sign in",
         "target": null
     },
-    "4fd0ed7e7a474d24b9db775b6bf8fa2727beaa1d": {
-        "source": "Application menu",
-        "target": null
-    },
     "11b5a68a90c1de36a7f61d1b289fa4a9e547c19a": {
         "source": "Main navigation menu",
         "target": null
@@ -333,6 +329,10 @@
         "source": "GCTools",
         "target": null
     },
+    "4fd0ed7e7a474d24b9db775b6bf8fa2727beaa1d": {
+        "source": "Application menu",
+        "target": null
+    },
     "616127b124840170bb853584ca52fbb610817859": {
         "source": "appmenu-eng.html",
         "target": null

From 0ee60e6f33c6fefd9ab0d8c7a2f0e4f5b6894008 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Fri, 8 Mar 2024 14:51:34 -0500
Subject: [PATCH 23/28] fixed minor syntax

---
 src/gcweb/appTop.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index c66e667f..348973a6 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -139,7 +139,7 @@
                 <%_ } -%>
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
                     <nav class="col-sm-5 hidden-xs hidden-print" aria-labelledby="cdts-hiddenAccountMenu">
-                        <h2 class="wb-inv" is="cdts-hiddenAccountMenu"><^- msg('Account menu') ^></h2>
+                        <h2 class="wb-inv" id="cdts-hiddenAccountMenu"><^- msg('Account menu') ^></h2>
                         <ul class="app-list-account list-unstyled">
                             <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {
                                 const item=pr.appSettings[0]; -%>

From 51902f7c7c9d8d39bd6471cf8b195a5c8da3d4e4 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Fri, 8 Mar 2024 15:35:20 -0500
Subject: [PATCH 24/28] corrected for duplicate account menu name

---
 src/gcweb/appTop.ejs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index 348973a6..72a12f3b 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -138,7 +138,8 @@
                     </nav>
                 <%_ } -%>
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                    <nav class="col-sm-5 hidden-xs hidden-print" aria-labelledby="cdts-hiddenAccountMenu">
+                <%#using aria-label instead of aria-labelledby because the VALUE of the label must be unique and we already have another search, we're adding a period to make it unique-%>
+                    <nav class="col-sm-5 hidden-xs hidden-print" aria-label="<^- msg('Account menu') ^>.">
                         <h2 class="wb-inv" id="cdts-hiddenAccountMenu"><^- msg('Account menu') ^></h2>
                         <ul class="app-list-account list-unstyled">
                             <%_ if (pr.appSettings != null && pr.appSettings.length > 0) {

From bbc5096e1651f18ac87dc698db8414b87ee676df Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:54:44 -0400
Subject: [PATCH 25/28] still wip, remove unit tests that were created in this
 PR

---
 package-lock.json                   | 14 +++++++-------
 package.json                        |  2 +-
 src/gcintranet/appFooter.ejs        | 22 +++++++++++-----------
 src/gcintranet/appTop.ejs           | 26 +++++++++++++-------------
 src/gcintranet/footer.ejs           |  2 +-
 src/gcintranet/splash.ejs           | 12 ++++++------
 src/gcintranet/top.ejs              | 24 ++++++++++++------------
 src/gcintranet/wet-messages.en.json | 16 ----------------
 src/gcweb/appTop.ejs                | 24 ++++++++++++------------
 src/gcweb/splash.ejs                | 12 ++++++------
 src/gcweb/top.ejs                   | 12 ++++++------
 src/gcweb/wet-messages.en.json      |  8 --------
 12 files changed, 75 insertions(+), 99 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b73d00f4..802219d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
         "grunt-contrib-uglify": "^5.2.2",
         "grunt-contrib-watch": "^1.1.0",
         "grunt-eslint": "^24.3.0",
-        "html-validate": "^8.9.0",
+        "html-validate": "^8.9.1",
         "https-proxy-agent": "^7.0.4",
         "isbinaryfile": "^5.0.2"
       }
@@ -5571,9 +5571,9 @@
       }
     },
     "node_modules/html-validate": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.9.0.tgz",
-      "integrity": "sha512-3stj3eoISqSghbOyhWzhHWYybAWlJMULDRVDH/ec45vmKK2JS4lgA09/ZM6VRLQxc4EtZhGl2kcyjFEGXBW3kA==",
+      "version": "8.9.1",
+      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.9.1.tgz",
+      "integrity": "sha512-2tWa2FtFALooZ5wMDbY+HS0BieoiRfS5IeiG2XeM6bb3Jx4dmN1HFPFt0v3j7r3SpNxEVKiXYLdkBZI3kkca/g==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.0",
@@ -15144,9 +15144,9 @@
       }
     },
     "html-validate": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.9.0.tgz",
-      "integrity": "sha512-3stj3eoISqSghbOyhWzhHWYybAWlJMULDRVDH/ec45vmKK2JS4lgA09/ZM6VRLQxc4EtZhGl2kcyjFEGXBW3kA==",
+      "version": "8.9.1",
+      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.9.1.tgz",
+      "integrity": "sha512-2tWa2FtFALooZ5wMDbY+HS0BieoiRfS5IeiG2XeM6bb3Jx4dmN1HFPFt0v3j7r3SpNxEVKiXYLdkBZI3kkca/g==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.0",
diff --git a/package.json b/package.json
index 3c8e6013..7ab12330 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "grunt-contrib-uglify": "^5.2.2",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-eslint": "^24.3.0",
-    "html-validate": "^8.9.0",
+    "html-validate": "^8.9.1",
     "https-proxy-agent": "^7.0.4",
     "isbinaryfile": "^5.0.2"
   }
diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs
index 21c87804..ca157f23 100644
--- a/src/gcintranet/appFooter.ejs
+++ b/src/gcintranet/appFooter.ejs
@@ -8,7 +8,7 @@
  * @param? cdnEnv Used to switch between qat, nonprod, and prod CDN implementations.
 -%>
 <%_ if (pr.showFeatures == true) { -%>
-    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>" aria-label="<^- msg('Activities and initiatives') ^>"></section>
+    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>"></section>
 <%_ } -%>
 <footer role="contentinfo" id="wb-info">
     <%_ if (pr.footerSections != null) { -%>
@@ -20,10 +20,10 @@
                     <%_ if (footerSection.customFooterLinks != null) { -%>
                         <%_ if (sectionIndex < 3) { -%>
                                 <%_ if (footerSection.sectionName != null) { -%>
-                                    <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-footerSection<%= sectionIndex %>">
-                                    <h3 id="cdts-footerSection<%= sectionIndex %>"><%= footerSection.sectionName %></h3>
+                                    <section class="col-md-3 col-sm-6 col-lg-3">
+                                    <h3><%= footerSection.sectionName %></h3>
                                 <%_ } else { -%>
-                                    <section class="col-md-3 col-sm-6 col-lg-3" aria-label="<^- msg('Footer') ^>">
+                                    <section class="col-md-3 col-sm-6 col-lg-3">
                                 <%_ } -%>
                                 <ul class="list-unstyled">
                                     <%_ for (var linkIndex=0; linkIndex<footerSection.customFooterLinks.length; linkIndex++) {
@@ -35,10 +35,10 @@
                         <%_ } -%>
                     <%_ } else if (sectionIndex == 0) { /*For backward compatibility */ -%>
                             <%_ if (footerSection.sectionName != null) { -%>
-                                <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-footerSection">
-                                <h3 id="cdts-footerSection"><%= footerSection.sectionName %></h3>
+                                <section class="col-md-3 col-sm-6 col-lg-3">
+                                <h3><%= footerSection.sectionName %></h3>
                             <%_ } else { -%>
-                                <section class="col-md-3 col-sm-6 col-lg-3" aria-label="<^- msg('Footer') ^>">
+                                <section class="col-md-3 col-sm-6 col-lg-3">
                             <%_ } -%>
                             <ul class="list-unstyled">
                                 <%_ for (var linkIndex=0; linkIndex<pr.footerSections.length; linkIndex++) {
@@ -50,8 +50,8 @@
                     <%_ } -%>
                 <%_ } -%>
                 <%_ if (pr.subTheme == 'esdc' || pr.subTheme == 'labour') { -%>
-                    <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-sectionCorporate">
-                        <h3 id="cdts-sectionCorporate"><^- msg('Corporate') ^></h3>
+                    <section class="col-md-3 col-sm-6 col-lg-3">
+                        <h3><^- msg('Corporate') ^></h3>
                         <ul class="list-unstyled">
                             <li><a href="<^- msg('https://esdc.prv/en/branches_regions/index.shtml') ^>"><^- msg('ESDC/SC Intranet') ^></a></li>
                             <li><a href="<^- msg('https://esdc.prv/en/news/index.shtml') ^>"><^- msg('News') ^></a></li>
@@ -61,8 +61,8 @@
                         </ul>
                     </section>
                 <%_ } else if (pr.subTheme == 'eccc') { -%>
-                    <section class="col-md-3 col-sm-6 col-lg-3" aria-labelledby="cdts-contactUs">
-                        <h3 id="cdts-contactUs"><^- msg('Contact Us') ^></h3>
+                    <section class="col-md-3 col-sm-6 col-lg-3">
+                        <h3><^- msg('Contact Us') ^></h3>
                         <ul class="list-unstyled">
                             <li><a href="#"><^- msg('EnviroTel') ^></a></li>
                             <li><a href="#"><^- msg('GEDS') ^></a></li>
diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index b687d3f6..781eae18 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -60,7 +60,7 @@ if (pr.subTheme === 'eccc') {
         <div id="app-brand">
             <div class="container">
                 <div class="row">
-                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="<^- msg('GC') ^><^- msg('intranet') ^>">
+                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8">
                         <div class="app-name<%- (pr.intranetTitle != null)? ' app-name-lg': '' %>">
                             <%_ if (pr.intranetTitle != null && pr.intranetTitle.length > 0) {
                                 const item=pr.intranetTitle[0]; -%>
@@ -82,8 +82,8 @@ if (pr.subTheme === 'eccc') {
                         </div>
                     </section>
                     <%_ if (pr.GCToolsModal == true) { -%>
-                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-labelledby="cdts-hiddenGctoolsLinks">
-                            <h2 class="wb-inv" id="cdts-hiddenGctoolsLinks"><^- msg('GCTools links') ^></h2>
+                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right">
+                            <h2 class="wb-inv"><^- msg('GCTools links') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -91,7 +91,7 @@ if (pr.subTheme === 'eccc') {
                                     </ul>
                                 </div>
                             </div>
-                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def" aria-label="<^- msg('GCTools section') ^>">
+                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def">
                                 <header class="modal-header" aria-labelledby="cdts-gctoolsPopupHeader">
                                     <h2 class="modal-title" id="cdts-gctoolsPopupHeader"><^- msg('<span class="bold-gc">GC</span>Tools') ^></h2>
                                 </header>
@@ -108,7 +108,7 @@ if (pr.subTheme === 'eccc') {
                             </section>
                         </section>
                     <%_ } else if (pr.intranetTitle == null) { /* (...== null) is intentional, not (...!= null) */-%>
-                        <section id="wb-gctools" class="col-lg-6 visible-lg" aria-label="<^- msg('GC Tools') ^>">
+                        <section id="wb-gctools" class="col-lg-6 visible-lg">
                             <div class="pull-left tool-link">
                                 <a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>">
                                 <^- msg('<span class="bold-gc">GC</span>connex') ^></a>
@@ -128,8 +128,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.lngLinks != null) { -%>
-                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-labelledby="cdts-languageSelection">
-                            <h2 class="wb-inv" id="cdts-languageSelection"><^- msg('Language selection') ^></h2>
+                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.GCToolsModal == true)? '': 'lang-with-search'%>">
+                            <h2 class="wb-inv"><^- msg('Language selection') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -143,8 +143,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.search != false) { -%>
-                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-labelledby="cdts-hiddenSearch">
-                            <h2 id="cdts-hiddenSearch"><^- msg('Search') ^></h2>
+                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md">
+                            <h2><^- msg('Search') ^></h2>
                             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                                 const item=pr.customSearch[0]; -%>
                                 <form action="<%- (item.action != null)? item.action: '<^- msg('https://intranet.canada.ca/search-recherche/query-recherche-eng.aspx') ^>' %>" method="<%= (item.method != null)? item.method: 'get' %>" name="<%= (item.name != null)? item.name: 'cse-search-box'%>" role="search" class="form-inline">
@@ -182,9 +182,9 @@ if (pr.subTheme === 'eccc') {
                             <%_ } -%>
                         </section>
                     <%_ } -%>
-                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs" aria-labelledby="cdts-searchAndMenu">
+                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs">
                         <%_ var pluralSuffix = (pr.topSecMenu != null)? 's': ''; -%>
-                        <h2 id="cdts-searchAndMenu"><%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%></h2>
+                        <h2><%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%></h2>
                         <ul class="list-inline text-right chvrn">
                             <li><a href="#mb-pnl" title="<%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%>" aria-controls="mb-pnl" class="overlay-lnk" role="button">
                                 <%_ if (pr.search != false) { -%><span class="glyphicon glyphicon-search"><%_ } -%>
@@ -199,7 +199,7 @@ if (pr.subTheme === 'eccc') {
                 </div>
                 <%_ if (pr.GCToolsModal != true) { -%>
                     <div id="tools-sm" class="row<%- (pr.intranetTitle != null)? '': ' visible-md' %>">
-                        <section id="tool-container-sm" class="col-md-12 col-sm-12" aria-label="<^- msg('GCTools links') ^>">
+                        <section id="tool-container-sm" class="col-md-12 col-sm-12">
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>connex') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://www.gcpedia.gc.ca/wiki/?setlang=en') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>pedia') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcdirectory-gcannuaire.gc.ca/en/GCD/?pgid=002') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>directory') ^></a></div>
@@ -253,7 +253,7 @@ if (pr.subTheme === 'eccc') {
     <%_ if (pr.menuLinks != null) { -%>
         <nav role="navigation" id="wb-smapp" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-labelledby="cdts-mainMenu">
             <div class="pnl-strt container nvbar">
-                <h2 class="wb-inv" aria-labelledby="cdts-mainMenu"><^- msg('Main navigation menu') ^></h2>
+                <h2 class="wb-inv" id="cdts-mainMenu"><^- msg('Main navigation menu') ^></h2>
                 <div class="row">
                     <ul class="list-inline menu" role="menubar">
                         <%_ for (var menuLinkIndex=0; menuLinkIndex<pr.menuLinks.length; menuLinkIndex++) {
diff --git a/src/gcintranet/footer.ejs b/src/gcintranet/footer.ejs
index be471f86..b968cf87 100644
--- a/src/gcintranet/footer.ejs
+++ b/src/gcintranet/footer.ejs
@@ -5,7 +5,7 @@
  * @param? footerPath Local path for footer.
 -%>
 <%_ if (pr.showFeatures == true) { -%>
-    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>" aria-label="<^- msg('Activities and initiatives') ^>"></section>
+    <section class="ajaxed-in" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('activities-footer-eng.html') ^>"></section>
 <%_ } -%>
 <footer role="contentinfo" id="wb-info">
     <%_ if (pr.footerPath != null) { -%>
diff --git a/src/gcintranet/splash.ejs b/src/gcintranet/splash.ejs
index 992b875d..f2565a49 100644
--- a/src/gcintranet/splash.ejs
+++ b/src/gcintranet/splash.ejs
@@ -27,18 +27,18 @@
                 </div>
             </div>
             <div class="row cdts-splash">
-                <section class="col-xs-6 text-right" lang="en" aria-labelledby="cdts-governmentOfCanada">
+                <section class="col-xs-6 text-right" lang="en">
                     <%_ if (pr.nameEng != null) { -%>
-                        <h2 id="cdts-governmentOfCanada"><%= pr.nameEng %></h2>
+                        <h2><%= pr.nameEng %></h2>
                     <%_ } else { -%>
-                        <h2 class="wb-inv" id="cdts-governmentOfCanada">Government of Canada</h2>
+                        <h2 class="wb-inv">Government of Canada</h2>
                     <%_ } -%>
                 </section>
-                <section class="col-xs-6" lang="fr" aria-labelledby="cdts-gouvernementDuCanada">
+                <section class="col-xs-6" lang="fr">
                     <%_ if (pr.nameFra != null) { -%>
-                        <h2 id="cdts-gouvernementDuCanada"><%= pr.nameFra %></h2>
+                        <h2><%= pr.nameFra %></h2>
                     <%_ } else { -%>
-                        <h2 class="wb-inv" id="cdts-gouvernementDuCanada">Gouvernement du Canada</h2>
+                        <h2 class="wb-inv">Gouvernement du Canada</h2>
                     <%_ } -%>
                 </section>
             </div>
diff --git a/src/gcintranet/top.ejs b/src/gcintranet/top.ejs
index 65e10b30..d2373f0a 100644
--- a/src/gcintranet/top.ejs
+++ b/src/gcintranet/top.ejs
@@ -58,7 +58,7 @@ if (pr.subTheme === 'eccc') {
         <div id="app-brand">
             <div class="container">
                 <div class="row">
-                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8" aria-label="<^- msg('intranet') ^>">
+                    <section class="<%- (pr.intranetTitle != null || pr.subTheme != null)? 'col-lg-6 col-md-6': 'col-lg-2 col-md-3' %> col-sm-9 col-xs-8">
                         <div class="app-name<%- (pr.intranetTitle != null)? ' app-name-lg': '' %>">
                             <%_ if (pr.intranetTitle != null && pr.intranetTitle.length > 0) {
                                 const item=pr.intranetTitle[0]; -%>
@@ -80,8 +80,8 @@ if (pr.subTheme === 'eccc') {
                         </div>
                     </section>
                     <%_ if (pr.GCToolsModal == true) { -%>
-                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right" aria-labelledby="cdts-gcToolsLinks">
-                            <h2 class="wb-inv" id="cdts-gcToolsLinks"><^- msg('GCTools links') ^></h2>
+                        <section id="gctoolsSection" class="<%- (pr.intranetTitle != null)? 'col-lg-2': 'col-lg-6' %><%- (pr.search == false)? ' col-md-offset-3': ''%> col-md-1 hidden-sm hidden-xs text-right">
+                            <h2 class="wb-inv"><^- msg('GCTools links') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -89,7 +89,7 @@ if (pr.subTheme === 'eccc') {
                                     </ul>
                                 </div>
                             </div>
-                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def" aria-label="<^- msg('GC Tools') ^>">
+                            <section id="gctools" class="mfp-hide modal-dialog modal-content overlay-def">
                                 <header class="modal-header" aria-labelledby="cdts-gcToolsModal">
                                     <h2 class="modal-title" id="cdts-gcToolsModal"><^- msg('<span class="bold-gc">GC</span>Tools') ^></h2>
                                 </header>
@@ -106,7 +106,7 @@ if (pr.subTheme === 'eccc') {
                             </section>
                         </section>
                     <%_ } else if (pr.intranetTitle == null) { /* (...== null) is intentional, not (...!= null) */-%>
-                        <section id="wb-gctools" class="col-lg-6 visible-lg" aria-label="<^- msg('GCTools links') ^>">
+                        <section id="wb-gctools" class="col-lg-6 visible-lg">
                             <div class="pull-left tool-link">
                                 <a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>">
                                 <^- msg('<span class="bold-gc">GC</span>connex') ^></a>
@@ -126,8 +126,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.lngLinks != null) { -%>
-                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.subTheme == 'esdc' || pr.GCToolsModal == true)? '': 'lang-with-search'%>" aria-labelledby="cdts-languageSelection">
-                            <h2 class="wb-inv" id="cdts-languageSelection"><^- msg('Language selection') ^></h2>
+                        <section id="wb-lng" class="<%- (pr.intranetTitle != null && pr.GCToolsModal != true)? 'mrgn-bttm-md col-md-offset-1 col-lg-offset-2 ': '' %>col-md-1 hidden-sm hidden-xs text-right <%- (pr.search == false)? 'lang-no-search': (pr.subTheme == 'esdc' || pr.GCToolsModal == true)? '': 'lang-with-search'%>">
+                            <h2 class="wb-inv"><^- msg('Language selection') ^></h2>
                             <div class="row">
                                 <div class="col-md-12">
                                     <ul class="list-inline margin-bottom-none gcbarlng">
@@ -141,8 +141,8 @@ if (pr.subTheme === 'eccc') {
                         </section>
                     <%_ } -%>
                     <%_ if (pr.search != false) { -%>
-                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md" aria-labelledby="cdts-search">
-                            <h2 id="cdts-search"><^- msg('Search') ^></h2>
+                        <section id="wb-srch" class="col-lg-3 col-md-4 hidden-sm hidden-xs search-md">
+                            <h2><^- msg('Search') ^></h2>
                             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                                 const item=pr.customSearch[0]; -%>
                                 <form action="<%- (item.action != null)? item.action: '<^- msg('https://intranet.canada.ca/search-recherche/query-recherche-eng.aspx') ^>' %>" method="<%= (item.method != null)? item.method: 'get' %>" name="<%= (item.name != null)? item.name: 'cse-search-box'%>" role="search" class="form-inline">
@@ -180,9 +180,9 @@ if (pr.subTheme === 'eccc') {
                             <%_ } -%>
                         </section>
                     <%_ } -%>
-                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs" aria-labelledby="cdts-menu">
+                    <section id="wb-glb-mn" class="wb-mb-links col-xs-4 col-sm-3 visible-sm visible-xs">
                         <%_ var pluralSuffix = (pr.topSecMenu != null)? 's': ''; -%>
-                        <h2 id="cdts-menu"><%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%></h2>
+                        <h2><%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%></h2>
                         <ul class="list-inline text-right chvrn">
                             <li><a href="#mb-pnl" title="<%_ if (pr.search == false) { -%><^- msg('Menu') ^><%- pluralSuffix %><%_ } else { -%><^- msg('Search and menu') ^><%- pluralSuffix %><%_ } -%>" aria-controls="mb-pnl" class="overlay-lnk" role="button">
                                 <%_ if (pr.search != false) { -%><span class="glyphicon glyphicon-search"><%_ } -%>
@@ -197,7 +197,7 @@ if (pr.subTheme === 'eccc') {
                 </div>
                 <%_ if (pr.GCToolsModal != true) { -%>
                     <div id="tools-sm" class="row<%- (pr.intranetTitle != null)? '': ' visible-md' %>">
-                        <section id="tool-container-sm" class="col-md-12 col-sm-12" aria-label="<^- msg('GC Tools') ^>">
+                        <section id="tool-container-sm" class="col-md-12 col-sm-12">
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcconnex.gc.ca/splash/') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>connex') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://www.gcpedia.gc.ca/wiki/?setlang=en') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>pedia') ^></a></div>
                             <div class="pull-left tool-link"><a href="<^- msg('https://gcdirectory-gcannuaire.gc.ca/en/GCD/?pgid=002') ^>" class="<^- msg('GCTBannerOnclick-eng') ^>"><^- msg('<span class="bold-gc">GC</span>directory') ^></a></div>
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index 5c71844f..684a088b 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -5,18 +5,10 @@
         "source": "activities-footer-eng.html",
         "target": null
     },
-    "d8cde1c29b61c58e4ef757161e59991a22d66763": {
-        "source": "Activities and initiatives",
-        "target": null
-    },
     "2256cc6ee2a5d077491a8a63ef76ac743c25d2d2": {
         "source": "Related links",
         "target": null
     },
-    "26c01e70a337f208f56dae1c3bc18f60c4bff453": {
-        "source": "Footer",
-        "target": null
-    },
     "1d8b1236d7b70a9ca73929aa23ac4bfd96450bb1": {
         "source": "This link will open in a new window",
         "target": null
@@ -233,10 +225,6 @@
         "source": "<span class=\"bold-gc\">GC</span>Tools",
         "target": null
     },
-    "e6c08df891206ab48e50e3539af1d87363b593e3": {
-        "source": "GCTools section",
-        "target": null
-    },
     "6fa25ec11095940211895447eed6bc5911d17358": {
         "source": "https://iservice.prv/eng/imit/catalogue/gcxchange/index.shtml",
         "target": null
@@ -285,10 +273,6 @@
         "source": "<span class=\"bold-gc\">GC</span>intranet",
         "target": null
     },
-    "5a4356b4e754ea9c3775e8c156860a6e18ab6b54": {
-        "source": "GC Tools",
-        "target": null
-    },
     "4715fce1fdbafc47a29ff9d0c1be459d8eafd034": {
         "source": "Language selection",
         "target": null
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index 72a12f3b..4de961d6 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -26,7 +26,7 @@
 </nav>
 <%_ if (pr.infoBanner != null) { -%>
     <header aria-label="<^- msg('Information Banner') ^>">
-        <section class="bg-info" aria-label="<^- msg('Information') ^>">
+        <section class="bg-info">
             <div class="container">
                 <%_ if (pr.infoBanner.mainHTML != null) { -%>
                     <p class="cdts-banner-text"><%- pr.infoBanner.mainHTML %></p>
@@ -50,8 +50,8 @@
     <div id="wb-bnr" class="container">
         <div class="row">
             <%_ if (pr.lngLinks != null) { -%>
-                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right" aria-labelledby="cdts-languageSelection">
-                    <h2 class="wb-inv" id="cdts-languageSelection"><^- msg('Language selection') ^></h2>
+                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right">
+                    <h2 class="wb-inv"><^- msg('Language selection') ^></h2>
                     <ul class="list-inline mrgn-bttm-0">
                         <%_ for (var linkIndex=0; linkIndex<pr.lngLinks.length; linkIndex++) {
                             const link=pr.lngLinks[linkIndex];-%>
@@ -74,8 +74,8 @@
             </div>
             <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
                 const item=pr.customSearch[0]; -%>
-                <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-topSearch">
-                    <h2 id="cdts-topSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
+                <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg">
+                    <h2><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
                     <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" aria-label="<^- msg('Search Criteria') ^>">
                         <div class="form-group wb-srch-qry">
                             <label for="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
@@ -99,11 +99,11 @@
         <div class="container">
             <div class="row">
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                    <section class="col-xs-12 col-sm-7" aria-label="<^- msg('Application') ^>">
+                    <section class="col-xs-12 col-sm-7">
                 <%_ } else if (pr.headerMenu != null) { -%>
-                    <section class="col-xs-12 col-sm-9 cdts-app-title-menu" aria-label="<^- msg('Application') ^>">
+                    <section class="col-xs-12 col-sm-9 cdts-app-title-menu">
                 <%_ } else { -%>
-                    <section class="col-xs-12" aria-label="<^- msg('Application') ^>">
+                    <section class="col-xs-12">
                 <%_ } -%>
                 <%_ if (pr.appName != null && pr.appName.length > 0) {
                     const item=pr.appName[0]; -%>
@@ -138,7 +138,7 @@
                     </nav>
                 <%_ } -%>
                 <%_ if (pr.appSettings != null || pr.signOut != null || pr.signIn != null) { -%>
-                <%#using aria-label instead of aria-labelledby because the VALUE of the label must be unique and we already have another search, we're adding a period to make it unique-%>
+                <%#using aria-label instead of aria-labelledby because the VALUE of the label must be unique and we already have another Account menu, we're adding a period to make it unique-%>
                     <nav class="col-sm-5 hidden-xs hidden-print" aria-label="<^- msg('Account menu') ^>.">
                         <h2 class="wb-inv" id="cdts-hiddenAccountMenu"><^- msg('Account menu') ^></h2>
                         <ul class="app-list-account list-unstyled">
@@ -174,10 +174,10 @@
                     </ul>
                     <div id="mb-pnl"></div>
                     <%_ if (pr.customSearch != null && pr.customSearch.length > 0) {
-                        const item=pr.customSearch[0]; -%><%#using aria-label instead of aria-labelledby because the VALUE of the label must be unique and we already have another search, we're adding a period to make it unique-%>
-                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t" aria-label="<^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %>.">
+                        const item=pr.customSearch[0]; -%>
+                        <section id="app-srch-mb" class="wb-overlay modal-content overlay-def wb-bar-t">
                             <div class="modal-header">
-                                <h3 class="modal-title" id="cdts-appSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h3>
+                                <h3 class="modal-title"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h3>
                             </div>
                             <div class="modal-body">
                                 <form action="<%= item.action %>" method="<%= item.method %>" name="cse-search-box" role="search" class="form-inline" aria-label="<^- msg('Search Criteria') ^>.">
diff --git a/src/gcweb/splash.ejs b/src/gcweb/splash.ejs
index 3a0638a5..f96215cb 100644
--- a/src/gcweb/splash.ejs
+++ b/src/gcweb/splash.ejs
@@ -27,18 +27,18 @@
                 </div>
             </div>
             <div class="row cdts-splash">
-                <section class="col-xs-6 text-right" lang="en" aria-labelledby="cdts-governmentOfCanada">
+                <section class="col-xs-6 text-right" lang="en">
                     <%_ if (pr.nameEng != null) { -%>
-                        <h2 id="cdts-governmentOfCanada"><%= pr.nameEng %></h2>
+                        <h2><%= pr.nameEng %></h2>
                     <%_ } else { -%>
-                        <h2 class="wb-inv" id="cdts-governmentOfCanada">Government of Canada</h2>
+                        <h2 class="wb-inv">Government of Canada</h2>
                     <%_ } -%>
                 </section>
-                <section class="col-xs-6" lang="fr" aria-labelledby="cdts-gouvernementDuCanada">
+                <section class="col-xs-6" lang="fr">
                     <%_ if (pr.nameFra != null) { -%>
-                        <h2 id="cdts-gouvernementDuCanada"><%= pr.nameFra %></h2>
+                        <h2><%= pr.nameFra %></h2>
                     <%_ } else { -%>
-                        <h2 class="wb-inv" id="cdts-gouvernementDuCanada">Gouvernement du Canada</h2>
+                        <h2 class="wb-inv">Gouvernement du Canada</h2>
                     <%_ } -%>
                 </section>
             </div>
diff --git a/src/gcweb/top.ejs b/src/gcweb/top.ejs
index 445dfb4e..3b175336 100644
--- a/src/gcweb/top.ejs
+++ b/src/gcweb/top.ejs
@@ -21,8 +21,8 @@
     <div id="wb-bnr" class="container">
         <div class="row">
             <%_ if (pr.lngLinks != null) { -%>
-                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right" aria-labelledby="cdts-languageSelection">
-                    <h2 class="wb-inv" id="cdts-languageSelection"><^- msg('Language selection') ^></h2>
+                <section id="wb-lng" class="col-xs-3 col-sm-12 pull-right text-right">
+                    <h2 class="wb-inv"><^- msg('Language selection') ^></h2>
                     <ul class="list-inline mrgn-bttm-0">
                         <%_ for (var linkIndex=0; linkIndex<pr.lngLinks.length; linkIndex++) { 
                             const link=pr.lngLinks[linkIndex];-%>
@@ -45,8 +45,8 @@
             <%_ if (pr.search != false) { -%>
                 <%_ if (pr.customSearch != null && pr.customSearch.length > 0) { 
                     const item=pr.customSearch[0]; -%>
-                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg" aria-labelledby="cdts-topSearch">
-                        <h2 id="cdts-topSearch"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
+                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4 visible-md visible-lg">
+                        <h2><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></h2>
                         <form action="<%- item.action %>" method="<%= item.method %>" name="cse-search-box" role="search">
                             <div class="form-group wb-srch-qry">
                                 <label for="<%= item.id != null? item.id: 'wb-srch-q' %>" class="wb-inv"><^- msg('Search') ^><%= item.placeholder != null? ' ' + item.placeholder: '' %></label>
@@ -64,8 +64,8 @@
                         </form>
                     </section>
                 <%_ } else { -%>
-                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4" aria-labelledby="cdts-topSearch">
-                        <h2 id="cdts-topSearch"><^- msg('Search') ^></h2>
+                    <section id="wb-srch" class="col-lg-offset-4 col-md-offset-4 col-sm-offset-2 col-xs-12 col-sm-5 col-md-4">
+                        <h2><^- msg('Search') ^></h2>
                         <form action="<^- msg('https://www.canada.ca/en/sr/srb.html') ^>" method="get" name="cse-search-box" role="search" accept-charset="utf-8">
                             <div class="form-group wb-srch-qry">
                                 <label for="wb-srch-q" class="wb-inv"><^- msg('Search Canada.ca') ^></label>
diff --git a/src/gcweb/wet-messages.en.json b/src/gcweb/wet-messages.en.json
index ad966134..f561d840 100644
--- a/src/gcweb/wet-messages.en.json
+++ b/src/gcweb/wet-messages.en.json
@@ -73,10 +73,6 @@
         "source": "Information Banner",
         "target": null
     },
-    "0eb5ed506e4923c28d7f4a8aa69efe99b3ad75d1": {
-        "source": "Information",
-        "target": null
-    },
     "9b0c2133d530bdd7b3b7e239c94faf83a2097da9": {
         "source": "Government of Canada",
         "target": null
@@ -105,10 +101,6 @@
         "source": "Search Criteria",
         "target": null
     },
-    "b291beb8793f4f3308c463951165dad483715a6c": {
-        "source": "Application",
-        "target": null
-    },
     "63f3f0da3e2031cedf938ea18363e51a893e095d": {
         "source": "Name of Web application",
         "target": null

From 7c1ab163cdf48dfc0b96c0640794ec4a99758923 Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Thu, 14 Mar 2024 17:08:32 -0400
Subject: [PATCH 26/28] fixed to include new rules in v8.15.0

---
 package-lock.json                  | 30 ++++++++++++-------------
 package.json                       |  2 +-
 test/pageobjects/appFooter.page.js |  1 -
 test/specs/appFooter.js            | 36 ------------------------------
 4 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 802219d0..c8b08bf7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
         "grunt-contrib-uglify": "^5.2.2",
         "grunt-contrib-watch": "^1.1.0",
         "grunt-eslint": "^24.3.0",
-        "html-validate": "^8.9.1",
+        "html-validate": "^8.15.0",
         "https-proxy-agent": "^7.0.4",
         "isbinaryfile": "^5.0.2"
       }
@@ -5571,9 +5571,9 @@
       }
     },
     "node_modules/html-validate": {
-      "version": "8.9.1",
-      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.9.1.tgz",
-      "integrity": "sha512-2tWa2FtFALooZ5wMDbY+HS0BieoiRfS5IeiG2XeM6bb3Jx4dmN1HFPFt0v3j7r3SpNxEVKiXYLdkBZI3kkca/g==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.15.0.tgz",
+      "integrity": "sha512-kqRgG8IDb6rMuQkMAsH7tmzkKTU7a67c0ZZDu4JlncIhImoPFra3H4CzdtIxF7hWaFTXR//QRGEwFiidjh0wfQ==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.0",
@@ -5582,7 +5582,7 @@
         "ajv": "^8.0.0",
         "deepmerge": "4.3.1",
         "glob": "^10.0.0",
-        "ignore": "5.3.0",
+        "ignore": "5.3.1",
         "kleur": "^4.1.0",
         "minimist": "^1.2.0",
         "prompts": "^2.0.0",
@@ -5845,9 +5845,9 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -15144,9 +15144,9 @@
       }
     },
     "html-validate": {
-      "version": "8.9.1",
-      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.9.1.tgz",
-      "integrity": "sha512-2tWa2FtFALooZ5wMDbY+HS0BieoiRfS5IeiG2XeM6bb3Jx4dmN1HFPFt0v3j7r3SpNxEVKiXYLdkBZI3kkca/g==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-8.15.0.tgz",
+      "integrity": "sha512-kqRgG8IDb6rMuQkMAsH7tmzkKTU7a67c0ZZDu4JlncIhImoPFra3H4CzdtIxF7hWaFTXR//QRGEwFiidjh0wfQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.0",
@@ -15155,7 +15155,7 @@
         "ajv": "^8.0.0",
         "deepmerge": "4.3.1",
         "glob": "^10.0.0",
-        "ignore": "5.3.0",
+        "ignore": "5.3.1",
         "kleur": "^4.1.0",
         "minimist": "^1.2.0",
         "prompts": "^2.0.0",
@@ -15331,9 +15331,9 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
       "dev": true
     },
     "import-fresh": {
diff --git a/package.json b/package.json
index 7ab12330..e7d35774 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "grunt-contrib-uglify": "^5.2.2",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-eslint": "^24.3.0",
-    "html-validate": "^8.9.1",
+    "html-validate": "^8.15.0",
     "https-proxy-agent": "^7.0.4",
     "isbinaryfile": "^5.0.2"
   }
diff --git a/test/pageobjects/appFooter.page.js b/test/pageobjects/appFooter.page.js
index 29d7ca5d..1bd61494 100644
--- a/test/pageobjects/appFooter.page.js
+++ b/test/pageobjects/appFooter.page.js
@@ -26,7 +26,6 @@ class AppFooterPage extends Page {
     get customFooterLinkTextSubTheme() { return $('//footer[@id="wb-info"]/nav/h2/following-sibling::div/section[4]/h3'); }
     get cssScriptESDC() { return $('//head/link[contains(@href, "/cdts/esdc.css")] | //head/link[contains(@href, "cdts-esdc-styles.css")] | //head/link[contains(@href, "cdts-labour-styles.css")]'); }
     get cssScriptECCC() { return $('//head/link[contains(@href, "/cdts/eccc.css")] | //head/link[contains(@href, "cdts-eccc-styles.css")]'); }
-    get footerSectionIntranet() { return $('//footer/nav/div/section[@class="col-md-3 col-sm-6 col-lg-3"]')}
 
     /**
     * Opens a sub page of the page
diff --git a/test/specs/appFooter.js b/test/specs/appFooter.js
index b02d74ce..ab955103 100644
--- a/test/specs/appFooter.js
+++ b/test/specs/appFooter.js
@@ -241,22 +241,6 @@ describe('AppFooter section tests for GCIntranet', () => {
         refFooter: '{"cdnEnv": "localhost"}'
 	});
 
-    generateTestFile('./test/html/gcintranet/template-gcintranetapp-en.html', 'gcintranet', 'gcintranet-appFooter-noFooterSectionName-en', {
-        refTop: '{"cdnEnv": "localhost", "subTheme": "labour"}',
-        appTop: '{"cdnEnv": "localhost", "appName": [{"text": "Application name", "href": "#"}]}',
-        preFooter: '{"cdnEnv": "localhost"}',
-        appFooter: '{"subTheme":"labour", "footerSections":[{ "customFooterLinks":[{ "href":"#", "text":"link1-1-new Window", "newWindow":true }] }, { "sectionName":"Custom Section 2", "customFooterLinks":[{ "href":"#", "text":"link2-1-new Window", "newWindow":true }] }, { "sectionName":"Custom Section 3", "customFooterLinks":[{ "href":"#", "text":"link3-1-new Window", "newWindow":true }] }], "cdnEnv": "localhost"}',
-        refFooter: '{"cdnEnv": "localhost"}'
-	});
-
-    generateTestFile('./test/html/gcintranet/template-gcintranetapp-fr.html', 'gcintranet', 'gcintranet-appFooter-noFooterSectionName-fr', {
-        refTop: '{"cdnEnv": "localhost"}',
-        appTop: '{"cdnEnv": "localhost", "appName": [{"text": "Application name", "href": "#"}]}',
-        preFooter: '{"cdnEnv": "localhost"}',
-        appFooter: '{"subTheme":"labour", "footerSections":[{ "customFooterLinks":[{ "href":"#", "text":"link1-1-new Window", "newWindow":true }] }, { "sectionName":"Custom Section 2", "customFooterLinks":[{ "href":"#", "text":"link2-1-new Window", "newWindow":true }] }, { "sectionName":"Custom Section 3", "customFooterLinks":[{ "href":"#", "text":"link3-1-new Window", "newWindow":true }] }], "cdnEnv": "localhost"}',
-        refFooter: '{"cdnEnv": "localhost"}'
-	});
-
     it('Validate the footer links', async () => {
         await footerLinksIntranet(theme, 'en');
         await footerLinksIntranet(theme, 'fr');
@@ -310,16 +294,6 @@ describe('AppFooter section tests for GCIntranet', () => {
         await cssScriptECCC(theme, 'en');
     });
 
-    it('Test if aria-label when no footer section name', async () => {
-        await customFooterNoSectionName(theme, 'en');
-        await customFooterNoSectionName(theme, 'fr');
-    });
-
-    it('Test if aria-labelledby with footer section name', async () => {
-        await customFooterWithSectionName(theme, 'en');
-        await customFooterWithSectionName(theme, 'fr');
-    });
-
     it('Accessibility', async () => {
         await accessibility(theme, 'en');
         await accessibility(theme, 'fr');
@@ -441,16 +415,6 @@ async function footerContactLink(theme, lang){
     await expect(appFooterPage.contactLink).toHaveHrefContaining('contactLinksTest');
 }
 
-async function customFooterNoSectionName(theme, lang){
-    await appFooterPage.open(theme, lang, 'noFooterSectionName');
-    await expect(appFooterPage.footerSectionIntranet).toHaveAttribute('aria-label');
-}
-
-async function customFooterWithSectionName(theme, lang){
-    await appFooterPage.open(theme, lang);
-    await expect(appFooterPage.footerSectionIntranet).toHaveAttribute('aria-labelledby');
-}
-
 async function accessibility(theme, lang) {
     await appFooterPage.open(theme, lang);
     await runAccessbilityTest();

From 92a9707d45a00257250b403c22b8c549a19ffdbc Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Tue, 19 Mar 2024 11:20:34 -0400
Subject: [PATCH 27/28] fixes code as per additional comments

---
 package-lock.json                   | 12 ++++++------
 src/gcintranet/appFooter.ejs        |  4 +---
 src/gcintranet/appTop.ejs           |  6 +++---
 src/gcintranet/top.ejs              |  4 ++--
 src/gcintranet/wet-messages.en.json |  8 ++------
 src/gcweb/appTop.ejs                |  8 ++++----
 src/gcweb/footer.ejs                |  8 ++++----
 src/gcweb/top.ejs                   |  4 ++--
 8 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c8b08bf7..30c7cfcb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4222,9 +4222,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true,
       "funding": [
         {
@@ -14168,9 +14168,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "dev": true
     },
     "for-in": {
diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs
index ca157f23..4f841e3e 100644
--- a/src/gcintranet/appFooter.ejs
+++ b/src/gcintranet/appFooter.ejs
@@ -34,11 +34,9 @@
                             </section>
                         <%_ } -%>
                     <%_ } else if (sectionIndex == 0) { /*For backward compatibility */ -%>
+                        <section class="col-md-3 col-sm-6 col-lg-3">
                             <%_ if (footerSection.sectionName != null) { -%>
-                                <section class="col-md-3 col-sm-6 col-lg-3">
                                 <h3><%= footerSection.sectionName %></h3>
-                            <%_ } else { -%>
-                                <section class="col-md-3 col-sm-6 col-lg-3">
                             <%_ } -%>
                             <ul class="list-unstyled">
                                 <%_ for (var linkIndex=0; linkIndex<pr.footerSections.length; linkIndex++) {
diff --git a/src/gcintranet/appTop.ejs b/src/gcintranet/appTop.ejs
index 781eae18..83eefed1 100644
--- a/src/gcintranet/appTop.ejs
+++ b/src/gcintranet/appTop.ejs
@@ -55,7 +55,7 @@ if (pr.subTheme === 'eccc') {
         <%_ } -%>
     </ul>
 </nav>
-<header role="banner" aria-label="<^- msg('GCintranet header') ^>">
+<header role="banner" aria-label="<^- msg('Intranet Banner') ^>">
     <div id="wb-bnr">
         <div id="app-brand">
             <div class="container">
@@ -294,8 +294,8 @@ if (pr.subTheme === 'eccc') {
         <div id="wb-sm" data-ajax-replace="<%- wet.builder.environment(pr.cdnEnv) %>cdts/ajax/<^- msg('appmenu-eng.html') ^>" data-trgt="mb-pnl" class="wb-menu hidden-sm hidden-xs"></div>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != null) { -%>
-        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="breadcrumbPosition">
-            <h2 id="breadcrumbPosition"><^- msg('You are here:') ^></h2>
+        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbPosition">
+            <h2 id="cdts-breadcrumbPosition"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ for (var breadcrumbIndex=0; breadcrumbIndex<pr.breadcrumbs.length; breadcrumbIndex++) {
diff --git a/src/gcintranet/top.ejs b/src/gcintranet/top.ejs
index d2373f0a..4627bc21 100644
--- a/src/gcintranet/top.ejs
+++ b/src/gcintranet/top.ejs
@@ -267,8 +267,8 @@ if (pr.subTheme === 'eccc') {
         <%_ } -%>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != false) { -%>
-        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="breadcrumbPosition">
-            <h2 id="breadcrumbPosition"><^- msg('You are here:') ^></h2>
+        <nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbPosition">
+            <h2 id="cdts-breadcrumbPosition"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ if (pr.breadcrumbs != null) { -%>
diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json
index 684a088b..789b2de9 100644
--- a/src/gcintranet/wet-messages.en.json
+++ b/src/gcintranet/wet-messages.en.json
@@ -197,8 +197,8 @@
         "source": "Skip to section menu",
         "target": null
     },
-    "baab55ac4da1ff0e442b592dda1b4a9b16e8e1f4": {
-        "source": "GCintranet header",
+    "5b82747d146bcb033f073f1c4465847546261d56": {
+        "source": "Intranet Banner",
         "target": null
     },
     "99a3e18460e703b6b52b26b4155c66c3e3ba24bc": {
@@ -369,10 +369,6 @@
         "source": "Section menu",
         "target": null
     },
-    "5b82747d146bcb033f073f1c4465847546261d56": {
-        "source": "Intranet Banner",
-        "target": null
-    },
     "f43ac2b672a1db811dd7168a1e7cc1add2fb79b0": {
         "source": "esdcmenu-eng.html",
         "target": null
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index 4de961d6..c0102365 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -223,8 +223,8 @@
         </div>
 
         <%_ if (pr.menuLinks != null) { -%>
-            <nav id="wb-sm" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-label="<^- msg('Main navigation menu') ^>">
-                <div class="pnl-strt container nvbar" aria-labelledby="appNavMenu">
+            <nav id="wb-sm" data-trgt="mb-pnl" class="wb-menu visible-md visible-lg" typeof="SiteNavigationElement" aria-labelledby="appNavMenu">
+                <div class="pnl-strt container nvbar">
                     <h2 class="wb-inv" id="appNavMenu"><^- msg('Main navigation menu') ^></h2>
                     <div class="row">
                         <ul class="list-inline menu" role="menubar">
@@ -257,8 +257,8 @@
         <%_ } -%>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != null) { -%>
-        <nav id="wb-bc" property="breadcrumb" aria-labelledby="breadcrumbPosition">
-            <h2 id="breadcrumbPosition"><^- msg('You are here:') ^></h2>
+        <nav id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbPosition">
+            <h2 id="cdts-breadcrumbPosition"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ for (var breadcrumbIndex=0; breadcrumbIndex<pr.breadcrumbs.length; breadcrumbIndex++) {
diff --git a/src/gcweb/footer.ejs b/src/gcweb/footer.ejs
index 2c682db7..d4c8f5d6 100644
--- a/src/gcweb/footer.ejs
+++ b/src/gcweb/footer.ejs
@@ -30,8 +30,8 @@
     <%_ if (pr.showFooter != false && pr.hideFooterMain != true) { -%>
         <div id="transactFooter" class="gc-main-footer">
             <div class="container">
-                <nav aria-labelledby="transactGcweb">
-                    <h3 id="transactGcweb"><^- msg('Government of Canada') ^></h3>
+                <nav aria-labelledby="cdts-transactGcweb">
+                    <h3 id="cdts-transactGcweb"><^- msg('Government of Canada') ^></h3>
                     <ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
                         <%_ if (pr.contactLinks != null && pr.contactLinks.length > 0) {
                             const link=pr.contactLinks[0]; -%>
@@ -69,8 +69,8 @@
     <%_ } -%>
     <div class="gc-sub-footer">
         <div class="container d-flex align-items-center">
-            <nav aria-labelledby="aboutGcweb">
-                <h3 class="wb-inv" id="aboutGcweb"><^- msg('Government of Canada Corporate') ^></h3>
+            <nav aria-labelledby="cdts-aboutGcweb">
+                <h3 class="wb-inv" id="cdts-aboutGcweb"><^- msg('Government of Canada Corporate') ^></h3>
                 <%_ if (pr.showFooter != false) { -%>
                     <ul>
                         <%_ if (pr.hideFooterCorporate != true) { -%>
diff --git a/src/gcweb/top.ejs b/src/gcweb/top.ejs
index 3b175336..4008979e 100644
--- a/src/gcweb/top.ejs
+++ b/src/gcweb/top.ejs
@@ -110,8 +110,8 @@
         <div class="transactBar"></div>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != false) { -%>
-        <nav id="wb-bc" property="breadcrumb" aria-labelledby="breadcrumbPosition">
-            <h2 id="breadcrumbPosition"><^- msg('You are here:') ^></h2>
+        <nav id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbPosition">
+            <h2 id="cdts-breadcrumbPosition"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ if (pr.breadcrumbs != null) { -%>

From 86370cd2127d7a4bea6c6614dedbd1e404e75f5f Mon Sep 17 00:00:00 2001
From: j-paquette <56076749+j-paquette@users.noreply.github.com>
Date: Wed, 20 Mar 2024 10:57:46 -0400
Subject: [PATCH 28/28] fixes code based on latest comments

---
 src/gcintranet/appFooter.ejs | 4 +---
 src/gcweb/appTop.ejs         | 4 ++--
 src/gcweb/top.ejs            | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs
index 4f841e3e..0744338c 100644
--- a/src/gcintranet/appFooter.ejs
+++ b/src/gcintranet/appFooter.ejs
@@ -19,11 +19,9 @@
                     const footerSection=pr.footerSections[sectionIndex];-%>
                     <%_ if (footerSection.customFooterLinks != null) { -%>
                         <%_ if (sectionIndex < 3) { -%>
+                            <section class="col-md-3 col-sm-6 col-lg-3">
                                 <%_ if (footerSection.sectionName != null) { -%>
-                                    <section class="col-md-3 col-sm-6 col-lg-3">
                                     <h3><%= footerSection.sectionName %></h3>
-                                <%_ } else { -%>
-                                    <section class="col-md-3 col-sm-6 col-lg-3">
                                 <%_ } -%>
                                 <ul class="list-unstyled">
                                     <%_ for (var linkIndex=0; linkIndex<footerSection.customFooterLinks.length; linkIndex++) {
diff --git a/src/gcweb/appTop.ejs b/src/gcweb/appTop.ejs
index c0102365..43a0cebe 100644
--- a/src/gcweb/appTop.ejs
+++ b/src/gcweb/appTop.ejs
@@ -257,8 +257,8 @@
         <%_ } -%>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != null) { -%>
-        <nav id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbPosition">
-            <h2 id="cdts-breadcrumbPosition"><^- msg('You are here:') ^></h2>
+        <nav id="wb-bc" property="breadcrumb" aria-labelledby="breadcrumbPosition">
+            <h2 id="breadcrumbPosition"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ for (var breadcrumbIndex=0; breadcrumbIndex<pr.breadcrumbs.length; breadcrumbIndex++) {
diff --git a/src/gcweb/top.ejs b/src/gcweb/top.ejs
index 4008979e..3b175336 100644
--- a/src/gcweb/top.ejs
+++ b/src/gcweb/top.ejs
@@ -110,8 +110,8 @@
         <div class="transactBar"></div>
     <%_ } -%>
     <%_ if (pr.breadcrumbs != false) { -%>
-        <nav id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbPosition">
-            <h2 id="cdts-breadcrumbPosition"><^- msg('You are here:') ^></h2>
+        <nav id="wb-bc" property="breadcrumb" aria-labelledby="breadcrumbPosition">
+            <h2 id="breadcrumbPosition"><^- msg('You are here:') ^></h2>
             <div class="container">
                 <ol class="breadcrumb">
                     <%_ if (pr.breadcrumbs != null) { -%>