From d453c5116567d5da45008078e592090619fbba85 Mon Sep 17 00:00:00 2001 From: SBsudo Date: Wed, 27 Nov 2024 12:02:12 -0500 Subject: [PATCH] Requested changes complete --- sites/footers/deprecated/footers-v7-en.html | 6 +- sites/footers/deprecated/footers-v7-fr.html | 4 +- sites/footers/deprecated/footers-v8-en.html | 115 ++++++++++++++++++++ sites/footers/deprecated/footers-v8-fr.html | 114 +++++++++++++++++++ sites/footers/footers-en.md | 5 +- sites/footers/footers-fr.md | 9 +- sites/footers/old-footers-en.html | 81 +++++++++++++- sites/footers/old-footers-fr.html | 77 ++++++++++++- 8 files changed, 394 insertions(+), 17 deletions(-) create mode 100644 sites/footers/deprecated/footers-v8-en.html create mode 100644 sites/footers/deprecated/footers-v8-fr.html diff --git a/sites/footers/deprecated/footers-v7-en.html b/sites/footers/deprecated/footers-v7-en.html index 7b41e3fc6..874b29d0c 100644 --- 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-20", +"dateModified": "2024-11-27", "share": "true" } --- @@ -83,9 +83,9 @@

Themes and topics

  • Policing, justice and emergencies
  • Transport and infrastructure
  • Canada and the world
    • -
  • Money and finances
    • +
  • Money and finance
  • Science and innovation
    • -
  • Indigenous Peoples
    • +
  • Indigenous peoples
  • Veterans and military
  • Youth
    • diff --git a/sites/footers/deprecated/footers-v7-fr.html b/sites/footers/deprecated/footers-v7-fr.html index fb36b1608..e4ce31060 100644 --- 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-20", +"dateModified": "2024-11-27", "share": "true" } --- @@ -82,7 +82,7 @@

    Thèmes et sujets

  • Services de police, justice et urgences
  • Transport et infrastructure
  • Le Canada et le monde
    • -
  • Argent et finances
    • +
  • Argent et finance
  • Science et innovation
  • Autochtones
  • Vétérans et militaires
    • diff --git a/sites/footers/deprecated/footers-v8-en.html b/sites/footers/deprecated/footers-v8-en.html new file mode 100644 index 000000000..d64af20b9 --- /dev/null +++ b/sites/footers/deprecated/footers-v8-en.html @@ -0,0 +1,115 @@ +--- +{ +"layout": null, +"title": "Content page including complete footer version 7.0", +"language": "en", +"breadcrumbs": [ + { "title": "Footer", "link": "sites/footers/footers-en.html" } +], +"altLangPage": "footers-v8-fr.html", +"secondlevel": false, +"dateModified": "2024-11-27", +"share": "true" +} +--- + +{%- include variable-core.liquid -%} +{%- capture page-title -%} +{%- if page.title -%} +{{ page.title }} +{%- else -%} +Page untitled +{%- endif -%} +{%- endcapture -%} + + + + + + {% include license.html %} + {{ page-title }} - {{ i18nText-siteTitle }} + + {% include metadata.html %} + {% include resources-inc/head.html %} + + + + {%- if page.archived -%} + {% include headers-includes/archive.html %} + {%- endif -%} + {% include skiplinks/skiplinks.html %} + {% include header/header.html %} +
    +

    {{ page-title }}

    +

    This is version 7.0 of the page footer.

    + {% include page-details/footer.html %} +
    + + {% include resources-inc/footer.html %} + + diff --git a/sites/footers/deprecated/footers-v8-fr.html b/sites/footers/deprecated/footers-v8-fr.html new file mode 100644 index 000000000..e2fc980bc --- /dev/null +++ b/sites/footers/deprecated/footers-v8-fr.html @@ -0,0 +1,114 @@ +--- +{ +"layout": null, +"title": "Page de contenu incluant le pied de page complet version 7.0", +"language": "fr", +"breadcrumbs": [ + { "title": "Footer", "link": "sites/footers/footers-fr.html" } +], +"altLangPage": "footers-v8-en.html", +"secondlevel": false, +"dateModified": "2024-11-27", +"share": "true" +} +--- + +{%- include variable-core.liquid -%} +{%- capture page-title -%} +{%- if page.title -%} +{{ page.title }} +{%- else -%} +Page untitled +{%- endif -%} +{%- endcapture -%} + + + + + + {% include license.html %} + {{ page-title }} - {{ i18nText-siteTitle }} + + {% include metadata.html %} + {% include resources-inc/head.html %} + + + + {%- if page.archived -%} + {% include headers-includes/archive.html %} + {%- endif -%} + {% include skiplinks/skiplinks.html %} + {% include header/header.html %} +
    +

    {{ page-title }}

    +

    Voici la version 7.0 du pied de page complet par défaut.

    + {% include page-details/footer.html %} +
    + + {% include resources-inc/footer.html %} + + diff --git a/sites/footers/footers-en.md b/sites/footers/footers-en.md index bbd93bfa5..dc87091d8 100644 --- a/sites/footers/footers-en.md +++ b/sites/footers/footers-en.md @@ -29,10 +29,11 @@ Consult the Canada.ca Design System for guidance on which footer elements or cus ## Latest changes -### Version 7.0 +### Version 8.0 The following changes have been made since **version 4.0**: -* 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 8.0 : Pluralized "finance" in "Money and finance", capitalized "peoples" in "Indigenous peoples". +* Version 7.0 : 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 index b3baa2adc..d26b62c03 100644 --- a/sites/footers/footers-fr.md +++ b/sites/footers/footers-fr.md @@ -29,12 +29,13 @@ Consultez le système de conception de Canada.ca pour savoir quels éléments de ## Changements récents -### Version 7.0 +### Version 8.0 Les modifications suivantes ont été apportées depuis la **version 4.0** : -* 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 "All Contacts" à "All contacts" dans la version anglaise. +* Version 8.0 : Pluriel de "finance" dans "Argent et finance", mise en majuscule de "peoples" dans "Indigenous peoples". +* Version 7.0 : 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 "All Contacts" à "All contacts" dans la version anglaise. Les modifications suivantes ont été apportées depuis la **version 2.0** : * Ajout d'une bande contextuelle au-dessus de la bande principale. diff --git a/sites/footers/old-footers-en.html b/sites/footers/old-footers-en.html index fea9b1dfb..f04103a0c 100644 --- a/sites/footers/old-footers-en.html +++ b/sites/footers/old-footers-en.html @@ -7,19 +7,17 @@ ], "altLangPage": "old-footers-fr.html", "secondlevel": false, - "dateModified": "2024-11-20", + "dateModified": "2024-11-27", "share": "true" } ---
    - -

    Version 7.0

    +

    Version 8.0

    -

    Working example: Footer version 7.0

    +

    Working example: Footer version 8.0

    Expected output code 
    <footer id="wb-info">
