Fulfilled Changes Requested

wet-boew · Nov 20, 2024 · 720b2f3 · 720b2f3
1 parent 7d93420
commit 720b2f3
Show file tree

Hide file tree

Showing 9 changed files with 185 additions and 36 deletions.
diff --git a/sites/footers/deprecated/footers-v6-en.html b/sites/footers/deprecated/footers-v6-en.html
@@ -1,14 +1,14 @@
 ---
 {
 "layout": null,
-"title": "Content page including complete footer version 5.0",
+"title": "Content page including complete footer version 6.0",
 "language": "en",
 "breadcrumbs": [
 	{ "title": "Footer", "link": "sites/footers/footers-en.html" }
 ],
-"altLangPage": "footers-v5-fr.html",
+"altLangPage": "footers-v6-fr.html",
 "secondlevel": false,
-"dateModified": "2023-12-04",
+"dateModified": "2024-11-20",
 "share": "true"
 }
 ---
@@ -41,7 +41,7 @@
 	{% include header/header.html %}
 	<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
 		<h1 id="wb-cont" property="name">{{ page-title }}</h1>
-		<p>This is version 5.0 of the page footer.</p>
+		<p>This is version 6.0 of the page footer.</p>
 		{% include page-details/footer.html %}
 	</main>
 	<footer id="wb-info">

diff --git a/sites/footers/deprecated/footers-v6-fr.html b/sites/footers/deprecated/footers-v6-fr.html
@@ -1,14 +1,14 @@
 ---
 {
 "layout": null,
-"title": "Page de contenu incluant le pied de page complet version 5.0",
+"title": "Page de contenu incluant le pied de page complet version 6.0",
 "language": "fr",
 "breadcrumbs": [
 	{ "title": "Footer", "link": "sites/footers/footers-fr.html" }
 ],
-"altLangPage": "footers-v5-en.html",
+"altLangPage": "footers-v6-en.html",
 "secondlevel": false,
-"dateModified": "2023-12-04",
+"dateModified": "2024-11-20",
 "share": "true"
 }
 ---
@@ -41,7 +41,7 @@
 	{% include header/header.html %}
 	<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
 		<h1 id="wb-cont" property="name">{{ page-title }}</h1>
-		<p>Voici la version 5.0 du pied de page complet par défaut.</p>
+		<p>Voici la version 6.0 du pied de page complet par défaut.</p>
 		{% include page-details/footer.html %}
 	</main>
 	<footer id="wb-info">
@@ -81,7 +81,7 @@ <h4><span class="wb-inv">Thèmes et sujets</span></h4>
 						<li><a href="https://www.canada.ca/fr/services/culture.html">Culture, histoire et sport</a></li>
 						<li><a href="https://www.canada.ca/fr/services/police.html">Services de police, justice et urgences</a></li>
 						<li><a href="https://www.canada.ca/fr/services/transport.html">Transport et infrastructure</a></li>
-						<li><a href="https://www.international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde</a></li>
+						<li><a href="https://international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde</a></li>
 						<li><a href="https://www.canada.ca/fr/services/finance.html">Argent et finance</a></li>
 						<li><a href="https://www.canada.ca/fr/services/science.html">Science et innovation</a></li>
 						<li><a href="https://www.canada.ca/fr/services/autochtones.html">Autochtones</a></li>

diff --git a/sites/footers/deprecated/footers-v7-en.html b/sites/footers/deprecated/footers-v7-en.html
@@ -8,7 +8,7 @@
 ],
 "altLangPage": "footers-v7-fr.html",
 "secondlevel": false,
-"dateModified": "2024-11-12",
+"dateModified": "2024-11-20",
 "share": "true"
 }
 ---
@@ -41,7 +41,7 @@
 	{% include header/header.html %}
 	<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
 		<h1 id="wb-cont" property="name">{{ page-title }}</h1>
-		<p>This is version 5.0 of the page footer.</p>
+		<p>This is version 7.0 of the page footer.</p>
 		{% include page-details/footer.html %}
 	</main>
 	<footer id="wb-info">
