Merge pull request #288 from GSA/staging

Staging
GSA · Jan 21, 2025 · b194866 · b194866
2 parents 7550854 + 9534669
commit b194866
Show file tree

Hide file tree

Showing 23 changed files with 6,863 additions and 6,161 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,13 +3,13 @@ ruby '>= 3.1.3'
 source "https://rubygems.org"
 
 gem "jekyll", "~> 4.3.4"
-gem "execjs", "2.7.0" # https://github.com/rails/execjs/issues/99
-gem "mini_racer"
-gem "autoprefixer-rails"
-gem 'webrick', '~> 1.8'# not included in jekyll directly until 4.3.0 https://github.com/jekyll/jekyll/pull/8524
-gem 'jekyll-liquify', "0.0.2"
+gem "execjs", "2.10.0" # https://github.com/rails/execjs/issues/99
+gem "mini_racer", "0.16.0"
+gem "autoprefixer-rails", "10.4.19.0"
+gem 'webrick', '1.9.1'# not included in jekyll directly until 4.3.0 https://github.com/jekyll/jekyll/pull/8524
+gem 'jekyll-liquify', "0.0.3"
 # See https://github.com/envygeeks/jekyll-assets/issues/622
-gem "sprockets", "~> 3.7"
+gem "sprockets", "4.2.1"
 
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.15"
@@ -23,10 +23,9 @@ end
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0" if Gem.win_platform?
+gem "wdm", "~> 0.2.0" if Gem.win_platform?
 
 gem "html-proofer", "~> 3.15"
 gem "kramdown-parser-gfm"
-gem 'webrick', '~> 1.8'
 gem 'sass-embedded', '~> 1.80'
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -5,28 +5,31 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     colorator (1.1.0)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.7.0)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
+    execjs (2.10.0)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x64-mingw-ucrt)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
-    google-protobuf (4.29.1-arm64-darwin)
+    google-protobuf (4.29.3-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.29.1-x86_64-darwin)
+    google-protobuf (4.29.3-x64-mingw-ucrt)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.29.1-x86_64-linux)
+    google-protobuf (4.29.3-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.29.3-x86_64-linux)
       bigdecimal
       rake (>= 13)
     html-proofer (3.19.4)
@@ -58,7 +61,7 @@ GEM
       webrick (~> 1.7)
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-liquify (0.0.2)
+    jekyll-liquify (0.0.3)
       liquid (>= 2.5, < 5.0)
       redcarpet (~> 3.1)
     jekyll-paginate-v2 (3.0.0)
@@ -77,8 +80,6 @@ GEM
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    libv8-node (18.19.0.0-arm64-darwin)
-    libv8-node (18.19.0.0-x86_64-darwin)
     libv8-node (18.19.0.0-x86_64-linux)
     liquid (4.0.4)
     listen (3.9.0)
@@ -87,64 +88,70 @@ GEM
     mercenary (0.4.0)
     mini_racer (0.16.0)
       libv8-node (~> 18.19.0.0)
-    nokogiri (1.17.2-arm64-darwin)
+    nokogiri (1.18.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.17.2-x86_64-darwin)
+    nokogiri (1.18.1-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.17.2-x86_64-linux)
+    nokogiri (1.18.1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.1-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.26.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (2.2.10)
+    rack (3.1.8)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     redcarpet (3.6.0)
-    rexml (3.3.9)
+    rexml (3.4.0)
     rouge (4.5.1)
     safe_yaml (1.0.5)
     sass-embedded (1.83.0)
       google-protobuf (~> 4.28)
       rake (>= 13)
-    sprockets (3.7.5)
-      base64
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2025.1)
+      tzinfo (>= 1.0.0)
     unicode-display_width (2.6.0)
     webrick (1.9.1)
     yell (2.2.2)
 
 PLATFORMS
   arm64-darwin
+  x64-mingw-ucrt
   x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
-  autoprefixer-rails
-  execjs (= 2.7.0)
+  autoprefixer-rails (= 10.4.19.0)
+  execjs (= 2.10.0)
   html-proofer (~> 3.15)
   jekyll (~> 4.3.4)
   jekyll-feed (~> 0.15)
-  jekyll-liquify (= 0.0.2)
+  jekyll-liquify (= 0.0.3)
   jekyll-paginate-v2 (= 3.0.0)
   jekyll-redirect-from
   jekyll-seo-tag
   jekyll-sitemap
   kramdown-parser-gfm
-  mini_racer
+  mini_racer (= 0.16.0)
   sass-embedded (~> 1.80)
-  sprockets (~> 3.7)
+  sprockets (= 4.2.1)
   tzinfo-data
-  webrick (~> 1.8)
+  webrick (= 1.9.1)
 
 RUBY VERSION
    ruby 3.1.3p185

