From 2cee2d6816e8fea8f0b178c24637cbda75f2a6e2 Mon Sep 17 00:00:00 2001
From: David Waltermire <david.waltermire@nist.gov>
Date: Thu, 1 Jun 2023 15:26:02 -0400
Subject: [PATCH] Adjusted site to use latest USWDS theme.

---
 website/config.yaml                           |  1 +
 website/content/_index.md                     |  3 +-
 website/themes/uswds                          |  2 +-
 ...-styles => _hugo-uswds-custom-styles.scss} | 10 +++++
 .../uswds-nist/layouts/partials/foot.html     | 45 ++++++++++---------
 5 files changed, 39 insertions(+), 22 deletions(-)
 rename website/themes/uswds-nist/assets/scss/{_hugo-uswds-custom-styles => _hugo-uswds-custom-styles.scss} (73%)

diff --git a/website/config.yaml b/website/config.yaml
index 4ea0526ad..cf0cff09a 100644
--- a/website/config.yaml
+++ b/website/config.yaml
@@ -4,6 +4,7 @@ relativeURLs: true
 canonifyURLs: true
 defaultContentLanguage: en
 disableAliases: true
+languageCode: "en-us"
 languages:
   en:
     lang: en
diff --git a/website/content/_index.md b/website/content/_index.md
index edafa4cc3..645d6702c 100644
--- a/website/content/_index.md
+++ b/website/content/_index.md
@@ -3,7 +3,8 @@ title: "Metaschema Information Modeling Framework"
 cascade:
   suppresstopiclist: true
   toc:
-    enabled: true
+    display: true
+  sidenav:
     collapsedepth: 4
 ---
 {{< usa-hero image="automation-hero.png" calloutAltText="Efficient" calloutText="Information Modeling" buttonURL="/specification/" buttonText="Learn More" >}}
diff --git a/website/themes/uswds b/website/themes/uswds
index 2d39dc270..566c313af 160000
--- a/website/themes/uswds
+++ b/website/themes/uswds
@@ -1 +1 @@
-Subproject commit 2d39dc27004fd0fefd302ab184af874685f2cd60
+Subproject commit 566c313afce25e174ded17a9dbb5fdf73f31bb64
diff --git a/website/themes/uswds-nist/assets/scss/_hugo-uswds-custom-styles b/website/themes/uswds-nist/assets/scss/_hugo-uswds-custom-styles.scss
similarity index 73%
rename from website/themes/uswds-nist/assets/scss/_hugo-uswds-custom-styles
rename to website/themes/uswds-nist/assets/scss/_hugo-uswds-custom-styles.scss
index fa725baf3..c029dcd02 100644
--- a/website/themes/uswds-nist/assets/scss/_hugo-uswds-custom-styles
+++ b/website/themes/uswds-nist/assets/scss/_hugo-uswds-custom-styles.scss
@@ -15,4 +15,14 @@ i.e.
 
 .nist-footer {
     font-family: inherit;
+}
+
+#ln-messageHolder {
+    z-index: 1000;
+}
+
+@media print {
+  #nistheadergoeshere, #nistfootergoeshere {
+    display: none;
+  }
 }
\ No newline at end of file
diff --git a/website/themes/uswds-nist/layouts/partials/foot.html b/website/themes/uswds-nist/layouts/partials/foot.html
index ba227a031..eb3484af1 100644
--- a/website/themes/uswds-nist/layouts/partials/foot.html
+++ b/website/themes/uswds-nist/layouts/partials/foot.html
@@ -1,25 +1,30 @@
 <div id="nistfootergoeshere"></div>
-<script type="text/javascript" src="https://pages.nist.gov/leaveNotice/js/jquery.leaveNotice-nist.min.js"></script>
+<script defer src="https://pages.nist.gov/leaveNotice/js/jquery.leaveNotice-nist.min.js"></script>
 <script>
-$(document).ready(function () {
-  // inject nist header
-  $.ajax({
-    url: "https://pages.nist.gov/nist-header-footer/boilerplate-header.html",
-    cache: false,
-    dataType: "html",
-    success: function (data) { $('#nistheadergoeshere').append(data); },
-  });
-  // inject nist footer
-  $.ajax({
-    url: "https://pages.nist.gov/nist-header-footer/boilerplate-footer.html",
-    cache: false,
-    dataType: "html",
-    success: function (data) { $('#nistfootergoeshere').append(data); },
-  });
+document.addEventListener('DOMContentLoaded', function(){
+  $(document).ready(function () {
+    
+    // inject nist header
+    $.ajax({
+      url: "https://pages.nist.gov/nist-header-footer/boilerplate-header.html",
+      cache: false,
+      dataType: "html",
+      success: function (data) { $('#nistheadergoeshere').append(data); },
+    });
+    // inject nist footer
+    $.ajax({
+      url: "https://pages.nist.gov/nist-header-footer/boilerplate-footer.html",
+      cache: false,
+      dataType: "html",
+      success: function (data) { $('#nistfootergoeshere').append(data); },
+    });
 
-  // add external link icon to non-nist pages
-  $('a[href*="//"]{{ if .Site.IsServer }}:not([href*="http://localhost:1313/"]){{ end }}:not([href*="pages.nist.gov"]):not([href*="www.nist.gov"]):not([href^="#"]):not([href^="/"])').addClass('usa-link usa-link--external');
-  // hook up NIST leave notice to external links
-  $('a.usa-link--external').leaveNotice();
+    // add external link icon to non-nist pages
+    $('a[href*="//"]{{ if .Site.IsServer }}:not([href*="http://localhost:1313/"]){{ end }}:not([href*="pages.nist.gov"]):not([href*="www.nist.gov"]):not([href^="#"]):not([href^="/"])').addClass('usa-link usa-link--external');
+    // hook up NIST leave notice to external links
+    $('a.usa-link--external').leaveNotice({{ with .Site.Params.leavenotice }}{
+      {{ if isset . "timeout" }}timeOut: {{ .timeout }}{{ end }}
+    }{{ end }});
+  });
 });
 </script>