Merge branch 'main' into update_pally_workflow

.github/workflows/megalinter.yml

@@ -36,6 +36,15 @@ jobs:
           token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
           fetch-depth: 0
 
+      - name: "Import GPG key"
+        id: import-gpg
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
       # MegaLinter
       - name: MegaLinter
         id: ml
@@ -74,14 +83,16 @@ jobs:
       - name: Prepare commit
         if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
         run: sudo chown -Rc $UID .git/
+
       - name: Commit and push applied linter fixes
         if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
         uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # pin@v5
         with:
           branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
           commit_message: "[MegaLinter] Apply linters fixes"
-          commit_user_name: megalinter-bot
-          commit_user_email: [email protected]
+          commit_author: "${{ steps.import-gpg.outputs.name }} <${{ steps.import-gpg.outputs.email }}>"
+          commit_user_name: ${{ steps.import-gpg.outputs.name }}
+          commit_user_email: ${{ steps.import-gpg.outputs.email }}
 
       - name: Check to see if the SARIF a was generated
         id: sarif_file_exists

_data/assetPaths.json

@@ -1,9 +1,9 @@
 {
-  "admin.js": "/assets/js/admin-FRDUYGSL.js",
-  "admin.map": "/assets/js/admin-FRDUYGSL.js.map",
-  "app.js": "/assets/js/app-SDZ4ULFW.js",
-  "app.map": "/assets/js/app-SDZ4ULFW.js.map",
+  "admin.js": "/assets/js/admin-RJYP54EU.js",
+  "admin.map": "/assets/js/admin-RJYP54EU.js.map",
+  "app.js": "/assets/js/app-XFKDNIAK.js",
+  "app.map": "/assets/js/app-XFKDNIAK.js.map",
   "uswds.js": "/assets/js/uswds-init.js",
-  "styles.css": "/assets/styles/styles-J5DQM6RN.css",
-  "styles.map": "/assets/styles/styles-J5DQM6RN.css.map"
+  "styles.css": "/assets/styles/styles-ZVXT7TJI.css",
+  "styles.map": "/assets/styles/styles-ZVXT7TJI.css.map"
 }

_data/heroAlert.json

@@ -1,3 +1,3 @@
 {
-  "message": "TTS is hiring, <a href=\"{{ '/join' | url }}\" class=\"usa-link\">Join us!</a>"
+  "message": "TTS is hiring, <a href=\"{{ '/join' | url }}\" class=\"usa-link\">Join us!!</a>"
 }

_data/site.yaml

@@ -89,7 +89,6 @@ primary_navigation:
         url: "/services/platforms/"
       - name: People
         url: "/services/people/"
-
 # secondary_navigation:
 #   - name: Secondary link
 #     url: "#main-content"
@@ -100,7 +99,7 @@ primary_navigation:
 # 1. Create an account with Search.gov https://search.usa.gov/signup
 # 2. Add a new site.
 # 3. Add your site/affiliate name here.
-searchgov: "foobar"
+# searchgov: "foobar"
 # Only change this if you're using a CNAME. Learn more here: https://search.gov/manual/cname.html
 # endpoint: https://search.usa.gov
 

_includes/footer.html

@@ -23,12 +23,12 @@
 
             <div class="grid-col-auto">
               <a class="usa-social-link" href="https://twitter.com/GSA_TTS"
-                >{% image_with_class "_img/twitter.svg" "Twitter" %}</a>
+                >{% image_with_class "_img/twitter.svg" "" "Twitter" %}</a>
             </div>
 
             <div class="grid-col-auto">
               <a class="usa-social-link" href="https://www.linkedin.com/company/gsa-tts"
-              >{% image_with_class "_img/linkedin.svg" "LinkedIn" %}</a>
+              >{% image_with_class "_img/linkedin.svg" "" "LinkedIn" %}</a>
             </div>
 
           </div>

_includes/header.html

@@ -35,7 +35,6 @@
             <span class="usa-banner__button-text">Here's how you know</span>
           </button>
           </div>
-          {% include "language-switcher.html" %}
         </div>
       </section>
       <div class="usa-banner__content usa-accordion__content" id="gov-banner">

_includes/hero.html

@@ -3,7 +3,17 @@
 {% endcomment %}
 
 {% if site.show_site_alert %}
