osg-htc · CannonLock · May 2, 2024 · Apr 12, 2024 · Apr 12, 2024 · Apr 12, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "_spotlights"]
 	path = _spotlights
 	url = https://github.com/CHTC/Articles.git
+[submodule "staff-list"]
+	path = staff-list
+	url = https://github.com/CHTC/staff-list.git
diff --git a/_about/team.html b/_about/team.html
@@ -3,11 +3,14 @@
 title: The OSG Team
 ---
 
-{% assign people = "" |  split: "" %}
-{% for person in site.data.people %}
-    {% assign people = people | push: person[1] %}
+{% assign team = "" |  split: "" %}
+{% assign base_image_path = "/staff-list/" %}
+{% for member in site.data.people %}
+    {% if member[1].organizations contains site.key %}
+        {% assign team = team | push: member[1] %}
+    {% endif %}
 {% endfor %}
-{% assign people = people | sort: "name" %}
+{% assign team = team | sort: "name" %}
 
 
 <div class="container-xxl">
@@ -17,48 +20,45 @@ <h2 class="ps-3">Executive Team</h2>
         <a href="https://osg-htc.org/management/#executive-team">Executive Team page</a>.
     </p>
     <div class="row g-0 rounded bg-light pb-3 pe-3">
-        {% for member in site.data.orgs.exec-team.personnel %}
-        {% for person in people %}
-        {% if person.shortname == member %}
+        {% assign promoted_teams = team | where: "osg.promoted", true | sort: "osg.weight" %}
+        {% for member in promoted_teams %}
         <div class="col-12 col-sm-6 col-md-4 col-lg-3 col-xl-3 pt-3 ps-3 d-flex">
             <div class="card shadow border-0 flex-grow-1">
-                <img class="card-img-top" src="/assets/{{person.image | relative_url}}" alt="Card image cap">
+                <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 person.website %}
-                        <b><a href="{{person.website}}">{{person.name}}</a></b><br>
+                        {% if member.website %}
+                        <b><a href="{{member.website}}">{{member.name}}</a></b><br>
                         {% else %}
-                        <b>{{person.name}}</b><br>
+                        <b>{{member.name}}</b><br>
                         {% endif %}
-                        <small>{{person.institution}}</small><br><br>
+                        <small>{{member.institution}}</small><br><br>
                     </div>
-                    <div class="card-text mt-auto"><i>{{person.title}}</i><br></div>
+                    <div class="card-text mt-auto"><i>{{member.osg.title | default:member.title}}</i><br></div>
                 </div>
             </div>
         </div>
-        {% endif %}
-        {% endfor %}
         {% endfor %}
     </div>
     <br>
 </div>
 <div class="container-xxl">
     <h2 class="ps-3">Full Team</h2>
     <div class="row g-0 bg-light rounded bg-light pb-2 pe-2">
-        {% for person in people %}
+        {% 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="/assets/{{person.image}}" alt="Card image cap">
+                <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 person.website %}
-                        <b><a href="{{person.website}}">{{person.name}}</a></b><br>
+                        {% if member.website %}
+                        <b><a href="{{member.website}}">{{member.name}}</a></b><br>
                         {% else %}
-                        <b>{{person.name}}</b><br>
+                        <b>{{member.name}}</b><br>
                         {% endif %}
-                        <small>{{person.institution}}</small><br><br>
+                        <small>{{member.institution}}</small><br><br>
                     </div>
-                    <div class="card-text mt-auto"><i>{{person.title}}</i><br></div>
+                    <div class="card-text mt-auto"><i>{{member.osg.title | default: member.title}}</i><br></div>
                 </div>
             </div>
         </div>

diff --git a/_data/people b/_data/people
@@ -0,0 +1 @@
+../staff-list
diff --git a/_data/people/Adrian-Crenshaw.yml b/_data/people/Adrian-Crenshaw.yml
diff --git a/_data/people/Cannon-Lock.yml b/_data/people/Cannon-Lock.yml
diff --git a/_data/people/Christina-Koch.yml b/_data/people/Christina-Koch.yml
diff --git a/_data/people/Colby-Walsworth.yml b/_data/people/Colby-Walsworth.yml
diff --git a/_data/people/HedgeMage.yml b/_data/people/HedgeMage.yml
diff --git a/_data/people/John-Thiltges.yml b/_data/people/John-Thiltges.yml
diff --git a/_data/people/Josh-Drake.yml b/_data/people/Josh-Drake.yml
diff --git a/_data/people/Mats-Rynge.yml b/_data/people/Mats-Rynge.yml
diff --git a/_data/people/Micheal-Collins.yml b/_data/people/Micheal-Collins.yml
diff --git a/_data/people/Miron-Livny.yml b/_data/people/Miron-Livny.yml
diff --git a/_data/people/Showmic-Islam.yml b/_data/people/Showmic-Islam.yml
diff --git a/_data/people/Theng-Vang.yml b/_data/people/Theng-Vang.yml
diff --git a/_data/people/Tim-Cartwright.yml b/_data/people/Tim-Cartwright.yml
diff --git a/_data/people/aaronmoate.yml b/_data/people/aaronmoate.yml
diff --git a/_data/people/alperen_bakirci.yml b/_data/people/alperen_bakirci.yml
diff --git a/_data/people/andrew_owen.yaml b/_data/people/andrew_owen.yaml
diff --git a/_data/people/ashton_graves.yaml b/_data/people/ashton_graves.yaml
diff --git a/_data/people/bbockelm.yml b/_data/people/bbockelm.yml
diff --git a/_data/people/brianhlin.yml b/_data/people/brianhlin.yml
diff --git a/_data/people/bryna-goeking.yml b/_data/people/bryna-goeking.yml
diff --git a/_data/people/chris_lauderbaugh.yaml b/_data/people/chris_lauderbaugh.yaml
diff --git a/_data/people/djw8605.yml b/_data/people/djw8605.yml
diff --git a/_data/people/fkw888.yml b/_data/people/fkw888.yml
diff --git a/_data/people/irene-landrum.yml b/_data/people/irene-landrum.yml
diff --git a/_data/people/janet-stathas.yml b/_data/people/janet-stathas.yml
diff --git a/_data/people/jnpeterson.yaml b/_data/people/jnpeterson.yaml
diff --git a/_data/people/joe-b.yml b/_data/people/joe-b.yml
diff --git a/_data/people/joe_reuss.yaml b/_data/people/joe_reuss.yaml
diff --git a/_data/people/josh_edwards.yaml b/_data/people/josh_edwards.yaml
diff --git a/_data/people/justin_hiemstra.yaml b/_data/people/justin_hiemstra.yaml
diff --git a/_data/people/lili_bicoy.yaml b/_data/people/lili_bicoy.yaml
diff --git a/_data/people/matt_westphall.yaml b/_data/people/matt_westphall.yaml
diff --git a/_data/people/matyasselmeci.yml b/_data/people/matyasselmeci.yml
diff --git a/_data/people/rachel-lombardi.yml b/_data/people/rachel-lombardi.yml
diff --git a/_data/people/robrwg.yml b/_data/people/robrwg.yml
diff --git a/_data/people/ryan_jacobs.yaml b/_data/people/ryan_jacobs.yaml
diff --git a/_data/people/smckee.yml b/_data/people/smckee.yml