diff --git a/_config.yml b/_config.yml
@@ -113,6 +113,9 @@ primary_navigation:
         url: /programs-and-events/
       - name: Data Privacy Week
         link: false
+      - name: Data Privacy Week 2025
+        url: /data-privacy-week-2025
+        sub_menu_item: true
       - name: Data Privacy Week 2024
         url: /data-privacy-week-2024
         sub_menu_item: true

diff --git a/_data/priority_icons.yaml b/_data/priority_icons.yaml
@@ -1,4 +1,9 @@
-
+- name: What is Personally Identifiable Information (PII)?
+  logo: /assets/img/pii-photo-2.jpg
+  alt-text: Stylized desk with laptop and papers on the wall above it.
+  url: /what-is-pii/
+  filler: Learn what Personally Identifiable information (PII) is through understanding its definition and viewing examples that illustrate the many forms of PII.
+  time: 6 minutes 5 seconds
 - name: Roles in Federal Privacy
   logo: /assets/img/logos/Video_1.png
   alt-text: Text reading 'Privacy Considerations' above illustration of people working around a desk and the word 'PII' next two them with two information icons

diff --git a/_data/privacy_tools.yaml b/_data/privacy_tools.yaml
@@ -1,8 +1,8 @@
 
-- name: SORN Dashboard
+- name: Federal Register SORN Search Tool
   title: Conduct targeted searches of agency SORNs.
-  link: https://sorndashboard.fpc.gov/
-  logo: /assets/img/logos/sorn.svg
+  link: https://www.federalregister.gov/documents/search?conditions%5Bnotice_type%5D%5B%5D=sorn&conditions%5Btype%5D%5B%5D=NOTICE
+  logo: /assets/img/logos/Federal-Register-2.jpg
 - name: Fair Information Practice Principles (FIPPs)
   title: Learn about the FIPPs, which are the foundation of federal privacy laws and policies for Federal agencies.
   link: https://www.fpc.gov/resources/fipps/

diff --git a/_pages/data-privacy-day-2024.html b/_pages/data-privacy-day-2024.html
@@ -23,15 +23,15 @@ <h2 class="margin-top-0 text-accent-cool-light">January 21-27</h2>
                     <img src="{{site.baseurl}}/assets/img/DPW.png" alt="Data Privacy Week" />
                     <h2 class="text-primary-darker">Data Privacy Week Events</h2>
                     <a href="{{site.baseurl}}/data-privacy-week-2024/events" class="usa-button usa-button--hover border-0 width-full">For Federal Personnel</a>
-                    <a href="https://staysafeonline.org/programs/data-privacy-week/talking-data/" class="usa-button usa-button--hover border-0 width-full margin-top-1">For the Public</a>
+                    <a href="https://www.staysafeonline.org/programs/data-privacy-week/talking-data/" class="usa-button usa-button--hover border-0 width-full margin-top-1">For the Public</a>
                 </div>
             </div>
             <div class="desktop:grid-col-6 desktop:padding-left-6">
                 <h2 class="text-primary-darker margin-top-neg-1">Take Control of Your Data</h2>
                 <p>The Federal Privacy Council is proud to be a champion for Data Privacy Week 2024, a global effort to raise awareness about the importance of respecting privacy, safeguarding data, and enabling trust.  The National Cybersecurity Alliance has announced that this year’s Data Privacy Week theme is <b>Take Control of Your Data</b>. On this page you will find resources and events for Federal employees and members of the public.</p>
                 <h2 class="text-primary-darker">About Data Privacy Week</h2>
                 <p>Data Privacy Week commemorates the January 28, 1981 signing of Convention 108, the first legally binding international treaty dealing with privacy and data protection. Since 2009, resolutions passed by Congress have supported the designation of January 28th as National Data Privacy Day in the United States. Since 2022, the Data Privacy Day campaign has been expanded to Data Privacy Week. </p>
-                <a href="https://staysafeonline.org/programs/data-privacy-week/" class="usa-button usa-button--hover border-0" aria-label="Learn more about Data Privacy Week">Learn More</a>
+                <a href="https://www.staysafeonline.org/programs/data-privacy-week/" class="usa-button usa-button--hover border-0" aria-label="Learn more about Data Privacy Week">Learn More</a>
             </div>
         </div>
     </div>
@@ -42,7 +42,7 @@ <h2 class="text-primary-darker">About Data Privacy Week</h2>
         <div class="grid-row grid-container">
             <div class="desktop:grid-col-12">
                 <h2 class="text-primary-darker margin-top-neg-1">Federal Data Privacy Week Champions</h2>
