Skip to content

Commit 21127c8

Browse files
authored
Merge pull request #1423 from wet-boew/1422-accessibility-revert-gcintranet-apptop-before-release-5041
fixes 1422
2 parents 8156c21 + d43cacb commit 21127c8

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

src/gcintranet/appTop.ejs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,8 @@ if (pr.subTheme === 'eccc') {
291291
</nav>
292292
<%_ } else if (pr.menuPath != null) { -%>
293293
<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>
294+
<%_ } else { -%>
295+
<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>
294296
<%_ } -%>
295297
<%_ if (pr.breadcrumbs != null) { -%>
296298
<nav role="navigation" id="wb-bc" property="breadcrumb" aria-labelledby="cdts-breadcrumbPosition">

src/gcintranet/wet-messages.en.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,10 @@
321321
"source": "Application menu",
322322
"target": null
323323
},
324+
"616127b124840170bb853584ca52fbb610817859": {
325+
"source": "appmenu-eng.html",
326+
"target": null
327+
},
324328
"a902791b8ecb6e346f745709cdd2db1287db6fa5": {
325329
"source": "You are here:",
326330
"target": null

src/gcintranet/wet-messages.fr.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,5 +448,9 @@
448448
"63f3f0da3e2031cedf938ea18363e51a893e095d": {
449449
"source": "Name of Web application",
450450
"target": "Nom de l'application Web"
451+
},
452+
"616127b124840170bb853584ca52fbb610817859": {
453+
"source": "appmenu-eng.html",
454+
"target": "appmenu-fra.html"
451455
}
452456
}

test/specs/appTop.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,10 +916,10 @@ async function gcToolsLinksStandard(theme, lang){
916916
await expect(basicPage.gcToolsModalLinks3).toHaveHref(expect.stringContaining('gcdirectory'));
917917
await expect(basicPage.gcToolsModalLinks4).toHaveHref(expect.stringContaining('gccollab'));
918918
}
919-
//Test to confirm the default menu was removed
919+
920920
async function defaultMenu(theme, lang){
921921
await basicPage.open(theme, lang, 'app');
922-
await expect(basicPage.defaultMenu).not.toExist();
922+
await expect(basicPage.defaultMenu).toExist();
923923
}
924924

925925
async function subThemeESDCPreConfigured(theme, lang) {

0 commit comments

Comments
 (0)