diff --git a/ExternalResGatherer.js b/ExternalResGatherer.js index 53548220..3819cc38 100644 --- a/ExternalResGatherer.js +++ b/ExternalResGatherer.js @@ -14,10 +14,10 @@ const { exceptionCDTSHTTPLinks } = require('./TestLinks'); const defaultResourceList = [ - { targetFilePath: ['./public/global/esdcmenu-eng.html', './public/global/esdcmenu1-eng.html'], url: 'https://esdc.prv/_conf/assets/en/mega_menu/esdcmenu-eng.html', sourcePageUrl: ['https://esdc.prv/js/esdc-template_js_en.js', 'https://esdc.prv/en/index.shtml'] }, - { targetFilePath: ['./public/global/esdcmenu-fra.html', './public/global/esdcmenu1-fra.html'], url: 'https://esdc.prv/_conf/assets/fr/mega_menu/esdcmenu-fra.html', sourcePageUrl: ['https://esdc.prv/js/esdc-template_js_fr.js', 'https://esdc.prv/fr/index.shtml'] }, - { targetFilePath: './public/global/esdcfooter-eng.html', url: 'https://esdc.prv/_conf/assets/en/footer/esdcfooter-eng.html', sourcePageUrl: ['https://esdc.prv/js/esdc-template_js_en.js', 'https://esdc.prv/en/index.shtml'] }, - { targetFilePath: './public/global/esdcfooter-fra.html', url: 'https://esdc.prv/_conf/assets/fr/footer/esdcfooter-fra.html', sourcePageUrl: ['https://esdc.prv/js/esdc-template_js_fr.js', 'https://esdc.prv/fr/index.shtml'] }, + { targetFilePath: ['./public/global/esdcmenu-eng.html', './public/global/esdcmenu1-eng.html'], url: 'https://esdc.prv/_conf/assets/en/mega_menu/esdcmenu-eng.html', sourcePageUrl: ['https://esdc.prv/js/template.js', 'https://esdc.prv/en/index.shtml'] }, + { targetFilePath: ['./public/global/esdcmenu-fra.html', './public/global/esdcmenu1-fra.html'], url: 'https://esdc.prv/_conf/assets/fr/mega_menu/esdcmenu-fra.html', sourcePageUrl: ['https://esdc.prv/js/template.js', 'https://esdc.prv/fr/index.shtml'] }, + { targetFilePath: './public/global/esdcfooter-eng.html', url: 'https://esdc.prv/_conf/assets/en/footer/esdcfooter-eng.html', sourcePageUrl: ['https://esdc.prv/js/template.js', 'https://esdc.prv/en/index.shtml'] }, + { targetFilePath: './public/global/esdcfooter-fra.html', url: 'https://esdc.prv/_conf/assets/fr/footer/esdcfooter-fra.html', sourcePageUrl: ['https://esdc.prv/js/template.js', 'https://esdc.prv/fr/index.shtml'] }, { targetFilePath: './public/gcintranet/ajax/sitemenu-eng.html', url: 'https://intranet.canada.ca/wet/sitemenu-eng.html', sourcePageUrl: 'https://intranet.canada.ca/index-eng.asp' }, { targetFilePath: './public/gcintranet/ajax/sitemenu-fra.html', url: 'https://intranet.canada.ca/wet/sitemenu-fra.html', sourcePageUrl: 'https://intranet.canada.ca/index-fra.asp' }, ]; diff --git a/public/gcintranet/esdc.css b/public/gcintranet/esdc.css index c1d1a49c..b7c9dcc4 100644 --- a/public/gcintranet/esdc.css +++ b/public/gcintranet/esdc.css @@ -187,4 +187,8 @@ border-color: #101823; } #wb-sm h2.wb-inv { color: #fff +} + +#info-pnl { + display: none } \ No newline at end of file diff --git a/public/global/esdcfooter-eng.html b/public/global/esdcfooter-eng.html index 488bc064..152062cd 100644 --- a/public/global/esdcfooter-eng.html +++ b/public/global/esdcfooter-eng.html @@ -5,7 +5,7 @@

About this site

About us

diff --git a/public/global/esdcfooter-fra.html b/public/global/esdcfooter-fra.html index 54cfb1dc..10af512d 100644 --- a/public/global/esdcfooter-fra.html +++ b/public/global/esdcfooter-fra.html @@ -4,7 +4,7 @@

À propos de ce site

À propos

+ - \ No newline at end of file + \ No newline at end of file diff --git a/public/global/esdcmenu-fra.html b/public/global/esdcmenu-fra.html index 7f590e75..6c7e406e 100644 --- a/public/global/esdcmenu-fra.html +++ b/public/global/esdcmenu-fra.html @@ -6,163 +6,161 @@ wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html --> -
-

Menu des sujets

-
- -
+
+

Menu des sujets

+
+ +
- \ No newline at end of file + \ No newline at end of file diff --git a/public/global/esdcmenu1-eng.html b/public/global/esdcmenu1-eng.html index 80d7310f..9f8df12e 100644 --- a/public/global/esdcmenu1-eng.html +++ b/public/global/esdcmenu1-eng.html @@ -6,165 +6,165 @@ wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html --> +
-

Topics menu

-
-
+ +
- \ No newline at end of file + \ No newline at end of file diff --git a/public/global/esdcmenu1-fra.html b/public/global/esdcmenu1-fra.html index 7f590e75..6c7e406e 100644 --- a/public/global/esdcmenu1-fra.html +++ b/public/global/esdcmenu1-fra.html @@ -6,163 +6,161 @@ wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html --> -
-

