From f69c7cd513ad099191943f35b5346157b7a1d9d4 Mon Sep 17 00:00:00 2001
From: Nick Lyons <nick.lyons@gsa.gov>
Date: Fri, 1 Mar 2024 10:38:59 -0500
Subject: [PATCH] Fixed logic to hide header

- [x] tested when glossary is not enabled
- [x] tested when glossary is enabled with summary box
- [x] updated glossary.html to set header class for tagetting to hide in
  summary-box.js
- [x] set conditional to hide/display glossary.html partial based on
  glossary field set in parent _index.md
---
 themes/digital.gov/layouts/guides/single.html |  4 +-
 themes/digital.gov/layouts/landings/list.html |  5 +-
 .../layouts/partials/core/glossary.html       | 56 +++++++++----------
 themes/digital.gov/src/js/summary-box.js      |  2 +-
 4 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/themes/digital.gov/layouts/guides/single.html b/themes/digital.gov/layouts/guides/single.html
index 8e0b2216f4..cca3374f15 100644
--- a/themes/digital.gov/layouts/guides/single.html
+++ b/themes/digital.gov/layouts/guides/single.html
@@ -19,7 +19,9 @@
       {{- else -}}
         {{- partial "core/guides/guide-content.html" . -}}
       {{- end -}}
-      {{- partial "core/glossary.html" . -}}
+      {{- if .Parent.Params.glossary -}}
+        {{- partial "core/glossary.html" . -}}
+      {{- end -}}
     </article>
   </main>
 {{ end }}
diff --git a/themes/digital.gov/layouts/landings/list.html b/themes/digital.gov/layouts/landings/list.html
index 89e3110b1a..24558cac62 100644
--- a/themes/digital.gov/layouts/landings/list.html
+++ b/themes/digital.gov/layouts/landings/list.html
@@ -9,7 +9,6 @@ <h1>{{- .Params.title -}}</h1>
         </a>
       </div>
     </header>
-
     <article class="dg-landing__body grid-container grid-container-desktop">
       <div>
         {{- .Content -}}
@@ -46,6 +45,8 @@ <h2 class="usa-card__heading">
       {{- end -}}
       {{- partial "core/attribution.html" . -}}
     </article>
-    {{- partial "core/glossary.html" . -}}
+    {{- if .Parent.Params.glossary -}}
+      {{- partial "core/glossary.html" . -}}
+    {{- end -}}
   </main>
 {{ end }}
diff --git a/themes/digital.gov/layouts/partials/core/glossary.html b/themes/digital.gov/layouts/partials/core/glossary.html
index 6bc23ab63b..6893034a04 100644
--- a/themes/digital.gov/layouts/partials/core/glossary.html
+++ b/themes/digital.gov/layouts/partials/core/glossary.html
@@ -1,31 +1,27 @@
-{{ if ne .Params.glossary nil }}
-  <aside
-    class="dg-glossary__container"
-    aria-describedby="dg-glossary__result"
-    aria-hidden="true"
-  >
-    <button title="Close glossary" class="dg-glossary__close" disabled>
-      <svg
-        class="usa-icon dg-icon dg-icon--large"
-        aria-hidden="true"
-        focusable="true"
-      >
-        <use xlink:href="{{ "/uswds/img/sprite.svg#close" | relURL }}"></use>
-      </svg>
-    </button>
-
-    <h2>Glossary</h2>
-    <label for="dg-glossary__search" class="usa-label"
-      >Search for a term:</label
+<aside
+  class="dg-glossary__container"
+  aria-describedby="dg-glossary__result"
+  aria-hidden="true"
+>
+  <button title="Close glossary" class="dg-glossary__close" disabled>
+    <svg
+      class="usa-icon dg-icon dg-icon--large"
+      aria-hidden="true"
+      focusable="true"
     >
-    <input
-      id="dg-glossary__search"
-      class="dg-glossary__search usa-input"
-      type="text"
-      disabled
-    />
-    <div class="dg-glossary__content" id="dg-glossary__result">
-      <ul class="dg-glossary__list add-list-reset"></ul>
-    </div>
-  </aside>
-{{ end }}
+      <use xlink:href="{{ "/uswds/img/sprite.svg#close" | relURL }}"></use>
+    </svg>
+  </button>
+
+  <h2 class="dg-glossary__header">Glossary</h2>
+  <label for="dg-glossary__search" class="usa-label">Search for a term:</label>
+  <input
+    id="dg-glossary__search"
+    class="dg-glossary__search usa-input"
+    type="text"
+    disabled
+  />
+  <div class="dg-glossary__content" id="dg-glossary__result">
+    <ul class="dg-glossary__list add-list-reset"></ul>
+  </div>
+</aside>
diff --git a/themes/digital.gov/src/js/summary-box.js b/themes/digital.gov/src/js/summary-box.js
index cf1a5b7b9d..2158cd8709 100644
--- a/themes/digital.gov/src/js/summary-box.js
+++ b/themes/digital.gov/src/js/summary-box.js
@@ -10,7 +10,7 @@
 
   const guideSummaryList = guideSummary.querySelector(".usa-list");
   const pageHeaders = document.querySelectorAll(
-    "h2:not(.usa-summary-box__heading, .dg-guide__content-header-title)"
+    "h2:not(.usa-summary-box__heading, .dg-guide__content-header-title, .dg-glossary__header)"
   );
 
   function createSummaryBox() {