diff --git a/.github/workflows/megalinter.yml b/.github/workflows/megalinter.yml index 479f0349..b442ec45 100644 --- a/.github/workflows/megalinter.yml +++ b/.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: nicolas.vuillamy@ox.security + 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 diff --git a/_data/assetPaths.json b/_data/assetPaths.json index 78fe7682..9fb6d1c4 100644 --- a/_data/assetPaths.json +++ b/_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" } diff --git a/_data/heroAlert.json b/_data/heroAlert.json index 913a93ce..e7a06bde 100644 --- a/_data/heroAlert.json +++ b/_data/heroAlert.json @@ -1,3 +1,3 @@ { - "message": "TTS is hiring, Join us!" + "message": "TTS is hiring, Join us!!" } diff --git a/_data/site.yaml b/_data/site.yaml index eddf3928..319e2705 100644 --- a/_data/site.yaml +++ b/_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 diff --git a/_img/minus.svg b/_img/minus.svg new file mode 100644 index 00000000..fe94d574 --- /dev/null +++ b/_img/minus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/_img/plus.svg b/_img/plus.svg new file mode 100644 index 00000000..3399ab48 --- /dev/null +++ b/_img/plus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index a5a1b268..2cbc6d04 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -23,12 +23,12 @@
{% image_with_class "_img/twitter.svg" "Twitter" %} + >{% image_with_class "_img/twitter.svg" "" "Twitter" %}
{% image_with_class "_img/linkedin.svg" "LinkedIn" %} + >{% image_with_class "_img/linkedin.svg" "" "LinkedIn" %}
diff --git a/_includes/header.html b/_includes/header.html index 9a20bf01..152b3d71 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -35,7 +35,6 @@ Here's how you know - {% include "language-switcher.html" %}
diff --git a/_includes/hero.html b/_includes/hero.html index 34a33770..a1d95635 100644 --- a/_includes/hero.html +++ b/_includes/hero.html @@ -3,7 +3,17 @@ {% endcomment %} {% if site.show_site_alert %} - {% render "hero-alert.html", alert: heroAlert['message'] %} + +
+
+
+

+ TTS is hiring, Join us! +

+
+
+
+ {% endif %}
diff --git a/_includes/layouts/base.html b/_includes/layouts/base.html index bb67b0a2..4de0b946 100644 --- a/_includes/layouts/base.html +++ b/_includes/layouts/base.html @@ -17,13 +17,7 @@ {{ content }} {% include "footer.html" %} - - {% comment %} Hide SVG Sprites {% endcomment %} -
- {% usa_icons_sprite %} - {% uswds_icons_sprite %} -
- + {% include "scripts.html" %} diff --git a/_includes/layouts/jointts/home.html b/_includes/layouts/jointts/home.html index 2f5b7750..d23ef978 100644 --- a/_includes/layouts/jointts/home.html +++ b/_includes/layouts/jointts/home.html @@ -65,7 +65,7 @@

Upcoming positions

{% endfor %}

Other GSA Opportunities

-

Check out careers at GSA and more Information Technology opportunities.

+

Check out careers at GSA and more Information Technology opportunities.

Application process

diff --git a/_includes/menu.html b/_includes/menu.html index 0eafce0d..dfafe4c2 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -61,7 +61,6 @@ {% endfor %} --> - {% comment %} This will redirect the results to /search template which will handle the js loading @@ -87,6 +86,7 @@ {% endif %} +{% comment %}

- + {% endcomment %} {% include "searchgov/form.html" searchgov: site.searchgov %}
diff --git a/_includes/scripts.html b/_includes/scripts.html index f5a3e103..130e8242 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -34,3 +34,31 @@ {% endif %} {% endif %} + + + diff --git a/_includes/search-gov.html b/_includes/search-gov.html index 49955b43..13e563d3 100644 --- a/_includes/search-gov.html +++ b/_includes/search-gov.html @@ -32,7 +32,7 @@ name="search" /> - \ No newline at end of file + diff --git a/_includes/sidenav.html b/_includes/sidenav.html index 310dfd89..ad588a4e 100644 --- a/_includes/sidenav.html +++ b/_includes/sidenav.html @@ -1,3 +1,4 @@ +