Menu des sujets

-
- -
+
+

Menu des sujets

+
+ +
- \ No newline at end of file + \ No newline at end of file diff --git a/src/gcintranet/appFooter.ejs b/src/gcintranet/appFooter.ejs index 992f9208..a587cfe8 100644 --- a/src/gcintranet/appFooter.ejs +++ b/src/gcintranet/appFooter.ejs @@ -53,7 +53,7 @@
  • <^- msg('News') ^>
  • <^- msg('Contact and Feedback') ^>
  • <^- msg('Stay Connected') ^>
    • -
  • <^- msg('Help and Important Notices') ^>
    • +
  • <^- msg('Terms and Conditions') ^>
    • <%_ } else if (pr.subTheme == 'eccc') { -%> @@ -82,21 +82,21 @@ <%_ } else if (pr.subTheme == 'esdc' || pr.subTheme == 'labour') { -%> - + <%_ } -%>
    -
    - <^- msg('Government of Canada') ^> +
    + <^- msg('Government of Canada') ^>
    -
    - <^- msg('Top of Page') ^> +
    + <^- msg('Symbol of the Government of Canada') ^>
    -
    - <^- msg('Symbol of the Government of Canada') ^> +
    + <^- msg('Top of Page') ^>
    -
    +
    diff --git a/src/gcintranet/footer.ejs b/src/gcintranet/footer.ejs index fb05a05c..c180f3a0 100644 --- a/src/gcintranet/footer.ejs +++ b/src/gcintranet/footer.ejs @@ -31,14 +31,14 @@
    -
    - <^- msg('Government of Canada') ^> +
    + <^- msg('Government of Canada') ^>
    -
    - <^- msg('Top of Page') ^> +
    + <^- msg('Symbol of the Government of Canada') ^>
    -
    - <^- msg('Symbol of the Government of Canada') ^> +
    + <^- msg('Top of Page') ^>
    diff --git a/src/gcintranet/wet-messages.en.json b/src/gcintranet/wet-messages.en.json index 789b2de9..3d1a60fc 100644 --- a/src/gcintranet/wet-messages.en.json +++ b/src/gcintranet/wet-messages.en.json @@ -49,12 +49,12 @@ "source": "Stay Connected", "target": null }, - "b1c32100348229f0b66c3ceba26fc75f41f58911": { - "source": "https://edsc.prv/en/help.shtml", + "3c1e068e37dca7903dd9ccc7bc3200de50c8192e": { + "source": "https://esdc.prv/en/terms_conditions.shtml", "target": null }, - "8e153eebdea15ba070f36a605224fda3ae6300ef": { - "source": "Help and Important Notices", + "894031ed8d341b5ecab5e23002585055f0b7ee4d": { + "source": "Terms and Conditions", "target": null }, "9ad0ccff7c60872356cb74b82694782be79ba338": { @@ -133,14 +133,14 @@ "source": "Government of Canada", "target": null }, - "af9d5a302c5423a656f859b7b5a353fd8b879361": { - "source": "Top of Page", - "target": null - }, "4c4e7125a283fe6001b1e525ac5d08dc54f39bbd": { "source": "Symbol of the Government of Canada", "target": null }, + "af9d5a302c5423a656f859b7b5a353fd8b879361": { + "source": "Top of Page", + "target": null + }, "8d12437949e4425e3739fdb7a008fc2a29f8299f": { "source": "https://intranet.ec.gc.ca/default.asp?lang=En", "target": null diff --git a/src/gcintranet/wet-messages.fr.json b/src/gcintranet/wet-messages.fr.json index f89a0d85..b039926c 100644 --- a/src/gcintranet/wet-messages.fr.json +++ b/src/gcintranet/wet-messages.fr.json @@ -173,10 +173,6 @@ "source": "https://www.canada.ca/en.html", "target": "https://www.canada.ca/fr.html" }, - "8e153eebdea15ba070f36a605224fda3ae6300ef": { - "source": "Help and Important Notices", - "target": "Aide et avis importants" - }, "49daaf3fded771275b2a6b52a4ebc1cf7829df24": { "source": "esdcfooter-eng.html", "target": "esdcfooter-fra.html" @@ -345,10 +341,6 @@ "source": "https://esdc.prv/en/stay_connected/index.shtml", "target": "https://esdc.prv/fr/restez_branche/index.shtml" }, - "b1c32100348229f0b66c3ceba26fc75f41f58911": { - "source": "https://edsc.prv/en/help.shtml", - "target": "https://edsc.prv/fr/aide.shtml" - }, "8d12437949e4425e3739fdb7a008fc2a29f8299f": { "source": "https://intranet.ec.gc.ca/default.asp?lang=En", "target": "https://intranet.ec.gc.ca/default.asp?lang=fr" @@ -468,5 +460,13 @@ "5b82747d146bcb033f073f1c4465847546261d56": { "source": "Intranet Banner", "target": "Bannière intranet" + }, + "3c1e068e37dca7903dd9ccc7bc3200de50c8192e": { + "source": "https://esdc.prv/en/terms_conditions.shtml", + "target": "https://esdc.prv/fr/avis.shtml" + }, + "894031ed8d341b5ecab5e23002585055f0b7ee4d": { + "source": "Terms and Conditions", + "target": "Avis" } } \ No newline at end of file