@@ -82,10 +82,10 @@ <h4><span class="wb-inv">Themes and topics</span></h4>
 						<li><a href="https://www.canada.ca/en/services/culture.html">Culture, history and sport</a></li>
 						<li><a href="https://www.canada.ca/en/services/policing.html">Policing, justice and emergencies</a></li>
 						<li><a href="https://www.canada.ca/en/services/transport.html">Transport and infrastructure</a></li>
-						<li><a href="https://international.gc.ca/world-monde/index.aspx?lang=eng">Canada and the world</a></li>
+						<li><a href="https://www.international.gc.ca/world-monde/index.aspx?lang=eng">Canada and the world</a></li>
 						<li><a href="https://www.canada.ca/en/services/finance.html">Money and finances</a></li>
 						<li><a href="https://www.canada.ca/en/services/science.html">Science and innovation</a></li>
-						<li><a href="https://www.canada.ca/en/services/indigenous-peoples.html">Indigenous peoples</a></li>
+						<li><a href="https://www.canada.ca/en/services/indigenous-peoples.html">Indigenous Peoples</a></li>
 						<li><a href="https://www.canada.ca/en/services/veterans-military.html">Veterans and military</a></li>
 						<li><a href="https://www.canada.ca/en/services/youth.html">Youth</a></li>
 					</ul>

diff --git a/sites/footers/deprecated/footers-v7-fr.html b/sites/footers/deprecated/footers-v7-fr.html
@@ -8,7 +8,7 @@
 ],
 "altLangPage": "footers-v7-en.html",
 "secondlevel": false,
-"dateModified": "2024-11-12",
+"dateModified": "2024-11-20",
 "share": "true"
 }
 ---
@@ -41,7 +41,7 @@
 	{% include header/header.html %}
 	<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
 		<h1 id="wb-cont" property="name">{{ page-title }}</h1>
-		<p>Voici la version 5.0 du pied de page complet par défaut.</p>
+		<p>Voici la version 7.0 du pied de page complet par défaut.</p>
 		{% include page-details/footer.html %}
 	</main>
 	<footer id="wb-info">

diff --git a/sites/footers/footers-en.md b/sites/footers/footers-en.md
@@ -9,7 +9,7 @@ contextualFooter:
     text: Contextual link 2
   - url: http://canada.ca/en
     text: Contextual link 3
-dateModified: 2024-11-06
+dateModified: 2024-11-20
 includes:
   footer: edge
 language: en
@@ -29,11 +29,10 @@ Consult the Canada.ca Design System for guidance on which footer elements or cus
 
 ## Latest changes
 
-### Version 8.0
+### Version 7.0
 
 The following changes have been made since **version 4.0**:
-* Version 8.0 : Changed "Money and finance" to "Money and finances"
-* Version 7.0 : Added "www." to the "Canada and the world" URL.
+* Version 7.0 : Pluralized "finance" in "Money and finance", capitalized "peoples" in "Indigenous peoples", and added "www." to the "Canada and the world" URL.
 * Version 6.0 : Changed the "Veterans and military" URL.
 * Version 5.0 : Changed “All Contacts” to “All contacts”.
 

diff --git a/sites/footers/footers-fr.md b/sites/footers/footers-fr.md
@@ -9,7 +9,7 @@ contextualFooter:
     text: Lien contextuel 2
   - url: http://canada.ca/fr
     text: Lien contextuel 3
-dateModified: 2023-12-04
+dateModified: 2024-11-20
 includes:
   footer: edge
 language:	fr
@@ -29,11 +29,10 @@ Consultez le système de conception de Canada.ca pour savoir quels éléments de
 
 ## Changements récents
 
-### Version 8.0
+### Version 7.0
 
 Les modifications suivantes ont été apportées depuis la **version 4.0**&nbsp;:
