From b0fdd7830cbd6c91664a2c5651842e726c4089c4 Mon Sep 17 00:00:00 2001 From: Eric Dunsworth <1907279+EricDunsworth@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:05:01 -0400 Subject: [PATCH 1/2] Theme: Fix broken links WIP --- _data/components.json | 2 +- .../gc-featured-link/gc-featured-link-en.html | 2 +- .../gc-featured-link/gc-featured-link-fr.html | 2 +- components/gc-most-requested/index.json-ld | 2 +- .../gc-subway/aem-bad-implementation-en.html | 2 +- .../gc-subway/aem-bad-implementation-fr.html | 2 +- components/provisional-en.html | 8 +- components/provisional-fr.html | 19 +- components/tbl-floatcolumn-en.html | 6 +- components/tbl-floatcolumn-fr.html | 6 +- components/wb-doaction/doaction-doc-en.html | 24 +- components/wb-doaction/doaction-doc-fr.html | 24 +- components/wb-fieldflow/advanced-en.html | 36 +-- components/wb-fieldflow/advanced-fr.html | 36 +-- components/wb-fieldflow/fieldflow-doc-en.html | 2 +- components/wb-fieldflow/fieldflow-doc-fr.html | 2 +- components/wb-urlmapping/geomap-en.html | 20 +- components/wb-urlmapping/geomap-fr.html | 20 +- .../wb-urlmapping/urlmapping-doc-en.html | 10 +- .../wb-urlmapping/urlmapping-doc-fr.html | 10 +- docs/GCWeb-en.html | 7 +- docs/GCWeb-fr.html | 7 +- docs/evaluation-report/1-accessibility.html | 2 +- .../evaluation-report/2-wetplugin-gcweb2.html | 2 +- docs/index.html | 10 +- .../th-zev-en.html" | 11 + .../th-zev-fr.html" | 11 + docs/release/dev-build.html | 2 +- docs/release/v5.0-en.html | 242 +++++++++--------- docs/release/v5.0-fr.html | 242 +++++++++--------- docs/release/v5.1-en.html | 4 +- docs/release/v5.1-fr.html | 4 +- docs/release/v6.0-en.html | 4 +- docs/release/v6.0-fr.html | 4 +- docs/static-header-footer/bootstrap-3.html | 4 +- docs/static-header-footer/bootstrap-4.html | 2 +- docs/temp-v5issue.html | 10 +- docs/v5-migration.html | 6 +- index-en.md | 66 +++-- index-fr.md | 72 ++++-- .../m\303\251li-m\303\251lo-en.html" | 2 +- .../m\303\251li-m\303\251lo-fr.html" | 2 +- "m\303\251li-m\303\251lo/th-zev/zev.html" | 2 +- sites/feedback/feedback-docs-en.html | 2 +- sites/feedback/feedback-docs-fr.html | 2 +- sites/footers/deprecated/footers-v3-en.html | 2 +- sites/footers/deprecated/footers-v3-fr.html | 2 +- sites/footers/deprecated/footers-v4-en.html | 2 +- sites/footers/deprecated/footers-v4-fr.html | 2 +- sites/footers/deprecated/footers-v5-en.html | 2 +- sites/footers/deprecated/footers-v5-fr.html | 2 +- sites/footers/old-footers-en.html | 10 +- sites/footers/old-footers-fr.html | 10 +- sites/gcweb-menu/gcweb-menu-docs-en.html | 4 +- sites/gcweb-menu/gcweb-menu-docs-fr.html | 4 +- sites/header/header-docs-en.html | 4 +- sites/header/header-docs-fr.html | 2 +- sites/page-details/page-details-docs-en.html | 10 +- templates/campaign/campaign-en.html | 28 +- templates/campaign/campaign-fr.html | 28 +- templates/event-en.html | 28 +- templates/event-fr.html | 28 +- templates/home/api-en.html | 2 +- templates/home/api-fr.html | 2 +- .../institutional/institution-arms-en.html | 2 +- .../institutional/institution-arms-fr.html | 2 +- templates/institutional/institution-en.html | 2 +- templates/institutional/institution-fr.html | 2 +- templates/ministerial/ministerial-doc-en.html | 8 +- templates/ministerial/ministerial-doc-fr.html | 2 +- .../organizational-arms-en.html | 2 +- .../organizational-arms-fr.html | 2 +- .../organizational/organizational-en.html | 2 +- .../organizational/organizational-fr.html | 2 +- templates/search/api-en.html | 8 +- templates/search/api-fr.html | 8 +- templates/search/results-advanced-en.html | 4 +- templates/search/results-advanced-fr.html | 4 +- templates/servermessage/404-en-fr.md | 4 +- templates/servermessage/404-en.md | 2 +- templates/servermessage/404-fr-en.md | 4 +- templates/servermessage/404-fr.md | 2 +- templates/splash/api-fr.html | 2 +- templates/widgets-en.html | 55 ++-- templates/widgets-fr.html | 54 ++-- .../gc-th\303\251matique-en.html" | 2 +- .../gc-th\303\251matique-fr.html" | 2 +- 87 files changed, 663 insertions(+), 643 deletions(-) create mode 100644 "docs/m\303\251ta-d\303\251tails/th-zev-en.html" create mode 100644 "docs/m\303\251ta-d\303\251tails/th-zev-fr.html" diff --git a/_data/components.json b/_data/components.json index 5757ba592..1f9897e23 100644 --- a/_data/components.json +++ b/_data/components.json @@ -199,7 +199,7 @@ { "title": "En demande", "language": "fr", - "path": "gc-most-requested-fr.html - Documentation et example pratique" + "path": "gc-most-requested-fr.html" } ] } diff --git a/components/gc-featured-link/gc-featured-link-en.html b/components/gc-featured-link/gc-featured-link-en.html index b21067eac..99980b8e9 100644 --- a/components/gc-featured-link/gc-featured-link-en.html +++ b/components/gc-featured-link/gc-featured-link-en.html @@ -7,7 +7,7 @@ layout: no-container ---
-

