1285 template changes (#1287)

* Subtheme template changes

* Fixing footer and hiding menu image

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' },
 ];

public/gcintranet/esdc.css

@@ -187,4 +187,8 @@ border-color: #101823; }
 
 #wb-sm h2.wb-inv {
     color: #fff
+}
+
+#info-pnl {
+    display: none
 }

public/global/esdcfooter-eng.html

@@ -5,7 +5,7 @@ <h2 class="wb-inv">About this site</h2>
     <h3>About us</h3>
     <ul class="list-unstyled">
       <li><a href="https://edsc.prv/en/news/dm/index.shtml">DM messages</a></li>
-      <li><a href="https://edsc.prv/en/help.shtml">Help and important notices</a></li>
+      <li><a href="https://edsc.prv/en/terms_conditions.shtml">Terms and Conditions</a></li>
       <li><a href="https://edsc.prv/en/intersection/index.shtml">Intersection</a></li>
       <li><a href="https://edsc.prv/en/news/index.shtml">News</a></li>
     </ul>

public/global/esdcfooter-fra.html

@@ -4,7 +4,7 @@ <h2 class="wb-inv">À propos de ce site</h2>
   <section class="col-sm-3">
     <h3>À propos</h3>
     <ul class="list-unstyled">
-      <li><a href="https://edsc.prv/fr/aide.shtml">Aide et avis importants</a></li>
+      <li><a href="https://edsc.prv/fr/avis.shtml">Avis</a></li>
       <li><a href="https://edsc.prv/fr/intersection/index.shtml">Intersection</a></li>
       <li><a href="https://edsc.prv/fr/nouvelles/sm/index.shtml">Messages des SM</a></li>
       <li><a href="https://edsc.prv/fr/nouvelles/index.shtml">Nouvelles</a></li>

src/gcintranet/appFooter.ejs

@@ -53,7 +53,7 @@
                             <li><a href="<^- msg('https://esdc.prv/en/news/index.shtml') ^>"><^- msg('News') ^></a></li>
                             <li><a href="<^- msg('https://esdc.prv/en/feedback/index.shtml') ^>"><^- msg('Contact and Feedback') ^></a></li>
                             <li><a href="<^- msg('https://esdc.prv/en/stay_connected/index.shtml') ^>"><^- msg('Stay Connected') ^></a></li>
-                            <li><a href="<^- msg('https://edsc.prv/en/help.shtml') ^>"><^- msg('Help and Important Notices') ^></a></li>
+                            <li><a href="<^- msg('https://esdc.prv/en/terms_conditions.shtml') ^>"><^- msg('Terms and Conditions') ^></a></li>
                         </ul>
                     </section>
                 <%_ } else if (pr.subTheme == 'eccc') { -%>
@@ -82,21 +82,21 @@
             </ul>
         </nav>
     <%_ } else if (pr.subTheme == 'esdc' || pr.subTheme == 'labour') { -%>
-        <nav role="navigation" class="container visible-sm visible-md visible-lg wb-navcurr" data-wb-ajax='{"url": "<%- (pr.footerPath != null)? pr.footerPath: wet.builder.environmentHost(pr.cdnEnv) + 'app/cls/WET/global/<^- msg('esdcfooter-eng.html') ^>'%>", "type": "replace", "nocache": true}'></nav>
+        <nav role="navigation" class="container visible-xs visible-sm visible-md visible-lg wb-navcurr" data-wb-ajax='{"url": "<%- (pr.footerPath != null)? pr.footerPath: wet.builder.environmentHost(pr.cdnEnv) + 'app/cls/WET/global/<^- msg('esdcfooter-eng.html') ^>'%>", "type": "replace", "nocache": true}'></nav>
     <%_ } -%>
     <div class="brand">
         <div class="container">
             <div class="row">
-                <div class="col-xs-12 col-md-8">
-                    <a href="<^- msg('https://www.canada.ca/en.html') ^>"><img src="<%- wet.builder.environment(pr.cdnEnv) %>wet-boew/assets/<^- msg('sig-blk-en.svg') ^>" alt="<^- msg('Government of Canada') ^>"></a>
+                <div class="col-xs-8 col-md-8">
+                    <a href="<^- msg('https://www.canada.ca/en.html') ^>"><img src="<%- wet.builder.environment(pr.cdnEnv) %>wet-boew/assets/<^- msg('sig-blk-en.svg') ^>" alt="<^- msg('Government of Canada') ^>" class="img-responsive"></a>
                 </div>
-                <div class="col-xs-6 visible-sm visible-xs tofpg">
-                    <a href="#wb-cont"><^- msg('Top of Page') ^><span class="glyphicon glyphicon-chevron-up"></span></a>
+                <div class="col-xs-4 col-md-4 text-right">
+                    <img src="<%- wet.builder.environment(pr.cdnEnv) %>wet-boew/assets/wmms-blk.svg" alt="<^- msg('Symbol of the Government of Canada') ^>" class="img-responsive pull-right">
                 </div>
-                <div class="col-xs-6 col-md-4 text-right">
-                    <img src="<%- wet.builder.environment(pr.cdnEnv) %>wet-boew/assets/wmms-blk.svg" alt="<^- msg('Symbol of the Government of Canada') ^>">
+                <div class="col-xs-12 visible-sm visible-xs tofpg">
+                    <a href="#wb-cont"><^- msg('Top of Page') ^><span class="glyphicon glyphicon-chevron-up"></span></a>
                 </div>
             </div>
-        </div>
+        </div>  
     </div>
 </footer>

src/gcintranet/footer.ejs

@@ -31,14 +31,14 @@
     <div class="brand">
         <div class="container">
             <div class="row">
-                <div class="col-xs-12 col-md-8">
-                    <a href="<^- msg('https://www.canada.ca/en.html') ^>"><img src="<%- wet.builder.environment(pr.cdnEnv) %>wet-boew/assets/<^- msg('sig-blk-en.svg') ^>" alt="<^- msg('Government of Canada') ^>"></a>
+                <div class="col-xs-8 col-md-8">
+                    <a href="<^- msg('https://www.canada.ca/en.html') ^>"><img src="<%- wet.builder.environment(pr.cdnEnv) %>wet-boew/assets/<^- msg('sig-blk-en.svg') ^>" alt="<^- msg('Government of Canada') ^>" class="img-responsive"></a>
                 </div>
-                <div class="col-xs-6 visible-sm visible-xs tofpg">
-                    <a href="#wb-cont"><^- msg('Top of Page') ^><span class="glyphicon glyphicon-chevron-up"></span></a>
+                <div class="col-xs-4 col-md-4 text-right">
+                    <img src="<%- wet.builder.environment(pr.cdnEnv) %>wet-boew/assets/wmms-blk.svg" alt="<^- msg('Symbol of the Government of Canada') ^>" class="img-responsive pull-right">
                 </div>
-                <div class="col-xs-6 col-md-4 text-right">
-                    <img src="<%- wet.builder.environment(pr.cdnEnv) %>wet-boew/assets/wmms-blk.svg" alt="<^- msg('Symbol of the Government of Canada') ^>">
+                <div class="col-xs-12 visible-sm visible-xs tofpg">
+                    <a href="#wb-cont"><^- msg('Top of Page') ^><span class="glyphicon glyphicon-chevron-up"></span></a>
                 </div>
             </div>
         </div>

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

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"
     }
 }