From b1b4721f7c15fe6ce017c106de8f13c0a491f13b Mon Sep 17 00:00:00 2001
From: Cannon Lock <clock@wisc.edu>
Date: Tue, 6 Aug 2024 13:17:53 -0500
Subject: [PATCH 1/2] Add Privacy Policy and Integration

---
 _data/footer.yaml          |  2 ++
 _includes/layout/head.html | 24 +++++++++++++++---------
 privacy-policy.md          | 28 ++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 privacy-policy.md

diff --git a/_data/footer.yaml b/_data/footer.yaml
index ef24f4056..b0e652b95 100644
--- a/_data/footer.yaml
+++ b/_data/footer.yaml
@@ -9,6 +9,8 @@
       url: /code-of-conduct
     - name: Acknowledging OSG
       url: /acknowledging
+    - name: Privacy Policy
+      url: /privacy-policy
 - name: Services
   id: services
   children:
diff --git a/_includes/layout/head.html b/_includes/layout/head.html
index 7db2e09e0..2e7f4fad5 100644
--- a/_includes/layout/head.html
+++ b/_includes/layout/head.html
@@ -6,17 +6,23 @@
 
 {% if jekyll.environment == "production" %}
 
-{% if site.google_analytics and site.production %}
+<!-- Matomo -->
 <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '{{ site.google_analytics }}', 'auto');
-    ga('send', 'pageview');
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["setDoNotTrack", true]);
+  _paq.push(["disableCookies"]);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//analytics.osg-htc.org/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '1']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
-{% endif %}
+<!-- End Matomo Code -->
 
 <meta name="google-site-verification" content="R_4MuU3rtZf36dK9hio23ADQTe3EubRM9kO41cVXldQ" />
 
diff --git a/privacy-policy.md b/privacy-policy.md
new file mode 100644
index 000000000..8cb5d1955
--- /dev/null
+++ b/privacy-policy.md
@@ -0,0 +1,28 @@
+---
+layout: text-optimized-width
+title: Privacy Policy
+---
+
+# {{ page.title }}
+
+The OSG above all else prioritizes user privacy and as such only collects anonymous data. The sole purpose of this information is to help us understand how our websites can be improved to the benefit of Open Science.
+
+## Opt-Out
+
+<div id="matomo-opt-out"></div>
+<script src="https://analytics.osg-htc.org/index.php?module=CoreAdminHome&action=optOutJS&divId=matomo-opt-out&language=auto&backgroundColor=FFFFFF&fontColor=000000&fontSize=12px&fontFamily=Helvetica&showIntro=1"></script>
+
+
+
+## Introduction
+
+This Policy describes the personal information (or personal data) we collect from you, how we use that information and our legal basis for doing so. It also covers whether and how that information may be shared and your rights and choices regarding the information you provide to us.
+      
+This privacy policy applies to the information that we obtain from the OSG website ( https://osg-htc.org ).
+
+
+### What personal data we collect, when we receive it and how we use it
+
+#### Usage data - when you visit our site, we will store
+
+The website domain which you visited us from, the parts of our site you visit, the date and duration of your visit, your IP address, which we store with 2 bytes masked ( 192.168.XXX.XXX ), information from the device (device type, operating system, screen resolution, language, country you are located in, and web browser type) you used during your visit, and more. We process this usage data using our own OSG hosted instance of Matomo Analytics to ensure your privacy, and we process the information for statistical purposes, to improve our site.

From c7b6a9efff08d842fe113d01ef2bec8d8789dc85 Mon Sep 17 00:00:00 2001
From: Cannon Lock <clock@wisc.edu>
Date: Thu, 8 Aug 2024 08:40:56 -0500
Subject: [PATCH 2/2] Update Team Page

---
 _about/team.html         | 56 ++++++++++++++++++++++++++++++----------
 assets/css/style-v3.scss |  2 +-
 2 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/_about/team.html b/_about/team.html
index 7f7ef37af..573c2bb07 100644
--- a/_about/team.html
+++ b/_about/team.html
@@ -46,22 +46,50 @@ <h2 class="ps-3">Executive Team</h2>
     <h2 class="ps-3">Full Team</h2>
     <div class="row g-0 bg-light rounded bg-light pb-2 pe-2">
         {% for member in team %}
-        <div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xxl-2 pt-2 ps-2 d-flex">
-            <div class="card border-0 shadow flex-grow-1">
-                <img class="card-img-top" src="{{ base_image_path | append: member.image | relative_url }}" alt="Card image cap">
-                <div class="card-body d-flex flex-column">
-                    <div class="card-text">
-                        {% if member.website %}
-                        <b><a href="{{member.website}}">{{member.name}}</a></b><br>
-                        {% else %}
-                        <b>{{member.name}}</b><br>
-                        {% endif %}
-                        <small>{{member.institution}}</small><br><br>
+            {% if member.status != "Past" %}
+                <div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xxl-2 pt-2 ps-2 d-flex">
+                    <div class="card border-0 shadow flex-grow-1">
+                        <img class="card-img-top" src="{{ base_image_path | append: member.image | relative_url }}" alt="Card image cap">
+                        <div class="card-body d-flex flex-column">
+                            <div class="card-text">
+                                {% if member.website %}
+                                <b><a href="{{member.website}}">{{member.name}}</a></b><br>
+                                {% else %}
+                                <b>{{member.name}}</b><br>
+                                {% endif %}
+                                <small>{{member.institution}}</small><br><br>
+                            </div>
+                            <div class="card-text mt-auto"><i>{{member.osg.title | default: member.title}}</i><br></div>
+                        </div>
                     </div>
-                    <div class="card-text mt-auto"><i>{{member.osg.title | default: member.title}}</i><br></div>
                 </div>
-            </div>
-        </div>
+            {% endif %}
+        {% endfor %}
+        <br>
+    </div>
+</div>
+<div class="container-xxl pt-3">
+    <h2 class="ps-3">Past Members</h2>
+    <div class="row g-0 bg-light rounded bg-light pb-2 pe-2">
+        {% for member in team %}
+            {% if member.status == "Past" %}
+                <div class="col-6 col-sm-6 col-md-4 col-lg-3 col-xxl-2 pt-2 ps-2 d-flex">
+                    <div class="card border-0 shadow flex-grow-1">
+                        <img class="card-img-top" src="{{ base_image_path | append: member.image | relative_url }}" alt="Card image cap">
+                        <div class="card-body d-flex flex-column">
+                            <div class="card-text">
+                                {% if member.website %}
+                                <b><a href="{{member.website}}">{{member.name}}</a></b><br>
+                                {% else %}
+                                <b>{{member.name}}</b><br>
+                                {% endif %}
+                                <small>{{member.institution}}</small><br><br>
+                            </div>
+                            <div class="card-text mt-auto"><i>{{member.osg.title | default: member.title}}</i><br></div>
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
         {% endfor %}
         <br>
     </div>
diff --git a/assets/css/style-v3.scss b/assets/css/style-v3.scss
index 4caa78ab1..ec3823dfb 100644
--- a/assets/css/style-v3.scss
+++ b/assets/css/style-v3.scss
@@ -79,7 +79,7 @@ th, td {
 
 // Card image caps
 .card-img-top {
-  height: 300px;
+  aspect-ratio: 1;
   object-fit: contain;
 }