diff --git a/_data/components.json b/_data/components.json index 5757ba592a..1f9897e23f 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/_includes/alert-provisional.html b/_includes/alert-provisional.html index 4fa4d438a6..e4f29142a1 100644 --- a/_includes/alert-provisional.html +++ b/_includes/alert-provisional.html @@ -3,13 +3,13 @@

Fonctionnalité instable

À être utilisé à vos propres risques. Toutes les fonctionnalités décrites ci-dessous pourraient être retirées à n'importe quelle version mineur/majeur ultérieure et l'ensemble des fonctionnalités provisoires sont exclues de l'API publique de GCWeb.

La documentation et/ou les exemples pratiques pourraient être incomplets ou être non disponible.

-

Voir l'ensemble des fonctionnalités provisoires.

+

Voir l'ensemble des fonctionnalités provisoires.

{%- elsif page.language == "en" -%}

Unstable feature

To be used at your own risks. All functionalities described below could be removed in any subsequent minor/major release and are excluded from the GCWeb public API.

Documentation and/or working examples for those features could be incomplete or not available.

-

See all provisional features.

+

See all provisional features.

{%- endif -%} diff --git a/_includes/components/gc-features/features.html b/_includes/components/gc-features/features.html index da6e088094..fc64cd4ed9 100644 --- a/_includes/components/gc-features/features.html +++ b/_includes/components/gc-features/features.html @@ -15,7 +15,7 @@

Features

{% for i in (1..3) %}
-
+
{%- if page.language == "fr" -%}

[Lien vers l’élément en vedette]

diff --git a/_includes/components/gc-follow-us/follow.html b/_includes/components/gc-follow-us/follow.html index 7f5bd635a2..d0f00b639f 100644 --- a/_includes/components/gc-follow-us/follow.html +++ b/_includes/components/gc-follow-us/follow.html @@ -12,9 +12,9 @@ {%- if page.language == "fr" -%}

Suivez :

{% 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/thematic/dark-theme-en.html b/templates/thematic/dark-theme-en.html index ec5b4a448f..372e7ce5b4 100644 --- a/templates/thematic/dark-theme-en.html +++ b/templates/thematic/dark-theme-en.html @@ -5,12 +5,12 @@ "altLangPage": "dark-theme-fr.html", "pageclass": "provisional dark-theme", "breadcrumbs": [ - { "title": "GCWeb home", "link": "https://wet-boew.github.io/themes-dist/GCWeb/index-en.html" } + { "title": "GCWeb home", "link": "index-en.html" } ], "secondlevel": false, "dateModified": "2019-05-15", "share": "true" } --- -{% include alert-provisional.html provisionaldir="../../components/" %} +{% include alert-provisional.html %} {% include web-contents/placeholdercontent-en.html %} diff --git a/templates/thematic/dark-theme-fr.html b/templates/thematic/dark-theme-fr.html index 5769c08210..74feacce6f 100644 --- a/templates/thematic/dark-theme-fr.html +++ b/templates/thematic/dark-theme-fr.html @@ -5,12 +5,12 @@ "altLangPage": "dark-theme-en.html", "pageclass": "provisional dark-theme", "breadcrumbs": [ - { "title": "Accueil GCWeb", "link": "https://wet-boew.github.io/themes-dist/GCWeb/index-fr.html" } + { "title": "Accueil GCWeb", "link": "index-fr.html" } ], "secondlevel": false, "dateModified": "2019-05-15", "share": "true" } --- -{% include alert-provisional.html provisionaldir="../../components/" %} +{% include alert-provisional.html %} {% include web-contents/placeholdercontent-fr.html %} diff --git a/templates/thematic/pink-day-en.html b/templates/thematic/pink-day-en.html index 1a4fbf7823..a8a4d30b2f 100644 --- a/templates/thematic/pink-day-en.html +++ b/templates/thematic/pink-day-en.html @@ -5,14 +5,14 @@ "altLangPage": "pink-day-fr.html", "pageclass": "provisional pnkDy-theme", "breadcrumbs": [ - { "title": "GCWeb home", "link": "https://wet-boew.github.io/themes-dist/GCWeb/index-en.html" } + { "title": "GCWeb home", "link": "index-en.html" } ], "secondlevel": false, "dateModified": "2019-05-15", "share": "true" } --- -{% include alert-provisional.html provisionaldir="../../components/" %} +{% include alert-provisional.html %} {% include web-contents/placeholdercontent-en.html %}

    Home page banner sample

    diff --git a/templates/thematic/pink-day-fr.html b/templates/thematic/pink-day-fr.html index 737488db93..03fea05431 100644 --- a/templates/thematic/pink-day-fr.html +++ b/templates/thematic/pink-day-fr.html @@ -5,14 +5,14 @@ "altLangPage": "pink-day-en.html", "pageclass": "provisional pnkDy-theme", "breadcrumbs": [ - { "title": "Accueil GCWeb", "link": "https://wet-boew.github.io/themes-dist/GCWeb/index-fr.html" } + { "title": "Accueil GCWeb", "link": "index-fr.html" } ], "secondlevel": false, "dateModified": "2019-05-15", "share": "true" } --- -{% include alert-provisional.html provisionaldir="../../components/" %} +{% include alert-provisional.html %} {% include web-contents/placeholdercontent-fr.html %}

    Example de la page d'accueil

    diff --git a/templates/widgets-en.html b/templates/widgets-en.html index eb88c0cf20..3a71fba6b7 100644 --- a/templates/widgets-en.html +++ b/templates/widgets-en.html @@ -14,49 +14,40 @@ ---

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

    -
    -
    -
    -
    -

    Facebook

    +
    +
    +

    Facebook

    +
    +

    Environment and Climate Change

    +
    +
    +
    Environment and Climate Change 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.

      -
      -
      • -
    • - - Parks Canada Logo - -
      -

      Parks Canada - Facebook

      -

      On behalf of the people of Canada, we protect and present nationally significant examples of Canada's natural and cultural heritage, and foster public understanding, appreciation and enjoyment in ways that ensure the ecological and commemorative integrity of these places for present and future generations.

      -
      -
      • -
    +
    +
    +

    Parks Canada

    +
    +
    +
    Parks Canada Facebook
    +
    -
    -
    +
    +

    Twitter

    -
    +
    +

    Information

    diff --git a/templates/widgets-fr.html b/templates/widgets-fr.html index 62da31cd53..68e0150867 100644 --- a/templates/widgets-fr.html +++ b/templates/widgets-fr.html @@ -14,50 +14,40 @@ ---

    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

    +
    +
    +

    Facebook

    +
    +

    Environnement et Changement climatique

    +
    +
    +
    Environnement et Changement climatique Facebook
    +
    -
    -
      -
    • - - Environnement Canada - -
      -

      Environnement Canada - Facebook

      -

      EC est une organisation diversifiée offrant des programmes et des services efficaces et regroupant des gens dynamiques qui font une différence sur le plan environnemental et dans différents aspects de la vie des Canadiennes et Canadiens.

      -
      -
      • -
    • - - Parcs Canada - -
      -

      Parcs Canada- Facebook

      -

      Les parcs nationaux, aires marines nationales de conservation et lieux historiques nationaux du Canada.

      -
      -
      • -
    +
    +
    +

    Parcs Canada

    +
    +
    +
    Parcs Canada Facebook
    +
    -
    -
    +
    +

    Twitter

    - +

    Information

    diff --git "a/th\303\251matique/gc-th\303\251matique-en.html" "b/th\303\251matique/gc-th\303\251matique-en.html" index 27f38a560b..da84704051 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 567adddda5..d3d809d226 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 %}