Skip to content

Commit 1110dec

Browse files
plup2plup2
authored
Merge pull request #25 from wet-boew/24-update-the-left-menu-layout-to-fix-accessibility
Updating left menu layouts to fix accessibility issue
2 parents f7ce4f7 + 8853fea commit 1110dec

6 files changed

Lines changed: 166 additions & 166 deletions

File tree

‎gocwebtemplate-core/gocwebtemplate-core-spring/src/main/resources/goc/webtemplate/goc_layouts/application-leftmenu-master-template.html‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,42 @@
33
<!--[if gt IE 8]><!-->
44
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" class="no-js" dir="ltr" th:with="${goctemplateclientbean}?: goctemplateclientbean=${@defaulttemplatespringbean}" th:lang="${goctemplateclientbean.twoLetterCultureLanguage}">
55
<head>
6-
<meta charset="utf-8" />
7-
<!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
8-
wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html -->
9-
<div layout:fragment="title" th:remove="tag"><title th:text="${goctemplateclientbean.headerTitle}"></title></div>
10-
<meta content="width=device-width,initial-scale=1" name="viewport" />
11-
<!-- Load closure template scripts -->
6+
<meta charset="utf-8" />
7+
<!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
8+
wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html -->
9+
<div layout:fragment="title" th:remove="tag"><title th:text="${goctemplateclientbean.headerTitle}"></title></div>
10+
<meta content="width=device-width,initial-scale=1" name="viewport" />
11+
<!-- Load closure template scripts -->
1212
<link th:remove="tag" th:utext='|<link rel="stylesheet" ${goctemplateclientbean.appCssPathAttributes}>|'>
1313
<script th:remove="tag" th:utext='|<script type="text/javascript" ${goctemplateclientbean.wetJsPathAttributes} data-cdts-setup=&apos;${goctemplateclientbean.renderAppSetup}&apos;></script>|'></script>
14-
<noscript>
15-
<!-- Write closure fall-back static file -->
16-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'refTop.html')})]
17-
</noscript>
14+
<noscript>
15+
<!-- Write closure fall-back static file -->
16+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'refTop.html')})]
17+
</noscript>
1818
[(${goctemplateclientbean.renderHtmlHeaderElements})]
1919
<!-- GoC Web Template Build Version [(${goctemplateclientbean.webTemplateDistributionVersion})] -->
2020
</head>
2121
<body vocab="http://schema.org/" typeof="WebPage">
22-
[(${goctemplateclientbean.renderSessionTimeoutControl})]
23-
<div id="cdts-def-top">
24-
<!-- Write closure fall-back static file -->
25-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'appTop-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
26-
</div>
22+
[(${goctemplateclientbean.renderSessionTimeoutControl})]
23+
<div id="cdts-def-top">
24+
<!-- Write closure fall-back static file -->
25+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'appTop-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
26+
</div>
2727
<div class="container">
2828
<div class="row">
29-
<main role="main" property="mainContentOfPage" class="col-md-9 col-md-push-3" typeof="WebPageElement">
30-
<!-- the main content -->
31-
<section layout:fragment="content"></section>
32-
<!-- end main content -->
33-
<div id="cdts-def-preFooter">
34-
<!-- Write closure fall-back static file -->
35-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'preFooter-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
36-
</div>
37-
</main>
38-
<nav class="wb-sec col-md-3 col-md-pull-9" typeof="SiteNavigationElement" id="wb-sec" role="navigation">
39-
<!-- Write closure fall-back static file -->
40-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'secMenu-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
41-
</nav>
29+
<nav class="wb-sec col-md-3" typeof="SiteNavigationElement" id="wb-sec" role="navigation">
30+
<!-- Write closure fall-back static file -->
31+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'secMenu-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
32+
</nav>
33+
<main role="main" property="mainContentOfPage" class="col-md-9" typeof="WebPageElement">
34+
<!-- the main content -->
35+
<section layout:fragment="content"></section>
36+
<!-- end main content -->
37+
<div id="cdts-def-preFooter">
38+
<!-- Write closure fall-back static file -->
39+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'preFooter-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
40+
</div>
41+
</main>
4242
</div>
4343
</div>
4444
<div id="cdts-def-footer">