@@ -88,6 +86,79 @@ 
    Version 7.0
    
 </footer>
    +

    Version 7.0 (deprecated)

    + +

    Working example: Footer version 7.0

    +
    + Expected output code + 
    <footer id="wb-info">
+	<h2 class="wb-inv">About this site</h2>
+	<div class="gc-contextual">
+		<div class="container">
+			<nav>
+				<h3>[Contextual footer header]</h3>
+				<ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
+					<li><a href="http://canada.ca/en">Contextual link 1</a></li>
+					<li><a href="http://canada.ca/en">Contextual link 2</a></li>
+					<li><a href="http://canada.ca/en">Contextual link 3</a></li>
+				</ul>
+			</nav>
+		</div>
+	</div>
+	<div class="gc-main-footer">
+		<div class="container">
+			<nav>
+				<h3>Government of Canada</h3>
+				<ul class="list-col-xs-1 list-col-sm-2 list-col-md-3">
+					<li><a href="https://www.canada.ca/en/contact.html">All contacts</a></li>
+					<li><a href="https://www.canada.ca/en/government/dept.html">Departments and agencies</a></li>
+					<li><a href="https://www.canada.ca/en/government/system.html">About government</a></li>
+				</ul>
+				<h4><span class="wb-inv">Themes and topics</span></h4>
+				<ul class="list-unstyled colcount-sm-2 colcount-md-3">
+					<li><a href="https://www.canada.ca/en/services/jobs.html">Jobs</a></li>
+					<li><a href="https://www.canada.ca/en/services/immigration-citizenship.html">Immigration and citizenship</a></li>
+					<li><a href="https://travel.gc.ca/">Travel and tourism</a></li>
+					<li><a href="https://www.canada.ca/en/services/business.html">Business</a></li>
+					<li><a href="https://www.canada.ca/en/services/benefits.html">Benefits</a></li>
+					<li><a href="https://www.canada.ca/en/services/health.html">Health</a></li>
+					<li><a href="https://www.canada.ca/en/services/taxes.html">Taxes</a></li>
+					<li><a href="https://www.canada.ca/en/services/environment.html">Environment and natural resources</a></li>
+					<li><a href="https://www.canada.ca/en/services/defence.html">National security and defence</a></li>
+					<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://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 finance</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/veterans-military.html">Veterans and military</a></li>
+					<li><a href="https://www.canada.ca/en/services/youth.html">Youth</a></li>
+				</ul>
+			</nav>
+		</div>
+	</div>
+	<div class="gc-sub-footer">
+		<div class="container d-flex align-items-center">
+			<nav>
+				<h3 class="wb-inv">Government of Canada Corporate</h3>
+				<ul>
+					<li><a href="https://www.canada.ca/en/social.html">Social media</a></li>
+					<li><a href="https://www.canada.ca/en/mobile.html">Mobile applications</a></li>
+					<li><a href="https://www.canada.ca/en/government/about.html">About Canada.ca</a></li><li><a href="https://www.canada.ca/en/transparency/terms.html">Terms and conditions</a></li>
+					<li><a href="https://www.canada.ca/en/transparency/privacy.html">Privacy</a></li>
+				</ul>
+			</nav>
+			<div class="wtrmrk align-self-end">
+				<img src="/dist/GCWeb/assets/wmms-blk.svg" alt="Symbol of the Government of Canada">
+			</div>
+		</div>
+	</div>
+</footer>
    +
    +

    Version 6.0 (deprecated)