{{ page.title }}

+

{{ page.title }}

{% include alert-provisional.html siteroot="../../" %} diff --git a/components/gc-featured-link/gc-featured-link-fr.html b/components/gc-featured-link/gc-featured-link-fr.html index fb6cc73d2..17be25d86 100644 --- a/components/gc-featured-link/gc-featured-link-fr.html +++ b/components/gc-featured-link/gc-featured-link-fr.html @@ -7,7 +7,7 @@ layout: no-container ---
-

{{ page.title }}

+

{{ page.title }}

{% include alert-provisional.html siteroot="../../" %} diff --git a/components/gc-most-requested/index.json-ld b/components/gc-most-requested/index.json-ld index ca79a4004..c3d1de484 100644 --- a/components/gc-most-requested/index.json-ld +++ b/components/gc-most-requested/index.json-ld @@ -27,7 +27,7 @@ { "title": "En demande", "language": "fr", - "path": "gc-most-requested-fr.html - Documentation et example pratique" + "path": "gc-most-requested-fr.html" } ] } diff --git a/components/gc-subway/aem-bad-implementation-en.html b/components/gc-subway/aem-bad-implementation-en.html index cb8d490f5..6d561da3a 100644 --- a/components/gc-subway/aem-bad-implementation-en.html +++ b/components/gc-subway/aem-bad-implementation-en.html @@ -80,7 +80,7 @@

Page 3

diff --git a/components/gc-subway/aem-bad-implementation-fr.html b/components/gc-subway/aem-bad-implementation-fr.html index 2f07bd8cc..7e2f6e32d 100644 --- a/components/gc-subway/aem-bad-implementation-fr.html +++ b/components/gc-subway/aem-bad-implementation-fr.html @@ -80,7 +80,7 @@

Page 3

diff --git a/components/provisional-en.html b/components/provisional-en.html index 60511cbec..6bca323c0 100644 --- a/components/provisional-en.html +++ b/components/provisional-en.html @@ -116,9 +116,9 @@

Provisional feature removal first notice

GC subway map navigation for Service initiation template.

@@ -289,8 +289,6 @@