-                <p>The Federal Privacy Council is proud to recognize those agencies that opted into participating in the National Cybersecurity Alliance's <a href="https://staysafeonline.org/programs/2023-data-privacy-week-champions/">Data Privacy Week Champions program</a>.</p>
+                <p>The Federal Privacy Council is proud to recognize those agencies that opted into participating in the National Cybersecurity Alliance's <a href="https://www.staysafeonline.org/programs/2023-data-privacy-week-champions/">Data Privacy Week Champions program</a>.</p>
                 <div class="usa-graphic-list__row grid-row grid-gap">
                     <div class="desktop:grid-col-2 tablet:grid-col-6 container members-list padding-top-2  card__members font-size text-center">
                         <img src="{{site.baseurl}}/assets/img/doe-logo-color.png" alt="Department of Energy" class="height-8" /><br />
@@ -161,16 +161,16 @@ <h2 class="text-primary-darker margin-top-neg-1">Take Action to Take Control of
             <div class="usa-graphic-list__row grid-row grid-gap desktp:grid-col-12">
                 <div class="desktop:grid-col-6">
                     <ul class="margin-top-0">
-                        <li><a href="https://staysafeonline.org/programs/data-privacy-week/individuals/">Take Control of Your Data</a></li>
+                        <li><a href="https://www.staysafeonline.org/programs/data-privacy-week/individuals/">Take Control of Your Data</a></li>
 
-                        <li class="margin-top-105"><a href="https://staysafeonline.org/resources/manage-your-privacy-settings/">Manage Your Online Privacy Settings</a></li>
+                        <li class="margin-top-105"><a href="https://www.staysafeonline.org/resources/manage-your-privacy-settings/">Manage Your Online Privacy Settings</a></li>
                     </ul>
                 </div>
                 <div class="desktop:grid-col-6 spacing">
                     <ul class="desktop:margin-top-0">
                         <li class="li-top"><a href="https://www.youtube.com/watch?v=x73WuhVBNak">Top 3 Data Privacy Tips for Parents and Children (video)</a></li>
 
-                        <li class="margin-top-105"><a href="https://staysafeonline.org/resources/what-to-do-when-your-data-is-breached/">What To Do When Your Data Is Breached</a></li>
+                        <li class="margin-top-105"><a href="https://www.staysafeonline.org/resources/what-to-do-when-your-data-is-breached/">What To Do When Your Data Is Breached</a></li>
                     </ul>
                 </div>
             </div>
@@ -185,21 +185,19 @@ <h2 class="text-primary-darker margin-top-neg-1">Take Action to Take Control of
                 <h2 class="text-primary-darker margin-top-neg-1">Resources</h2>
                 <h3 class="text-primary-darker">Learn About Privacy: FPC's Educational Videos</h3>
                 <p>Executive Branch agencies necessarily collect, maintain, use, disclose, and dispose of large amounts of personally identifiable information (PII) to carry out missions mandated by Federal statute. By watching these short videos, you can learn more about how the Executive Branch of the Federal Government protects your privacy.</p>
-                <div class="grid-row grid-gap space-between">
+                <div class="grid-row grid-gap">
                     {% for icon in site.data.priority_icons %}
-                    <div class="tablet:grid-col-3 learn-about font-size text-center margin-y-2 bg-white padding-2 margin-05 shadow-5 members-hover radius-lg ">
+                    <div class="desktop:grid-col-2 learn-about margin-y-2 bg-white padding-2 margin-05 shadow-5 members-hover radius-lg">
                         {% if icon.url %}
-                        <a href="{{ site.baseurl }}{{ icon.url }}" class="text-no-underline text-base-darkest" style="display: inline-block;">
-                            {% else %}
-                            <a href="{{ icon.link }}" class="text-no-underline" style="display: inline-block;">
-                                {% endif %}
-                                <div>
-                                    <img class="privacy-image" alt="{{ icon.alt-text }}" src="{{site.baseurl}}{{ icon.logo }}" />
-                                </div>
-                                <p class="font-sans-sm text-left text-no-underline">{{ icon.time }}</p>
-                                <p class="font-heading-md text-left text-no-underline text-bold">{{ icon.name }}</p>
-                                <p class="font-sans-sm text-left text-no-underline">{{ icon.filler }}</p>
-                            </a>
+                        <a href="{{ site.baseurl }}{{ icon.url }}" class="text-no-underline text-base-darkest" aria-label="Visit {{ icon.name }}">
+                        {% else %}
+                        <a href="{{ icon.link }}" class="text-no-underline text-base-darkest" aria-label="Visit {{ icon.name }}">
+                        {% endif %}
+                            <img style="width:300px;height:210px;object-fit:cover; border: 1px solid #555;" alt="{{ icon.alt-text }}" src="{{ site.baseurl }}{{ icon.logo }}" />
+                            <p class="font-heading-md text-left text-no-underline text-bold">{{ icon.name }}</p>
+                            <p class="font-sans-sm text-left text-no-underline">{{ icon.time }}</p>
+                            <p class="font-sans-sm text-left text-no-underline">{{ icon.filler }}</p>
+                        </a>
                     </div>
                     {% endfor %}
                 </div>