‎gocwebtemplate-core/gocwebtemplate-core-spring/src/main/resources/goc/webtemplate/goc_layouts/leftmenu-master-template.html‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,44 @@
33
<!--[if gt IE 8]><!-->
44
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" class="no-js" dir="ltr" th:with="${goctemplateclientbean}?: goctemplateclientbean=${@defaulttemplatespringbean}" th:lang="${goctemplateclientbean.twoLetterCultureLanguage}">
55
<head>
6-
<meta charset="utf-8" />
7-
<!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
8-
wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html -->
9-
<div layout:fragment="title" th:remove="tag"><title th:text="${goctemplateclientbean.headerTitle}"></title></div>
10-
<meta content="width=device-width,initial-scale=1" name="viewport" />
11-
<!-- Load closure template scripts -->
6+
<meta charset="utf-8" />
7+
<!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
8+
wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html -->
9+
<div layout:fragment="title" th:remove="tag"><title th:text="${goctemplateclientbean.headerTitle}"></title></div>
10+
<meta content="width=device-width,initial-scale=1" name="viewport" />
11+
<!-- Load closure template scripts -->
1212
<link th:remove="tag" th:utext='|<link rel="stylesheet" ${goctemplateclientbean.cssPathAttributes}>|'>
1313
<script th:remove="tag" th:utext='|<script type="text/javascript" ${goctemplateclientbean.wetJsPathAttributes} data-cdts-setup=&apos;${goctemplateclientbean.renderSetup}&apos;></script>|'></script>
14-
<noscript>
15-
<!-- Write closure fall-back static file -->
16-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'refTop.html')})]
17-
</noscript>
14+
<noscript>
15+
<!-- Write closure fall-back static file -->
16+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'refTop.html')})]
17+
</noscript>
1818
[(${goctemplateclientbean.renderHtmlHeaderElements})]
1919
<!-- GoC Web Template Build Version [(${goctemplateclientbean.webTemplateDistributionVersion})] -->
2020
</head>
2121
<body vocab="http://schema.org/" typeof="WebPage">
22-
[(${goctemplateclientbean.renderSessionTimeoutControl})]
23-
<div id="cdts-def-top">
24-
<!-- Write closure fall-back static file -->
25-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'top-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
26-
</div>
27-
<div class="container">
28-
<div class="row">
29-
<main role="main" property="mainContentOfPage" class="col-md-9 col-md-push-3" typeof="WebPageElement">
30-
<!-- the main content -->
31-
<section layout:fragment="content"></section>
32-
<!-- end main content -->
33-
<div id="cdts-def-preFooter">
34-
<!-- Write closure fall-back static file -->
35-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'preFooter-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
36-
</div>
37-
</main>
38-
<nav class="wb-sec col-md-3 col-md-pull-9" typeof="SiteNavigationElement" id="wb-sec" role="navigation">
39-
<!-- Write closure fall-back static file -->
40-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'secMenu-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
41-
</nav>
42-
</div>
43-
</div>
22+
[(${goctemplateclientbean.renderSessionTimeoutControl})]
23+
<div id="cdts-def-top">
24+
<!-- Write closure fall-back static file -->
25+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'top-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
26+
</div>
27+
<div class="container">
28+
<div class="row">
29+
<nav class="wb-sec col-md-3" typeof="SiteNavigationElement" id="wb-sec" role="navigation">
30+
<!-- Write closure fall-back static file -->
31+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'secMenu-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
32+
</nav>
33+
<main role="main" property="mainContentOfPage" class="col-md-9" typeof="WebPageElement">
34+
<!-- the main content -->
35+
<section layout:fragment="content"></section>
36+
<!-- end main content -->
37+
<div id="cdts-def-preFooter">
38+
<!-- Write closure fall-back static file -->
39+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'preFooter-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
40+
</div>
41+
</main>
42+
</div>
43+
</div>
4444
<div id="cdts-def-footer">
4545
<!-- Write closure fall-back static file -->
4646
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'footer-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]