-* Version 8.0: Changement de "<span lang="en">Argent et finance</span>" à "<span lang="en">Argent et finances</span>".
-* Version 7.0: Ajouté "www." à l'URL du lien "<span lang="en">Canada and the world</span>".
+* Version 7.0 : Pluriel de "finance" dans "Argent et finance", mise en majuscule de "peoples" dans "Indigenous peoples", et ajout de "www." à l'URL de "Canada et le monde".
 * Version 6.0: Changé l'URL du lien "Vétérans et militaires".
 * Version 5.0: Changement de "<span lang="en">All Contacts</span>" à "<span lang="en">All contacts</span>" dans la version anglaise.
 

diff --git a/sites/footers/includes/footer.html b/sites/footers/includes/footer.html
@@ -125,7 +125,7 @@ <h4><span class="wb-inv">{{ i18nText-themeLinks }}</span></h4>
 					<li><a href="https://www.international.gc.ca/world-monde/index.aspx?lang=eng">Canada and the world</a></li>
 					<li><a href="https://www.canada.ca/en/services/finance.html">Money and finances</a></li>
 					<li><a href="https://www.canada.ca/en/services/science.html">Science and innovation</a></li>
-					<li><a href="https://www.canada.ca/en/services/indigenous-peoples.html">Indigenous peoples</a></li>
+					<li><a href="https://www.canada.ca/en/services/indigenous-peoples.html">Indigenous Peoples</a></li>
 					<li><a href="https://www.canada.ca/en/services/veterans-military.html">Veterans and military</a></li>
 					<li><a href="https://www.canada.ca/en/services/youth.html">Youth</a></li>
 					{%- endif -%}

diff --git a/sites/footers/old-footers-en.html b/sites/footers/old-footers-en.html
@@ -1,23 +1,98 @@
 ---
 {
-"title": "Previous footer versions",
-"language": "en",
-"breadcrumbs": [
-{ "title": "Footer", "link": "sites/footers/footers-en.html" }
-],
-"altLangPage": "old-footers-fr.html",
-"secondlevel": false,
-"dateModified": "2024-11-12",
-"share": "true"
+	"title": "Previous footer versions",
+	"language": "en",
+	"breadcrumbs": [
+		{ "title": "Footer", "link": "sites/footers/footers-en.html" }
+	],
+	"altLangPage": "old-footers-fr.html",
+	"secondlevel": false,
+	"dateModified": "2024-11-20",
+	"share": "true"
 }
 ---
 <div class="wb-prettify all-pre hide"></div>
 
 <h2>Version 7.0</h2>
 <ul>
-	<li>Changed the “Veterans and military” URL.</li>
+	<li>Pluralized "finance" in "Money and finance"</li>
+	<li>Capitalized "peoples" in "Indigenous peoples"</li>
+	<li>Added "www." to the "Canada and the world" URL</li>
 </ul>
 <p>Working example: <a href="deprecated/footers-v7-en.html">Footer version 7.0</a></p>