In this section

  • Features section with stretched links
  • Icon warning color
  • Page success widget
  • -
  • GC Subway map navigation
  • -
  • Checkboxes and radio-buttons
  • Responsive well header with a background image

    diff --git a/components/provisional-fr.html b/components/provisional-fr.html index 253deb5b9..c86ffdd44 100644 --- a/components/provisional-fr.html +++ b/components/provisional-fr.html @@ -107,7 +107,7 @@

    Provisional feature removal first notice

  • Chat wizard - How to implement
  • Working example - Chat wizard
  • Working example - Chat wizard with JSON settings
  • -
  • 2019-15 Research documentation
  • +
  • 2019-15 Research documentation (en anglais seulement)
  • v7.0 @@ -118,10 +118,10 @@

    Provisional feature removal first notice

    Navigation par carte de métro pour le gabarit d'initiatin de service.

    v8.0.1 @@ -289,11 +289,8 @@

    Dans cette section

  • Couleurs du gabarit de thème
  • Image de fond sur l'en-tête
  • Section Features avec des liens élargis
  • -
  • Icon warning color
  • +
  • Icon warning color
  • Widget succès de page
  • -
  • Chat wizard
  • -
  • GC Service initiation template
  • -
  • Cases à cocher et boutons radio
  • En-tête adaptable de la boîte grise avec une image de fond

    @@ -335,7 +332,7 @@

    En-tête

    Boîte grise secondaire

    -

    Couleurs du gabarit de thème

    +

    Couleurs du gabarit de thème

    -
  • provisional +
  • provisional
    • ...
    diff --git a/docs/release/v5.0-en.html b/docs/release/v5.0-en.html index d7b0647f2..9a788c75e 100644 --- a/docs/release/v5.0-en.html +++ b/docs/release/v5.0-en.html @@ -158,361 +158,361 @@

    Details

    List of commits

    @@ -524,8 +524,8 @@

    Details - v5.0.1

    List of commits

    diff --git a/docs/release/v5.0-fr.html b/docs/release/v5.0-fr.html index 122091989..bd29a94a8 100644 --- a/docs/release/v5.0-fr.html +++ b/docs/release/v5.0-fr.html @@ -162,125 +162,125 @@

    Détails

    Liste des contributions

    @@ -291,8 +291,8 @@

    Détails - v5.0.1

    Liste des contributions

    diff --git a/docs/release/v5.1-en.html b/docs/release/v5.1-en.html index 501c11c28..4642fc844 100644 --- a/docs/release/v5.1-en.html +++ b/docs/release/v5.1-en.html @@ -35,7 +35,7 @@

    What's new?

    • Template
        -
      • Minor - Search template - New template for pages with search results.
      • +
      • Minor - Search template - New template for pages with search results.
      • Minor - Navigation element - A <nav> element was added for the skip nav link, as shown here.
      • Minor - Font Awesome - A reference to font-awesome 5.8.1 was added inside the <head> tag (see snippet).
      • Minor - RDFa + schema.org improvement to Canada wordmark - The RDFa markup has been modified, new property added, to improve SEO and how search engine interprete some information included in our template (more details).
      • @@ -56,7 +56,7 @@

        What's new?

      • Patch - Menu - Fix menu navigation on different browsers when using a screen reader by running rigorous operability tests with JAWS and NVDA.
    • -
    • Experimental (NEW) +
    • Experimental (NEW)
      • Bootstrap 4 spacers - CSS classes added for padding and margin spacing, e.g. .p-0 for no padding and .mb-sm-5 for extra-large bottom margin for small devices and up.
      • Background image size - CSS class added for a background image to cover the boxes size with .bg-cover.
      • diff --git a/docs/release/v5.1-fr.html b/docs/release/v5.1-fr.html index 26e49537a..e32aa4b7c 100644 --- a/docs/release/v5.1-fr.html +++ b/docs/release/v5.1-fr.html @@ -33,7 +33,7 @@

        Quoi de neuf?

        • Gabarit
            -
          • Mineur - Gabarit de recherche - Nouveau gabarit pour les pages ayant des résultats de recherche.
          • +
          • Mineur - Gabarit de recherche - Nouveau gabarit pour les pages ayant des résultats de recherche.
          • Mineur - Élément de navigation - Un élément <nav> a été ajouté au lien « sauter la navigation », tel que montré ici.
          • Mineur - Font Awesome - Une référence à la police Awesome 5.8.1 a été ajoutée dans la balise <head> (voir le code).
          • Mineur - Amélioration en matière de RDFa + schema.org au mot-symbole Canada - Le balisage RDFa a été modifié (ajout d’une nouvelle propriété) pour améliorer l’optimisation pour les moteurs de recherche et la façon dont les moteurs de recherche interprètent certaines informations comprises dans notre gabarit (plus de renseignements).
          • @@ -54,7 +54,7 @@

            Quoi de neuf?

          • Correctif - Menu - Correction du menu de navigation sur de différents navigateurs lorsqu’on utilise le lecteur d’écran en réalisant des essais d’opérabilité rigoureux avec JAWS et NVDA.
        • -
        • Expérimental (NOUVEAU) +
        • Expérimental (NOUVEAU)
          • Espaceurs Bootstrap 4 - Ajout des classes CSS pour le remplissage et l’espacement des marges, p. ex. .p-0 pour aucun remplissage et .mb-sm-5 pour la marge inférieure très large pour les petits appareils et plus.
          • Taille de l’image de fond - Ajout de la classe CSS pour une image de fond afin de couvrir la taille des cases avec .bg-cover.
          • diff --git a/docs/release/v6.0-en.html b/docs/release/v6.0-en.html index 231195abc..154c82d95 100644 --- a/docs/release/v6.0-en.html +++ b/docs/release/v6.0-en.html @@ -53,7 +53,7 @@

            What's new?

          • Minor - Do action & JSON manager - Added feature to load JSON file on demand and apply pre-processed patches on user input.
        • -
        • Experimental (NEW) +
        • Experimental (NEW)
          • Bootstrap 4 - CSS helpers classes were moved to the WET-BOEW core, including .stretched-link.
          @@ -139,7 +139,7 @@

          Details

        • Kivi Shapiro (@jkshapiro): 2 commits
        • Stephane Ducharme (@StdGit): 2 commits
        • Paul Imeson (@Paul-Doug): 1 commit
        • -
        • Kody (@thekodester): 1 commit
        • +
        • Kody (@thekodester): 1 commit
        • Noah Gresser (@NoahGresser): 1 commit
        • Ilya Pak (@ipaksc): 1 commit
        • dependabot: 1 commit
        • diff --git a/docs/release/v6.0-fr.html b/docs/release/v6.0-fr.html index ea03e84b9..34ea16adb 100644 --- a/docs/release/v6.0-fr.html +++ b/docs/release/v6.0-fr.html @@ -50,7 +50,7 @@

          Quoi de neuf?

        • Minor - Do action & JSON manager - Added feature to load JSON file on demand and apply pre-processed patches on user input.
        -
      • Expérimental (NOUVEAU) +
      • Expérimental (NOUVEAU)
        • Bootstrap 4 - CSS helpers classes were moved to the WET-BOEW core, including .stretched-link.
        @@ -134,7 +134,7 @@

        Détails

      • Kivi Shapiro (@jkshapiro): 2 contributions
      • Stephane Ducharme (@StdGit): 2 contributions
      • Paul Imeson (@Paul-Doug): 1 contribution
      • -
      • Kody (@thekodester): 1 contribution
      • +
      • Kody (@thekodester): 1 contribution
      • Noah Gresser (@NoahGresser): 1 contribution
      • Ilya Pak (@ipaksc): 1 contribution
      • dependabot: 1 contribution
      • diff --git a/docs/static-header-footer/bootstrap-3.html b/docs/static-header-footer/bootstrap-3.html index e46538e8e..169b53f25 100644 --- a/docs/static-header-footer/bootstrap-3.html +++ b/docs/static-header-footer/bootstrap-3.html @@ -22,7 +22,7 @@

        Language selection

        • - + fr @@ -106,7 +106,7 @@

          You are here:

          -

          Static header and footer - Bootstrap 3 - Update to header to come...

          +

          Static header and footer - Bootstrap 3 - Update to header to come...

          Static header and footer on Bootstrap 3 with the mega menu. Web Experience Toolkit (WET) includes reusable components for building and maintaining innovative Web sites that are accessible, usable, and interoperable.

          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ut tortor ligula. Proin in maximus arcu. Nam sit amet dolor ac magna aliquam lacinia non in ante. Nam eu aliquet est, et consectetur est. Sed rhoncus orci sit amet felis imperdiet, at finibus tortor ultrices. Etiam porttitor elementum diam vel auctor. Suspendisse sagittis, urna et blandit placerat, quam neque dignissim ligula, id malesuada sapien enim id erat. Sed sapien turpis, iaculis vitae risus vel, luctus placerat lorem. Nunc egestas nibh a pretium luctus. Pellentesque vitae pretium ante. Nam elementum orci quis quam aliquet, at consequat turpis ullamcorper. Fusce libero risus, dapibus sed lacinia non, porta congue nulla. Sed ac tortor ut erat volutpat sollicitudin. Phasellus condimentum neque a quam posuere condimentum.

          Nulla tempus odio fringilla dui egestas, sed hendrerit nunc tempor. Donec ultricies nulla leo, eget fringilla libero lobortis tristique. Curabitur pellentesque luctus odio, vitae semper ex. Integer posuere sem est, in hendrerit sem cursus ut. Aliquam felis felis, sollicitudin eu tincidunt non, egestas et orci.

          diff --git a/docs/static-header-footer/bootstrap-4.html b/docs/static-header-footer/bootstrap-4.html index 6064be218..71b156d87 100644 --- a/docs/static-header-footer/bootstrap-4.html +++ b/docs/static-header-footer/bootstrap-4.html @@ -38,7 +38,7 @@

          Language selection

          Government of Canada - +
  • Search

    diff --git a/docs/temp-v5issue.html b/docs/temp-v5issue.html index 10e05a4b7..b1e964d89 100644 --- a/docs/temp-v5issue.html +++ b/docs/temp-v5issue.html @@ -108,7 +108,7 @@

    Fixed or commented issues

  • Item 78. Fixed December 17 - Published an excerpt of the answer.
  • -
  • Item 77. Fixed December 14 - Symbole of GoC SVG image, based on the ones provided, was submited to TBS for their review and approval. gc-proto#1
  • +
  • Item 77. Fixed December 14 - Symbole of GoC SVG image, based on the ones provided, was submited to TBS for their review and approval. gc-proto#1
  • Item 69. Fixed December 4 - Moved down the Glyphicon of one additional pixel to perceive it aligned with accompagning text.
  • Item 11. Comments November 11 - That item it is just a comments/opinion, TBS testing didn't reported that as an error so we can assume that was the intend.
  • Item 68. Fixed November 30 - Blockquote font size was set to 1em.
  • @@ -501,7 +501,7 @@

    Reported issue list

  • Fixed Item 77 SVG image - Optimize the new svg image submited by PR#1460
  • Fixed Item 78 Published TBS answer about the use of Google API for the new font.
  • -
  • Fixed Item 79 Fix link (in French) in the top menu. See sitemenu.hbs
  • +
  • Fixed Item 79 Fix link (in French) in the top menu. See sitemenu.hbs
  • Fixed Item 80 Add new style for the home page promo. The promo banner would have an opactity set to 90%.
    • Sky (blue) @@ -592,11 +592,11 @@

      Reported issue list

    • Item 86 On iPhone device - Carousel display issue. The navigation bar (arrows) goes over the slide title
    • Item 87 On iPhone device - Top search bar overflow to the right and the search button are render bellow it.
    • Fixed Item 88 Multimedia player - Small device and desktop - Review how overlay (with the pause button) are still rendered in the middle and centered.
    • -
    • Fixed Item 89 Form validation - Error label that are appearing when validating checkboxes overlay the legend text. Form validation. How to reproduce: 1. Go in the form validation example page. 2. Click on submit to trigger the form validation plugin. 3. See the error label are over the legend text. - There probably a fix for it in the PR #8397
    • +
    • Fixed Item 89 Form validation - Error label that are appearing when validating checkboxes overlay the legend text. Form validation. How to reproduce: 1. Go in the form validation example page. 2. Click on submit to trigger the form validation plugin. 3. See the error label are over the legend text. - There probably a fix for it in the PR #8397
    • Fixed Item 90 The new font-size conflict for the in-page navigation. Suggest to use a font-size of 17px instead of 20px. ul.toc { font-size:17px }
    • Item 91 Document the API for the "Multi-page" navigation (Step-by-step) and remove the used CSS class "gc-stp-stp" because implementer has used a combination of CSS like "mrgn-tp-md mrgn-bttm-lg brdr-bttm" instead.
    • -
    • Fixed Item 92 From a comparaison between the gc-proto and gc-web example, the following ajustment was suggested for the home page: Reduce the spacing (top and bottom) for the home page banner, reduce the spacing (top and bottom) for the promos text and reduce the spacing (top and bottom) for the most requested section
    • -
    • Fixed Item 93 From a comparaison between the gc-proto and gc-web example, the following ajustment was suggested for the Services and information component: reducing the spacing for doormats titles.
    • +
    • Fixed Item 92 From a comparaison between the gc-proto and gc-web example, the following ajustment was suggested for the home page: Reduce the spacing (top and bottom) for the home page banner, reduce the spacing (top and bottom) for the promos text and reduce the spacing (top and bottom) for the most requested section
    • +
    • Fixed Item 93 From a comparaison between the gc-proto and gc-web example, the following ajustment was suggested for the Services and information component: reducing the spacing for doormats titles.
    • Item 94 Heading size in for alert component. The undesirable effect is on the form validation, the h2 inside the alert-error are big. It was at a similar size before. TBS suggeste to have it the same style as an h3 or h5 by default. The scope would need to be clarified to know if that overwrite is applied to all heading size and to all type of alert.
    • Item 95 Apply content limited widht by default to all pages. Then overwride the following default spacing because they were removed as per github issue #1486:

      diff --git a/docs/v5-migration.html b/docs/v5-migration.html index f9209b500..63fe1b552 100644 --- a/docs/v5-migration.html +++ b/docs/v5-migration.html @@ -221,7 +221,7 @@

      Updated markup

      -

      Menu

      +

      Menu

      How to update

      @@ -229,11 +235,17 @@ css: - Link to the documentations if any --> {% if list-pages.docs %} - - {% assign docs = list-pages.docs | where: "language", page.language %} - {% for doc in docs %} -
    • Documentation
    • - {% endfor %} + + {% assign docs = list-pages.docs | where: "language", page.language %} + {% for doc in docs %} +
    • Documentation
    • + {% endfor %} {% endif %}
    {% if list-pages.docs %} - - {% assign docs = list-pages.docs | where: "language", page.language %} - {% for doc in docs %} -
  • Documentation
  • - {% endfor %} + + {% assign docs = list-pages.docs | where: "language", page.language %} + {% for doc in docs %} +
  • Documentation
  • + {% endfor %} {% endif %} {% if list-pages.docs %} - - {% assign docs = list-pages.docs | where: "language", page.language %} - {% for doc in docs %} -
  • Documentation
  • - {% endfor %} + + {% assign docs = list-pages.docs | where: "language", page.language %} + {% for doc in docs %} +
  • Documentation
  • + {% endfor %} {% endif %} {% if list-pages.docs %} - - {% assign docs = list-pages.docs | where: "language", page.language %} - {% for doc in docs %} -
  • Documentation
  • - {% endfor %} + + {% assign docs = list-pages.docs | where: "language", page.language %} + {% for doc in docs %} +
  • Documentation
  • + {% endfor %} {% endif %}
  • Code source
  • @@ -229,11 +235,17 @@ css: - Link to the documentations if any --> {% if list-pages.docs %} - - {% assign docs = list-pages.docs | where: "language", page.language %} - {% for doc in docs %} -
  • Documentation
  • - {% endfor %} + + {% assign docs = list-pages.docs | where: "language", page.language %} + {% for doc in docs %} +
  • Documentation
  • + {% endfor %} {% endif %} {% if list-pages.docs %} - - {% assign docs = list-pages.docs | where: "language", page.language %} - {% for doc in docs %} -
  • Documentation
  • - {% endfor %} + + {% assign docs = list-pages.docs | where: "language", page.language %} + {% for doc in docs %} +
  • Documentation
  • + {% endfor %} {% endif %} {% if list-pages.docs %} - - {% assign docs = list-pages.docs | where: "language", page.language %} - {% for doc in docs %} -
  • Documentation
  • - {% endfor %} + + {% assign docs = list-pages.docs | where: "language", page.language %} + {% for doc in docs %} +
  • Documentation
  • + {% endfor %} {% endif %} GCWeb (Eng/Fra)

    Historique des versions

    diff --git a/templates/widgets-en.html b/templates/widgets-en.html index eb88c0cf2..bc286795e 100644 --- a/templates/widgets-en.html +++ b/templates/widgets-en.html @@ -14,51 +14,46 @@ ---

    Find the latest information on the National Conservation Plan, including announcements, Frequently Asked Questions and links to our social media channels.

    -
    +
    -
    -
    -

    Facebook

    -
    -
    -
      -
    • - - Enviroment Canada Logo - -
      -

      Enviroment Canada - Facebook

      -

      At Environment Canada our business is protecting the environment, conserving the country's natural heritage and providing weather and environmental predictions to keep Canadians informed and safe.

      +
      +

      Facebook

      +
      +
      + -
      +
      +
    • +

    Twitter

    -

    Information

    @@ -95,7 +90,7 @@

    YouTube:

    Pinterest:

    diff --git a/templates/widgets-fr.html b/templates/widgets-fr.html index 62da31cd5..d0b5b8910 100644 --- a/templates/widgets-fr.html +++ b/templates/widgets-fr.html @@ -14,52 +14,46 @@ ---

    Obtenez les dernières nouvelles sur le Plan de conservation national, y compris des annonces, une foire aux questions et des liens vers nos comptes de médias sociaux.

    -
    +
    -
    -
    -

    Facebook

    -
    -
    -

    Twitter

    Information

    @@ -104,7 +98,7 @@

    YouTube:

    Pinterest:

    diff --git "a/th\303\251matique/gc-th\303\251matique-en.html" "b/th\303\251matique/gc-th\303\251matique-en.html" index 27f38a560..da8470405 100644 --- "a/th\303\251matique/gc-th\303\251matique-en.html" +++ "b/th\303\251matique/gc-th\303\251matique-en.html" @@ -56,7 +56,7 @@

    Current list of GC promotional thematic projects

    {% for feature in thematic_pages %} {% assign thBasePath = feature.path | slice: 0, 10 %} {% if thBasePath == "méli-mélo/" %} -
  • {{ feature.title }} - (Exp. {{ feature.expiry }}) +
  • {{ feature.title }} - (Exp. {{ feature.expiry }}) {% if feature.cssClass.size > 0 or feature.jsFunctions.size > 0 %}
      diff --git "a/th\303\251matique/gc-th\303\251matique-fr.html" "b/th\303\251matique/gc-th\303\251matique-fr.html" index 567adddda..d3d809d22 100644 --- "a/th\303\251matique/gc-th\303\251matique-fr.html" +++ "b/th\303\251matique/gc-th\303\251matique-fr.html" @@ -60,7 +60,7 @@

      Current list of GC promotional thematic projects

      {% for feature in thematic_pages %} {% assign thBasePath = feature.path | slice: 0, 10 %} {% if thBasePath == "méli-mélo/" %} -
    • {{ feature.title }} - (Exp. {{ feature.expiry }}) +
    • {{ feature.title }} - (Exp. {{ feature.expiry }}) {% if feature.cssClass.size > 0 or feature.jsFunctions.size > 0 %}
        From 26e1c66c4fc556cf744854b2e923aceba9b2088c Mon Sep 17 00:00:00 2001 From: Eric Dunsworth <1907279+EricDunsworth@users.noreply.github.com> Date: Thu, 13 Jul 2023 16:02:10 -0400 Subject: [PATCH 2/2] WIP2 (redirect fixes for non-canada.ca links) --- components/provisional-en.html | 2 +- components/provisional-fr.html | 2 +- components/wb-chtwzrd/chatwizard-en.html | 8 ++++---- components/wb-chtwzrd/chatwizard-fr.html | 8 ++++---- components/wb-chtwzrd/demo/manual-form.json | 6 +++--- components/wb-doaction/doaction-doc-en.html | 2 +- components/wb-doaction/doaction-doc-fr.html | 2 +- components/wb-fieldflow/fieldflow-doc-en.html | 6 +++--- components/wb-fieldflow/fieldflow-doc-fr.html | 6 +++--- components/wb-urlmapping/urlmapping-doc-en.html | 4 ++-- components/wb-urlmapping/urlmapping-doc-fr.html | 4 ++-- docs/index.html | 12 ++++++------ docs/temp-v5issue.html | 8 ++++---- docs/test-menu.html | 2 +- docs/v5-migration.html | 8 ++++---- index-en.md | 4 ++-- index-fr.md | 4 ++-- templates/search/api-en.html | 6 +++--- templates/search/api-fr.html | 6 +++--- "th\303\251matique/gc-th\303\251matique-en.html" | 2 +- "th\303\251matique/gc-th\303\251matique-fr.html" | 2 +- 21 files changed, 52 insertions(+), 52 deletions(-) diff --git a/components/provisional-en.html b/components/provisional-en.html index 6bca323c0..796c0c114 100644 --- a/components/provisional-en.html +++ b/components/provisional-en.html @@ -376,7 +376,7 @@
        -

        Learn more about Canada’s Digital Charter

        +

        Learn more about Canada’s Digital Charter

        Learn how Canada’s Digital Charter will build a foundation of trust in a digital world.

        diff --git a/components/provisional-fr.html b/components/provisional-fr.html index c86ffdd44..500ea6dc0 100644 --- a/components/provisional-fr.html +++ b/components/provisional-fr.html @@ -379,7 +379,7 @@
  • Download GCWeb theme v13.4.0
    - ( - Release notes)

    + ( - Release notes)

    @@ -505,7 +505,7 @@ css:
    - +

    WET features styled with Canada.ca theme

    diff --git a/index-fr.md b/index-fr.md index 3fe8ffe23..1662c05c0 100644 --- a/index-fr.md +++ b/index-fr.md @@ -19,7 +19,7 @@ css:

    Télécharger le thème GCWeb v13.4.0
    - ( - Note de version)

    + ( - Note de version)

    @@ -504,7 +504,7 @@ css:
    - +

    Fonctionnalités BOEW avec le thème de Canada.ca

    diff --git a/templates/search/api-en.html b/templates/search/api-en.html index 07625f5b0..b78cc747c 100644 --- a/templates/search/api-en.html +++ b/templates/search/api-en.html @@ -40,8 +40,8 @@

    Working Example

    Prototype:

    @@ -102,7 +102,7 @@

    Template component

  • Search filters
  • -

    Note: visual example with styles applied: https://gc-proto.github.io/student-loans/scenarioA/services/search-results-visual.html

    +

    Note: visual example with styles applied: https://test.canada.ca/student-loans/scenarioA/services/search-results-visual.html

    Wireframe

    diff --git a/templates/search/api-fr.html b/templates/search/api-fr.html index 59e45ec30..5538f0305 100644 --- a/templates/search/api-fr.html +++ b/templates/search/api-fr.html @@ -43,8 +43,8 @@

    Working Example

    Prototype:

    @@ -105,7 +105,7 @@

    Template component

  • Search filters
  • -

    Note: visual example with styles applied: https://gc-proto.github.io/student-loans/scenarioA/services/search-results-visual.html

    +

    Note: visual example with styles applied: https://test.canada.ca/student-loans/scenarioA/services/search-results-visual.html

    Wireframe

    diff --git "a/th\303\251matique/gc-th\303\251matique-en.html" "b/th\303\251matique/gc-th\303\251matique-en.html" index da8470405..ea306f257 100644 --- "a/th\303\251matique/gc-th\303\251matique-en.html" +++ "b/th\303\251matique/gc-th\303\251matique-en.html" @@ -24,7 +24,7 @@

    Rules for a proper GC promotional thematic project

  • Must not contain any interference with wet-boew, GCWeb;
  • Loading features must not change the state of generic page. Feature must be explicitly activated through HTML by the web publisher, like wet-boew plugins or by using a CSS class to hook onto an HTML element;
  • Must be designed by following the progressive enhancement approach;
  • -
  • Must be coded by respecting the code linting practice of GCWeb in order to successfully pass the build script, which includes: HTMLlint, ESlint and SASSlint (See SASSlint configs on wet-boew);
  • +
  • Must be coded by respecting the code linting practice of GCWeb in order to successfully pass the build script, which includes: HTMLlint, ESlint and SASSlint (See SASSlint configs on wet-boew);
  • Favour a naming convention for features that represents the campaign followed by their function. This is to avoid collision with other styles, for example: .bg-canadaday.
  • diff --git "a/th\303\251matique/gc-th\303\251matique-fr.html" "b/th\303\251matique/gc-th\303\251matique-fr.html" index d3d809d22..173ef245f 100644 --- "a/th\303\251matique/gc-th\303\251matique-fr.html" +++ "b/th\303\251matique/gc-th\303\251matique-fr.html" @@ -28,7 +28,7 @@

    Rules for a proper GC promotional thematic project

  • Must not contain any interference with wet-boew, GCWeb;
  • Loading features must not change the state of generic page. Feature must be explicitly activated through HTML by the web publisher, like wet-boew plugins or by using a CSS class to hook onto an HTML element;
  • Must be designed by following the progressive enhancement approach;
  • -
  • Must be coded by respecting the code linting practice of GCWeb in order to successfully pass the build script, which includes: HTMLlint, ESlint and SASSlint (See SASSlint configs on wet-boew);
  • +
  • Must be coded by respecting the code linting practice of GCWeb in order to successfully pass the build script, which includes: HTMLlint, ESlint and SASSlint (See SASSlint configs on wet-boew);
  • Favour a naming convention for features that represents the campaign followed by their function. This is to avoid collision with other styles, for example: .bg-canadaday.