-  {% render "hero-alert.html", alert: heroAlert['message'] %}
+
+<section class="usa-site-alert usa-site-alert--info usa-site-alert--slim" aria-label="Site alert,">
+  <div class="usa-alert">
+    <div class="usa-alert__body">
+      <p class="usa-alert__text">
+      TTS is hiring, <a href="{{ '/join' | url }}" class="usa-link">Join us!</a>
+      </p>
+    </div>
+  </div>
+</section>
+
 {% endif %}
 <section class="position-relative tts-hero-wrap">
   <div class="usa-hero--tts opacity-90"></div>

_includes/layouts/base.html

@@ -17,13 +17,7 @@
   {{ content }}
 
   {% include "footer.html" %}
-
-  {% comment %} Hide SVG Sprites {% endcomment %}
-  <div style="display: none;">
-    {% usa_icons_sprite %}
-    {% uswds_icons_sprite %}
-  </div>
-
+
   {% include "scripts.html" %}
 </body>
 

_includes/layouts/jointts/home.html

@@ -65,7 +65,7 @@ <h2> Upcoming positions</h2>
         {% endfor %}
         </ul>
         <h2> Other GSA Opportunities </h2>
-       <p> Check out <a href="https://www.gsa.gov/about-us/careers">careers at GSA</a> and more <a href="https://www.usajobs.gov/Search/Results?j=2210&d=GS&p=1">Information Technology opportunities.</a></p>
+       <p> Check out <a href="https://www.gsa.gov/about-us/find-apply-for-and-land-a-job-at-gsa">careers at GSA</a> and more <a href="https://www.usajobs.gov/Search/Results?j=2210&d=GS&p=1">Information Technology opportunities.</a></p>
 
         <h2>Application process</h2>
         <p>

_includes/menu.html

@@ -61,7 +61,6 @@
           </li>
           {% endfor %}
         </ul> -->
-        <!-- {% include "searchgov/form.html" searchgov: site.searchgov %} -->
 
         {% comment %}
   This will redirect the results to /search template which will handle the js loading
@@ -87,6 +86,7 @@
   </form>
 {% endif %}
 
+{% comment %}
         <section aria-label="Small search component">
           <form class="usa-search usa-search--small" role="search">
             <label class="usa-sr-only" for="search-field-en-small">Search</label>
@@ -97,11 +97,11 @@
               name="search"
             />
             <button class="usa-button" type="submit">
-              {% image_with_class "_img/search--white.svg" "usa-search__submit-icon" %}
+              {% image_with_class "_img/search--white.svg" "usa-search__submit-icon" "Search" %}
             </button>
           </form>
         </section>
-
+        {% endcomment %}        
         {% include "searchgov/form.html" searchgov: site.searchgov %}
       </div>
     </div>

_includes/scripts.html

@@ -34,3 +34,31 @@
     <script async src="https://search.usa.gov/javascripts/remote.loader.js" type="text/javascript"></script>
   {% endif %}
 {% endif %}
+
+<!-- Custom subnav toggle -->
+<script>
+  document.addEventListener('DOMContentLoaded', function() {
+      const toggle = document.querySelector('.usa-subnav-mobile-toggle');
+      if (toggle) {
+          toggle.addEventListener('click', function() {
+              toggle.classList.toggle('open-subnav');
+          });
+      }
+
+      if (window.innerWidth < 1024) {
+          const sidenavItems = document.querySelectorAll('li.usa-sidenav__item');
+          sidenavItems.forEach(function(item) {
+              if (item.querySelector('ul')) {
+                  item.classList.add('toggle-submenu');
+              }
+          });
+      }
+
+      const subtoggle = document.querySelectorAll('.toggle-submenu');
+      subtoggle.forEach(function(toggle) {
+          toggle.addEventListener('click', function() {
+              toggle.classList.toggle('open-subnav');
+          });
+      });
+  });
+</script>

_includes/search-gov.html

@@ -32,7 +32,7 @@
         name="search"
       />
       <button class="usa-button" type="submit">
-        {% image_with_class "_img/search--white.svg" "usa-search__submit-icon" %}
+        {% image_with_class "_img/search--white.svg" "usa-search__submit-icon" "Search" %}
       </button>
     </form>
-  </section>
+</section>

_includes/sidenav.html

@@ -1,3 +1,4 @@
+<button class="usa-subnav-mobile-toggle">Jump to section</button>
 <nav aria-label="Secondary navigation">
   <ul class="usa-sidenav">
     {% for link in links %}