+<details>
+	<summary>Expected output code</summary>
+	<pre><code>&lt;footer id="wb-info">
+	&lt;h2 class="wb-inv">About this site&lt;/h2>
+	&lt;div class="gc-contextual">
+		&lt;div class="container">
+			&lt;nav>
+				&lt;h3>[Contextual footer header]&lt;/h3>
+				&lt;ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
+					&lt;li>&lt;a href="http://canada.ca/en">Contextual link 1&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="http://canada.ca/en">Contextual link 2&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="http://canada.ca/en">Contextual link 3&lt;/a>&lt;/li>
+				&lt;/ul>
+			&lt;/nav>
+		&lt;/div>
+	&lt;/div>
+	&lt;div class="gc-main-footer">
+		&lt;div class="container">
+			&lt;nav>
+				&lt;h3>Government of Canada&lt;/h3>
+				&lt;ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
+					&lt;li>&lt;a href="https://www.canada.ca/en/contact.html">All contacts&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/government/dept.html">Departments and agencies&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/government/system.html">About government&lt;/a>&lt;/li>
+				&lt;/ul>
+				&lt;h4>&lt;span class="wb-inv">Themes and topics&lt;/span>&lt;/h4>
+				&lt;ul class="list-unstyled colcount-sm-2 colcount-md-3">
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/jobs.html">Jobs&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/immigration-citizenship.html">Immigration and citizenship&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://travel.gc.ca/">Travel and tourism&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/business.html">Business&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/benefits.html">Benefits&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/health.html">Health&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/taxes.html">Taxes&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/environment.html">Environment and natural resources&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/defence.html">National security and defence&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/culture.html">Culture, history and sport&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/policing.html">Policing, justice and emergencies&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/transport.html">Transport and infrastructure&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.international.gc.ca/world-monde/index.aspx?lang=eng">Canada and the world&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/finance.html">Money and finances&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/science.html">Science and innovation&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/indigenous-peoples.html">Indigenous Peoples&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/veterans-military.html">Veterans and military&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/services/youth.html">Youth&lt;/a>&lt;/li>
+				&lt;/ul>
+			&lt;/nav>
+		&lt;/div>
+	&lt;/div>
+	&lt;div class="gc-sub-footer">
+		&lt;div class="container d-flex align-items-center">
+			&lt;nav>
+				&lt;h3 class="wb-inv">Government of Canada Corporate&lt;/h3>
+				&lt;ul>
+					&lt;li>&lt;a href="https://www.canada.ca/en/social.html">Social media&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/mobile.html">Mobile applications&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/government/about.html">About Canada.ca&lt;/a>&lt;/li>&lt;li>&lt;a href="https://www.canada.ca/en/transparency/terms.html">Terms and conditions&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/en/transparency/privacy.html">Privacy&lt;/a>&lt;/li>
+				&lt;/ul>
+			&lt;/nav>
+			&lt;div class="wtrmrk align-self-end">
+				&lt;img src="/dist/GCWeb/assets/wmms-blk.svg" alt="Symbol of the Government of Canada">
+			&lt;/div>
+		&lt;/div>
+	&lt;/div>
+&lt;/footer></code></pre>
+</details>
+
+<h2>Version 6.0 (deprecated)</h2>
+<ul>
+	<li>Changed the “Veterans and military” URL.</li>
+</ul>
+<p>Working example: <a href="deprecated/footers-v6-en.html">Footer version 6.0</a></p>
 <details>
 	<summary>Expected output code</summary>
 	<pre><code>&lt;footer id="wb-info">

diff --git a/sites/footers/old-footers-fr.html b/sites/footers/old-footers-fr.html
@@ -7,15 +7,17 @@
 	],
 	"altLangPage": "old-footers-en.html",
 	"secondlevel": false,
-	"dateModified": "2024-11-12",
+	"dateModified": "2024-11-20",
 	"share": "true"
 }
 ---
 <div class="wb-prettify all-pre hide"></div>
 
 <h2>Version 7.0</h2>
 <ul>
-	<li>Changé l'URL du lien "Vétérans et militaires".</li>
+	<li>Pluriel de "finance" dans "Argent et finance"</li>
+	<li>Mise en majuscule de "peoples" dans "Indigenous peoples"</li>
+	<li>Ajout de "www." à l'URL de "Canada et le monde"</li>
 </ul>
 <p>Exemple pratique: <a href="deprecated/footers-v7-fr.html">Pied de page version 7.0</a></p>
 <details>
@@ -58,6 +60,80 @@ <h2>Version 7.0</h2>
 					&lt;li>&lt;a href="https://www.canada.ca/fr/services/police.html">Services de police, justice et urgences&lt;/a>&lt;/li>
 					&lt;li>&lt;a href="https://www.canada.ca/fr/services/transport.html">Transport et infrastructure&lt;/a>&lt;/li>
 					&lt;li>&lt;a href="https://www.international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/finance.html">Argent et finances&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/science.html">Science et innovation&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/autochtones.html">Autochtones&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/veterans-militaire.html">Vétérans et militaires&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/jeunesse.html">Jeunesse&lt;/a>&lt;/li>