‎gocwebtemplate-core/gocwebtemplate-core-spring/src/main/resources/goc/webtemplate/goc_layouts/transactional-leftmenu-master-template.html‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,44 @@
33
<!--[if gt IE 8]><!-->
44
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" class="no-js" dir="ltr" th:with="${goctemplateclientbean}?: goctemplateclientbean=${@defaulttemplatespringbean}" th:lang="${goctemplateclientbean.twoLetterCultureLanguage}">
55
<head>
6-
<meta charset="utf-8" />
7-
<!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
8-
wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html -->
9-
<div layout:fragment="title" th:remove="tag"><title th:text="${goctemplateclientbean.headerTitle}"></title></div>
10-
<meta content="width=device-width,initial-scale=1" name="viewport" />
11-
<!-- Load closure template scripts -->
6+
<meta charset="utf-8" />
7+
<!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
8+
wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html -->
9+
<div layout:fragment="title" th:remove="tag"><title th:text="${goctemplateclientbean.headerTitle}"></title></div>
10+
<meta content="width=device-width,initial-scale=1" name="viewport" />
11+
<!-- Load closure template scripts -->
1212
<link th:remove="tag" th:utext='|<link rel="stylesheet" ${goctemplateclientbean.cssPathAttributes}>|'>
1313
<script th:remove="tag" th:utext='|<script type="text/javascript" ${goctemplateclientbean.wetJsPathAttributes} data-cdts-setup=&apos;${goctemplateclientbean.renderTransactionalSetup}&apos;></script>|'></script>
14-
<noscript>
15-
<!-- Write closure fall-back static file -->
16-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'refTop.html')})]
17-
</noscript>
14+
<noscript>
15+
<!-- Write closure fall-back static file -->
16+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'refTop.html')})]
17+
</noscript>
1818
[(${goctemplateclientbean.renderHtmlHeaderElements})]
1919
<!-- GoC Web Template Build Version [(${goctemplateclientbean.webTemplateDistributionVersion})] -->
2020
</head>
2121
<body vocab="http://schema.org/" typeof="WebPage">
22-
[(${goctemplateclientbean.renderSessionTimeoutControl})]
23-
<div id="cdts-def-top">
24-
<!-- Write closure fall-back static file -->
25-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'transactTop-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
26-
</div>
27-
<div class="container">
28-
<div class="row">
29-
<main role="main" property="mainContentOfPage" class="col-md-9 col-md-push-3" typeof="WebPageElement">
30-
<!-- the main content -->
31-
<section layout:fragment="content"></section>
32-
<!-- end main content -->
33-
<div id="cdts-def-preFooter">
34-
<!-- Write closure fall-back static file -->
35-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'preFooter-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
36-
</div>
37-
</main>
38-
<nav class="wb-sec col-md-3 col-md-pull-9" typeof="SiteNavigationElement" id="wb-sec" role="navigation">
39-
<!-- Write closure fall-back static file -->
40-
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'secMenu-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
41-
</nav>
42-
</div>
43-
</div>
22+
[(${goctemplateclientbean.renderSessionTimeoutControl})]
23+
<div id="cdts-def-top">
24+
<!-- Write closure fall-back static file -->
25+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'transactTop-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
26+
</div>
27+
<div class="container">
28+
<div class="row">
29+
<nav class="wb-sec col-md-3" typeof="SiteNavigationElement" id="wb-sec" role="navigation">
30+
<!-- Write closure fall-back static file -->
31+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'secMenu-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
32+
</nav>
33+
<main role="main" property="mainContentOfPage" class="col-md-9" typeof="WebPageElement">
34+
<!-- the main content -->
35+
<section layout:fragment="content"></section>
36+
<!-- end main content -->
37+
<div id="cdts-def-preFooter">
38+
<!-- Write closure fall-back static file -->
39+
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'preFooter-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]
40+
</div>
41+
</main>
42+
</div>
43+
</div>
4444
<div id="cdts-def-footer">
4545
<!-- Write closure fall-back static file -->
4646
[(${@applicationscopebean.getStaticFile(goctemplateclientbean.staticFallbackFilePath, goctemplateclientbean.theme, 'transactFooter-'.concat(goctemplateclientbean.twoLetterCultureLanguage).concat('.html'))})]

0 commit comments

Comments
 (0)