Skip to content

Commit

Permalink
# This is a combination of 6 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:

Accessibility Project - Pre-assessments

# This is the commit message wet-boew#2:

WET-380 Ajax Fetch Working Example

# This is the commit message wet-boew#3:

Content - Follow us, Lowest topic section, HTML cleanup - Code maintenance and fixing/adjusting examples (wet-boew#2196)

* Theme: Remove hardcoded post-JS HTML markup
* Remove the following hardcoded markup:
  * wb-init and wb-*-inited classes
  * wb-auto-* IDs
    * Note: Fixes broken local links caused by duplicate IDs
* Update modified dates of:
  * Pages containing affected code samples
  * Pages that reference updated samples/includes
* Spinoff of wet-boew#2179
* Content - Ajust template with the follow-us include and added example of secondary-menu
* Theme: Update page modified dates with post-JS changes
* Bump initial commit's page modified dates to current date
* Change modified dates in several extra pages that are now using the old follow-us include (components/gc-follow-us/follow.html, _includes/components/gc-follow-us/follow.html) via @duboisp's commit


GCWeb - Content - Remove hardcoded post-JS HTML markup,
GCWeb - Content - Adjusted the follow us component used on various page to match the stable example vs beta template,
GCWeb - Content - Adding working example with secondary navigation (fixing the lowest-topic section example)
GCWeb Jekyll - Minor - Add basic support for content with a secondary menu

---------

Co-authored-by: Pierre Dubois <[email protected]>
# This is the commit message wet-boew#4:

Step by step navigation: adding documentation

# This is the commit message wet-boew#5:

méli-mélo 2023-09-menu - Initial commit (wet-boew#2247)

Co-authored-by: gjb-pch <[email protected]>
# This is the commit message wet-boew#6:

Page feedback: hiding page feedback by default and updating doc>
>

Co-authored-by: Pierre Dubois <[email protected]>
  • Loading branch information
SebastianBurke and Pierre Dubois committed Nov 7, 2023
1 parent cb8dc51 commit 95b32e5
Show file tree
Hide file tree
Showing 156 changed files with 8,434 additions and 1,400 deletions.
58 changes: 58 additions & 0 deletions _data/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,64 @@
]
}
}
,{
"@context": {
"@version": 1.1,
"dct": "http://purl.org/dc/terms/",
"title": { "@id": "dct:title", "@container": "@language" },
"description": { "@id": "dct:description", "@container": "@language" },
"modified": "dct:modified"
},
"title": {
"en": "Step by Step navigation",
"fr": "Navigation étape par étape"
},
"description": {
"en": "Step by Step navigation designed based on user experience testing",
"fr": "Navigation étape par étape conçu d'après des recherches d'expérience utilisateur"
},
"modified": "2023-06-28",
"componentName": "gc-stp-stp",
"status": "stable",
"pages": {
"docs": [
{
"title": "Step by Step navigation",
"language": "en",
"path": "gc-stp-stp-doc-en.html"
},
{
"title": "Navigation étape par étape",
"language": "fr",
"path": "gc-stp-stp-doc-fr.html"
}
],
"examples": [
{
"title": "Step by Step navigation",
"language": "en",
"path": "gc-stp-stp-en.html"
},
{
"title": "Navigation étape par étape",
"language": "fr",
"path": "gc-stp-stp-fr.html"
}
],
"spec": [
{
"title": "Navigation étape par étape : Système de conception de Canada.ca",
"language": "fr",
"url": "https://conception.canada.ca/modeles-recommandes/pages-lancement-service.html"
},
{
"title": "Step by Step navigation: Canada.ca design system",
"language": "en",
"url": "https://design.canada.ca/recommended-templates/service-initiation-pages.html"
}
]
}
}
,{
"@context": {
"@version": 1.1,
Expand Down
1,065 changes: 1,064 additions & 1 deletion _data/sites.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _includes/components/gc-features/features.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2>Features</h2>
<div class="row wb-eqht-grd">
{% for i in (1..3) %}
<div class="col-lg-4 col-sm-6 hght-inhrt">
<div class="well well-sm eqht-trgt wb-init wb-eqht-grd-inited hght-inhrt" id="wb-auto-5">
<div class="well well-sm eqht-trgt hght-inhrt">
<img src="https://via.placeholder.com/360x203/000000/FFFFFF.png" alt="">
{%- if page.language == "fr" -%}
<h3><a href="#" class="stretched-link">[Lien vers l’élément en vedette]</a></h3>
Expand Down
8 changes: 4 additions & 4 deletions _includes/components/gc-follow-us/follow.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
{%- if page.language == "fr" -%}
<h2>Suivez&nbsp;:</h2>
<ul>
<li><a href="#facebook" class="facebook wb-lbx wb-init wb-lbx-inited" id="wb-auto-4"><span class="wb-inv">Facebook</span></a></li>
<li><a href="#facebook" class="facebook wb-lbx"><span class="wb-inv">Facebook</span></a></li>
<li><a href="#" class="twitter" rel="external"><span class="wb-inv">Twitter</span></a></li>
<li><a href="#youtube" class="youtube wb-lbx wb-init wb-lbx-inited" id="wb-auto-5"><span class="wb-inv">YouTube</span></a></li>
<li><a href="#youtube" class="youtube wb-lbx"><span class="wb-inv">YouTube</span></a></li>
<li><a href="#" class="flickr" rel="external"><span class="wb-inv">Flickr</span></a></li>
<li><a href="#" class="pinterest" rel="external"><span class="wb-inv">Pinterest</span></a></li>
<li><a href="#" class="linkedin" rel="external"><span class="wb-inv">LinkedIn</span></a></li>
Expand All @@ -26,9 +26,9 @@ <h2>Suivez&nbsp;:</h2>
{%- else -%}
<h2>Follow:</h2>
<ul>
<li><a href="#facebook" class="facebook wb-lbx wb-init wb-lbx-inited" id="wb-auto-4"><span class="wb-inv">Facebook</span></a></li>
<li><a href="#facebook" class="facebook wb-lbx"><span class="wb-inv">Facebook</span></a></li>
<li><a href="#" class="twitter" rel="external"><span class="wb-inv">Twitter</span></a></li>
<li><a href="#youtube" class="youtube wb-lbx wb-init wb-lbx-inited" id="wb-auto-5"><span class="wb-inv">YouTube</span></a></li>
<li><a href="#youtube" class="youtube wb-lbx"><span class="wb-inv">YouTube</span></a></li>
<li><a href="#" class="flickr" rel="external"><span class="wb-inv">Flickr</span></a></li>
<li><a href="#" class="pinterest" rel="external"><span class="wb-inv">Pinterest</span></a></li>
<li><a href="#" class="linkedin" rel="external"><span class="wb-inv">LinkedIn</span></a></li>
Expand Down
70 changes: 70 additions & 0 deletions common/ajax-fetch/ajax-fetch-en.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
---
{
"title": "Ajax Fetch",
"language": "en",
"altLangPage": "ajax-fetch-fr.html",
"breadcrumbs": [
{ "title": "GCWeb home", "link": "https://wet-boew.github.io/GCWeb/index-en.html" }
],
"dateModified": "2023-08-25"
}
---
<div class="wb-prettify all-pre"></div>
<h2>Successful Ajax Fetch</h2>
<div data-ajax-replace="ajax/data-ajax-extra-en.html">
<section>
<h3>Text to be replaced</h3>
<p>This text will be replaced.</p>
</section>
</div>

<h2>Failed Ajax Fetch</h2>
<div data-ajax-replace="failedUrl">
<section>
<h3>Text to be replaced</h3>
<p>This text will <strong>not</strong> be replaced.</p>
</section>
</div>

<h2>Code</h2>
<div class="row">
<div class="col-md-6">
<p><a href="https://www.w3.org/TR/act-rules-aspects/#input-aspects-code">Source code</a></p>
<pre><code>&lt;h2&gt;Successful Ajax Fetch&lt;/h2&gt;
&lt;div data-ajax-replace="ajax/data-ajax-extra-en.html"&gt;
&lt;section&gt;
&lt;h3&gt;Text to be replaced&lt;/h3&gt;
&lt;p&gt;This text will be replaced.&lt;/p&gt;
&lt;/section&gt;
&lt;/div&gt;

&lt;h2&gt;Failed Ajax Fetch&lt;/h2&gt;
&lt;div data-ajax-replace="failedUrl"&gt;
&lt;section&gt;
&lt;h3&gt;Text to be replaced&lt;/h3&gt;
&lt;p&gt;This text will &lt;strong&gt;not&lt;/strong&gt; be replaced.&lt;/p&gt;
&lt;/section&gt;
&lt;/div&gt;
</code></pre>
</div>

<div class="col-md-6">
<p><a href="https://www.w3.org/TR/act-rules-aspects/#input-aspects-dom">DOM Tree</a></p>
<pre><code>&lt;h2&gt;Successful Ajax Fetch&lt;/h2&gt;
&lt;div data-ajax-replace="ajax/data-ajax-extra-en.html"&gt;
&lt;section class="ajaxed-in"&gt;
&lt;h3&gt;I was ajaxed in&lt;/h3&gt;
&lt;p&gt;I was ajaxed in. I was ajaxed in. I was ajaxed in. I was ajaxed in. I was ajaxed in. I was ajaxed in. I was ajaxed in.&lt;/p&gt;
&lt;/section&gt;
&lt;/div&gt;

&lt;h2&gt;Failed Ajax Fetch&lt;/h2&gt;
&lt;div data-ajax-replace="failedUrl"&gt;
&lt;section&gt;
&lt;h3&gt;Text to be replaced&lt;/h3&gt;
&lt;p&gt;This text will &lt;strong&gt;not&lt;/strong&gt; be replaced.&lt;/p&gt;
&lt;/section&gt;
&lt;/div&gt;
</code></pre>
</div>
</div>
70 changes: 70 additions & 0 deletions common/ajax-fetch/ajax-fetch-fr.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
---
{
"title": "Récupération de ressource via Ajax",
"language": "fr",
"altLangPage": "ajax-fetch-en.html",
"breadcrumbs": [
{ "title": "GCWeb home", "link": "https://wet-boew.github.io/GCWeb/index-fr.html" }
],
"dateModified": "2023-08-25"
}
---
<div class="wb-prettify all-pre"></div>
<h2>Succès de récupération d'une ressource ajax</h2>
<div data-ajax-replace="ajax/data-ajax-extra-fr.html">
<section>
<h3>Texte à être remplacé</h3>
<p>Ce texte sera remplacé.</p>
</section>
</div>

<h2>Échec de récupération d'une ressource ajax</h2>
<div data-ajax-replace="failedUrl">
<section>
<h3>Texte à être remplacé</h3>
<p>Ce texte ne sera <strong>pas</strong> remplacé.</p>
</section>
</div>

<h2>Code</h2>
<div class="row">
<div class="col-md-6">
<p><a href="https://www.w3.org/TR/act-rules-aspects/#input-aspects-code">Code source</a></p>
<pre><code>&lt;h2&gt;Succès de récupération d'une ressource ajax&lt;/h2&gt;
&lt;div data-ajax-replace="ajax/data-ajax-extra-fr.html"&gt;
&lt;section&gt;
&lt;h3&gt;Texte à être remplacé&lt;/h3&gt;
&lt;p&gt;Ce texte sera remplacé.&lt;/p&gt;
&lt;/section&gt;
&lt;/div&gt;

&lt;h2&gt;Failed Ajax Fetch&lt;/h2&gt;
&lt;div data-ajax-replace="urlEnEchec"&gt;
&lt;section&gt;
&lt;h3&gt;Texte à être remplacé&lt;/h3&gt;
&lt;p&gt;Ce texte ne sera &lt;strong&gt;pas&lt;/strong&gt; remplacé.&lt;/p&gt;
&lt;/section&gt;
&lt;/div&gt;
</code></pre>
</div>

<div class="col-md-6">
<p><a href="https://www.w3.org/TR/act-rules-aspects/#input-aspects-dom">Arbre de contenu</a></p>
<pre><code>&lt;h2&gt;Succès de récupération d'une ressource ajax&lt;/h2&gt;
&lt;div data-ajax-replace="ajax/data-ajax-extra-fr.html"&gt;
&lt;section class="ajaxed-in"&gt;
&lt;h3&gt;J'ai été affiché via Ajax&lt;/h3&gt;
&lt;p&gt;J'ai été affiché via Ajax. J'ai été affiché via Ajax. J'ai été affiché via Ajax. J'ai été affiché via Ajax. J'ai été affiché via Ajax.&lt;/p&gt;
&lt;/section&gt;
&lt;/div&gt;

&lt;h2&gt;Échec de récupération d'une ressource ajax&lt;/h2&gt;
&lt;div data-ajax-replace="urlEnEchec"&gt;
&lt;section&gt;
&lt;h3&gt;Texte à être remplacé&lt;/h3&gt;
&lt;p&gt;Ce texte ne sera &lt;strong&gt;pas&lt;/strong&gt; remplacé.&lt;/p&gt;
&lt;/section&gt;
&lt;/div&gt;
</code></pre>
</div>
</div>
4 changes: 4 additions & 0 deletions common/ajax-fetch/ajax/data-ajax-extra-en.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<section class="ajaxed-in">
<h3>I was ajaxed in</h3>
<p>I was ajaxed in. I was ajaxed in. I was ajaxed in. I was ajaxed in. I was ajaxed in. I was ajaxed in. I was ajaxed in.</p>
</section>
4 changes: 4 additions & 0 deletions common/ajax-fetch/ajax/data-ajax-extra-fr.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<section class="ajaxed-in">
<h3>J'ai été affiché via Ajax</h3>
<p>J'ai été affiché via Ajax. J'ai été affiché via Ajax. J'ai été affiché via Ajax. J'ai été affiché via Ajax. J'ai été affiché via Ajax.</p>
</section>
35 changes: 35 additions & 0 deletions common/ajax-fetch/index.json-ld
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"@context": {
"@version": 1.1,
"dct": "http://purl.org/dc/terms/",
"title": { "@id": "dct:title", "@container": "@language" },
"description": { "@id": "dct:description", "@container": "@language" },
"modified": "dct:modified"
},
"title": {
"en": "Ajax Fetch",
"fr": "Récupération de ressource via Ajax"
},
"description": {
"en": "Fetch data using Ajax",
"fr": "Récupération de données via Ajax"
},
"modified": "2023-08-25",
"componentName": "ajax-fetch",
"processing": "baseline",
"status": "stable",
"pages": {
"examples": [
{
"title": "Ajax Fetch",
"language": "en",
"path": "ajax-fetch-en.html"
},
{
"title": "Récupération de ressource via Ajax",
"language": "fr",
"path": "ajax-fetch-fr.html"
}
]
}
}
35 changes: 35 additions & 0 deletions common/gc_top_menu/index.json-ld
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"@context": {
"@version": 2.0,
"dct": "http://purl.org/dc/terms/",
"title": { "@id": "dct:title", "@container": "@language" },
"description": { "@id": "dct:description", "@container": "@language" },
"modified": "dct:modified"
},
"title": {
"en": "GC Top Menu",
"fr": "Menu principal du GC"
},
"description": {
"en": "The GC Top Menu is the primary navigation bar at the top of Canada.ca websites, providing quick access to essential services, information, and other government departments.",
"fr": "Le Menu principal du GC est la barre de navigation principale en haut des sites web de Canada.ca, offrant un accès rapide aux services essentiels, aux informations et aux autres départements gouvernementaux."
},
"modified": "2023-09-08",
"componentName": "GC Top Menu",
"status": "stable",
"pages": {
"docs": [],
"reports": [
{
"title": "Pre accessibility assessment #1 - GC Top Menu",
"language": "en",
"path": "reports/pre-ally-1-en.html"
},
{
"title": "Pre assessment d'accessibilité #1 - Menu principal du GC",
"language": "fr",
"path": "reports/pre-ally-1-fr.html"
}
]
}
}
14 changes: 14 additions & 0 deletions common/gc_top_menu/reports/pre-a11y-1-en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

{
"title": "Pre accessibility assessment #1 - GC Top Menu",
"language": "en",
"description": "Evaluation of how the GC Top Menu meets accessibility requirements",
"tag": "GC Top Menu",
"parentdir": "GC Top Menu",
"parentPage": "GC Top Menu",
"parentPageURL": "GC Top Menu",
"altLangPage": "pre-a11y-1-fr.html",
"dateModified": "2023-09-08",
"layout": "assessment_wrote_en-en",
"reportURL": "pre-a11y-1.json"
}
14 changes: 14 additions & 0 deletions common/gc_top_menu/reports/pre-a11y-1-fr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

{
"title": "Pré-évaluation de l'accessibilité n°1 - Menu principal du GC",
"language": "fr",
"description": "Évaluation de la manière dont le Menu principal du GC répond aux exigences en matière d'accessibilité",
"tag": "Menu principal du GC",
"parentdir": "Menu principal du GC",
"parentPage": "Menu principal du GC",
"parentPageURL": "Menu principal du GC",
"altLangPage": "pre-a11y-1-en.html",
"dateModified": "2023-09-08",
"layout": "assessment_wrote_en-fr",
"reportURL": "pre-a11y-1.json"
}
Loading

0 comments on commit 95b32e5

Please sign in to comment.