+				&lt;/ul>
+			&lt;/nav>
+		&lt;/div>
+	&lt;/div>
+
+	&lt;div class="gc-sub-footer">
+		&lt;div class="container d-flex align-items-center">
+			&lt;nav>
+				&lt;h3 class="wb-inv">Organisation du gouvernement du Canada&lt;/h3>
+				&lt;ul>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/sociaux.html">Médias sociaux&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/mobile.html">Applications mobiles&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/gouvernement/a-propos.html">À propos de Canada.ca&lt;/a>&lt;/li>&lt;li>&lt;a href="https://www.canada.ca/fr/transparence/avis.html">Avis&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/transparence/confidentialite.html">Confidentialité&lt;/a>&lt;/li>
+				&lt;/ul>
+			&lt;/nav>
+			&lt;div class="wtrmrk align-self-end">
+				&lt;img src="/dist/GCWeb/assets/wmms-blk.svg" alt="Symbole du gouvernement du Canada">
+			&lt;/div>
+		&lt;/div>
+	&lt;/div>
+&lt;/footer></code></pre>
+</details>
+
+<h2>Version 6.0 (deprecated)</h2>
+<ul>
+	<li>Changé l'URL du lien "Vétérans et militaires".</li>
+</ul>
+<p>Exemple pratique: <a href="deprecated/footers-v6-fr.html">Pied de page version 6.0</a></p>
+<details>
+	<summary>Code final attendu</summary>
+	<pre><code>&lt;footer id="wb-info">
+	&lt;h2 class="wb-inv">À propos de ce site&lt;/h2>
+	&lt;div class="gc-contextual">
+		&lt;div class="container">
+			&lt;nav>
+				&lt;h3>[Bande du pied de page contextuel]&lt;/h3>
+				&lt;ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
+					&lt;li>&lt;a href="http://canada.ca/fr">Lien contextuel 1&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="http://canada.ca/fr">Lien contextuel 2&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="http://canada.ca/fr">Lien contextuel 3&lt;/a>&lt;/li>
+				&lt;/ul>
+			&lt;/nav>
+		&lt;/div>
+	&lt;/div>
+
+	&lt;div class="gc-main-footer">
+		&lt;div class="container">
+			&lt;nav>
+				&lt;h3>Gouvernement du Canada&lt;/h3>
+				&lt;ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
+					&lt;li>&lt;a href="https://www.canada.ca/fr/contact.html">Toutes les coordonnées&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/gouvernement/min.html">Ministères et organismes&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/gouvernement/systeme.html">À propos du gouvernement&lt;/a>&lt;/li>
+				&lt;/ul>
+				&lt;h4>&lt;span class="wb-inv">Thèmes et sujets&lt;/span>&lt;/h4>
+				&lt;ul class="list-unstyled colcount-sm-2 colcount-md-3">&lt;li>&lt;a href="https://www.canada.ca/fr/services/emplois.html">Emplois&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/immigration-citoyennete.html">Immigration et citoyenneté&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://voyage.gc.ca/">Voyage et tourisme&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/entreprises.html">Entreprises&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/prestations.html">Prestations&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/sante.html">Santé&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/impots.html">Impôts&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/environnement.html">Environnement et ressources naturelles&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/defense.html">Sécurité nationale et défense&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/culture.html">Culture, histoire et sport&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/police.html">Services de police, justice et urgences&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://www.canada.ca/fr/services/transport.html">Transport et infrastructure&lt;/a>&lt;/li>
+					&lt;li>&lt;a href="https://international.gc.ca/world-monde/index.aspx?lang=fra">Le Canada et le monde&lt;/a>&lt;/li>
 					&lt;li>&lt;a href="https://www.canada.ca/fr/services/finance.html">Argent et finance&lt;/a>&lt;/li>
 					&lt;li>&lt;a href="https://www.canada.ca/fr/services/science.html">Science et innovation&lt;/a>&lt;/li>
 					&lt;li>&lt;a href="https://www.canada.ca/fr/services/autochtones.html">Autochtones&lt;/a>&lt;/li>