diff --git a/.gitmodules b/.gitmodules index 73092835f..7af89e818 100644 --- 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 index d94c9e8f1..7f7ef37af 100644 --- 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" %}
@@ -17,27 +20,24 @@

Executive Team

Executive Team page.

- {% 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 %}
- Card image cap + Card image cap
- {% if person.website %} - {{person.name}}
+ {% if member.website %} + {{member.name}}
{% else %} - {{person.name}}
+ {{member.name}}
{% endif %} - {{person.institution}}

+ {{member.institution}}

-
{{person.title}}
+
{{member.osg.title | default:member.title}}
- {% endif %} - {% endfor %} {% endfor %}

@@ -45,20 +45,20 @@

Executive Team

Full Team

- {% for person in people %} + {% for member in team %}
- Card image cap + Card image cap
- {% if person.website %} - {{person.name}}
+ {% if member.website %} + {{member.name}}
{% else %} - {{person.name}}
+ {{member.name}}
{% endif %} - {{person.institution}}

+ {{member.institution}}

-
{{person.title}}
+
{{member.osg.title | default: member.title}}
diff --git a/_data/people b/_data/people new file mode 120000 index 000000000..aa38f3278 --- /dev/null +++ b/_data/people @@ -0,0 +1 @@ +../staff-list \ No newline at end of file diff --git a/_data/people/Adrian-Crenshaw.yml b/_data/people/Adrian-Crenshaw.yml deleted file mode 100644 index bf16a5a78..000000000 --- a/_data/people/Adrian-Crenshaw.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Adrian Crenshaw -shortname: acrensha -title: Security Analyst -active: green -institution: Indiana University -website: https://cacr.iu.edu/about/people/Adrian-Crenshaw.html -image: images/team/Adrian-Crenshaw.jpg diff --git a/_data/people/Cannon-Lock.yml b/_data/people/Cannon-Lock.yml deleted file mode 100644 index 7c78bdce5..000000000 --- a/_data/people/Cannon-Lock.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Cannon Lock -shortname: clock -title: Web Developer -active: green -institution: Morgridge Institute for Research -website: -image: images/team/Cannon-Lock.jpg -presentations: \ No newline at end of file diff --git a/_data/people/Christina-Koch.yml b/_data/people/Christina-Koch.yml deleted file mode 100644 index 846df1d73..000000000 --- a/_data/people/Christina-Koch.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Christina Koch -shortname: ckoch -title: OSG Research Facilitation Lead -active: green -institution: University of Wisconsin - Madison -website: https://wid.wisc.edu/people/christina-koch/ -image: images/team/Christina-Koch.jpg -presentations: - - diff --git a/_data/people/Colby-Walsworth.yml b/_data/people/Colby-Walsworth.yml deleted file mode 100644 index a837f1d6d..000000000 --- a/_data/people/Colby-Walsworth.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: "Colby Walsworth" -shortname: colby -active: green -image: "images/team/colby-walsworth.jpg" -title: "Software Integration Developer" -institution: "University of California - San Diego" diff --git a/_data/people/HedgeMage.yml b/_data/people/HedgeMage.yml deleted file mode 100644 index f87f3bb27..000000000 --- a/_data/people/HedgeMage.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Susan Sons -shortname: HedgeMage -title: Security Analyst -active: green -institution: Indiana University -website: https://cacr.iu.edu/about/people/susan-sons.html -image: images/team/Susan-Sons.jpg diff --git a/_data/people/John-Thiltges.yml b/_data/people/John-Thiltges.yml deleted file mode 100644 index 275d2d7c9..000000000 --- a/_data/people/John-Thiltges.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: John Thiltges -shortname: jthiltges -title: Systems Administrator -active: green -institution: University of Nebraska - Lincoln -website: -image: images/team/John-Thiltges.jpg -presentations: diff --git a/_data/people/Josh-Drake.yml b/_data/people/Josh-Drake.yml deleted file mode 100644 index 5dbe4ab68..000000000 --- a/_data/people/Josh-Drake.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Josh Drake -shortname: jcdrake -title: OSG Information Security Officer -active: green -institution: Indiana University -website: https://cacr.iu.edu/about/people/Josh_Drake.html -image: images/team/Josh-Drake.jpg diff --git a/_data/people/Mats-Rynge.yml b/_data/people/Mats-Rynge.yml deleted file mode 100644 index 730e77f54..000000000 --- a/_data/people/Mats-Rynge.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Mats Rynge -shortname: rynge -title: Systems Integrator -active: green -institution: University of Southern California - Information Sciences Institute -website: -image: images/team/Mats-Rynge.jpg -presentations: - - diff --git a/_data/people/Micheal-Collins.yml b/_data/people/Micheal-Collins.yml deleted file mode 100644 index d281728e2..000000000 --- a/_data/people/Micheal-Collins.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Michael Collins -shortname: mcollins -title: Systems Administrator -active: green -institution: Morgridge Institute for Research -website: -image: images/team/MichaelCollins.png -presentations: \ No newline at end of file diff --git a/_data/people/Miron-Livny.yml b/_data/people/Miron-Livny.yml deleted file mode 100644 index 7952ff9cf..000000000 --- a/_data/people/Miron-Livny.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Miron Livny -shortname: miron -title: OSG Technical Director and PI -active: green -institution: University of Wisconsin–Madison -website: https://wid.wisc.edu/people/miron-livny/ -image: images/team/Miron-Livny.jpg diff --git a/_data/people/Showmic-Islam.yml b/_data/people/Showmic-Islam.yml deleted file mode 100644 index deaab36bc..000000000 --- a/_data/people/Showmic-Islam.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: "Showmic Islam" -shortname: showmic -active: green -image: "images/team/showmic-islam.jpg" -title: "Research Facilitator" -#website: "" -institution: "University of Nebraska-Lincoln" -weight: 5 diff --git a/_data/people/Theng-Vang.yml b/_data/people/Theng-Vang.yml deleted file mode 100644 index e2ebba7cd..000000000 --- a/_data/people/Theng-Vang.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Theng Vang -shortname: theng -title: Systems Administrator -active: green -institution: Center For High Throughput Computing -website: -image: images/team/ThengVang.jpg -presentations: diff --git a/_data/people/Tim-Cartwright.yml b/_data/people/Tim-Cartwright.yml deleted file mode 100644 index d66cd3825..000000000 --- a/_data/people/Tim-Cartwright.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Tim Cartwright -shortname: osg-cat -title: CC* Coordinator -active: green -institution: University of Wisconsin–Madison -website: http://pages.cs.wisc.edu/~cat/ -image: images/team/Tim-Cartwright.jpg diff --git a/_data/people/aaronmoate.yml b/_data/people/aaronmoate.yml deleted file mode 100644 index cc401b3f8..000000000 --- a/_data/people/aaronmoate.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Aaron Moate -shortname: aaronmoate -title: Systems Administrator -active: green -institution: University of Wisconsin–Madison -website: -image: images/team/Aaron-Moate.png diff --git a/_data/people/alperen_bakirci.yml b/_data/people/alperen_bakirci.yml deleted file mode 100644 index 430c4c657..000000000 --- a/_data/people/alperen_bakirci.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Alperen Bakirci -shortname: alp -title: Student Web Developer -active: green -institution: Morgridge Institute for Research -website: -image: images/team/alperen-bakirci.jpg \ No newline at end of file diff --git a/_data/people/andrew_owen.yaml b/_data/people/andrew_owen.yaml deleted file mode 100644 index d23ece46b..000000000 --- a/_data/people/andrew_owen.yaml +++ /dev/null @@ -1,7 +0,0 @@ -image: images/team/andrew_owen.jpg -institution: University of Wisconsin-Madison -title: Research Computing Facilitator -is_facilitator: 1 -name: Andrew Owen -status: Staff -website: null diff --git a/_data/people/ashton_graves.yaml b/_data/people/ashton_graves.yaml deleted file mode 100644 index 85146ac62..000000000 --- a/_data/people/ashton_graves.yaml +++ /dev/null @@ -1,6 +0,0 @@ -image: images/team/ashton_graves.jpeg -institution: University of Lincoln-Nebraska -title: DevOps Engineer -name: Ashton Graves -status: Staff -website: null diff --git a/_data/people/bbockelm.yml b/_data/people/bbockelm.yml deleted file mode 100644 index e201fcd09..000000000 --- a/_data/people/bbockelm.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Brian Bockelman -shortname: bbockelm -title: OSG Technology Lead -active: green -institution: Morgridge Institute for Research -website: http://opensciencegrid.org -image: images/team/Brian-Bockelman.jpg -presentations: - - diff --git a/_data/people/brianhlin.yml b/_data/people/brianhlin.yml deleted file mode 100644 index 37bb53908..000000000 --- a/_data/people/brianhlin.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Brian Lin -shortname: brianhlin -title: Software Area Coordinator -active: green -institution: University of Wisconsin–Madison -website: -image: images/team/Brian-Lin.jpg diff --git a/_data/people/bryna-goeking.yml b/_data/people/bryna-goeking.yml deleted file mode 100644 index 63181186a..000000000 --- a/_data/people/bryna-goeking.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: Bryna Goeking -title: Student Writer -active: green -institution: Morgridge Institute for Research -image: images/team/bryna-goeking.jpg diff --git a/_data/people/chris_lauderbaugh.yaml b/_data/people/chris_lauderbaugh.yaml deleted file mode 100644 index f7edbf2d5..000000000 --- a/_data/people/chris_lauderbaugh.yaml +++ /dev/null @@ -1,6 +0,0 @@ -image: images/team/chris_lauderbaugh.jpg -institution: Indiana University -title: Security Analyst -name: Chris Lauderbaugh -status: Staff -website: null diff --git a/_data/people/djw8605.yml b/_data/people/djw8605.yml deleted file mode 100644 index ce730f94e..000000000 --- a/_data/people/djw8605.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Derek Weitzel -shortname: djw8605 -title: Software Integration Developer -active: green -institution: University of Nebraska - Lincoln -website: https://github.com/djw8605 -image: images/team/Derek-Weitzel.jpg diff --git a/_data/people/fkw888.yml b/_data/people/fkw888.yml deleted file mode 100644 index 0b3d0c39a..000000000 --- a/_data/people/fkw888.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Frank Wuerthwein -shortname: fkw888 -title: OSG Executive Director -active: green -institution: University of California, San Diego -website: -image: images/team/Frank-Wuerthwein.jpg - diff --git a/_data/people/irene-landrum.yml b/_data/people/irene-landrum.yml deleted file mode 100644 index 7c07be2d1..000000000 --- a/_data/people/irene-landrum.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Irene Landrum -shortname: ilandrum -title: Project Manager -active: green -institution: Morgridge Institute for Research -website: -image: images/team/irene-landrum.png diff --git a/_data/people/janet-stathas.yml b/_data/people/janet-stathas.yml deleted file mode 100644 index 53fd53acd..000000000 --- a/_data/people/janet-stathas.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Janet Stathas -shortname: jstathas -title: Project Manager -active: green -institution: Morgridge Institute for Research -website: -image: images/team/janetlstathas.jpg - diff --git a/_data/people/jnpeterson.yaml b/_data/people/jnpeterson.yaml deleted file mode 100644 index fd7c9dc9c..000000000 --- a/_data/people/jnpeterson.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: Jeffrey Peterson -shortname: jnpeterson -title: System Administrator -active: green -institution: Morgridge Institute for Research -website: http://opensciencegrid.org -image: images/team/jeff-peterson.jpg -presentations: diff --git a/_data/people/joe-b.yml b/_data/people/joe-b.yml deleted file mode 100644 index f7dbb3b4d..000000000 --- a/_data/people/joe-b.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: Joe Bartkowiak -shortname: jbartkowiak -title: Systems Administrator -active: green -institution: Universitty of Wisconsin - Madison -image: images/team/joe-b.jpg \ No newline at end of file diff --git a/_data/people/joe_reuss.yaml b/_data/people/joe_reuss.yaml deleted file mode 100644 index a00c884f0..000000000 --- a/_data/people/joe_reuss.yaml +++ /dev/null @@ -1,6 +0,0 @@ -image: images/team/joe_reuss.jpeg -institution: University of Wisconsin-Madison -title: Software Engineer -name: Joe Reuss -status: Staff -website: null diff --git a/_data/people/josh_edwards.yaml b/_data/people/josh_edwards.yaml deleted file mode 100644 index 109c06aaa..000000000 --- a/_data/people/josh_edwards.yaml +++ /dev/null @@ -1,6 +0,0 @@ -image: images/team/josh_edwards.jpeg -institution: Indiana University -title: Security Analyst -name: Josh Edwards -status: Staff -website: null diff --git a/_data/people/justin_hiemstra.yaml b/_data/people/justin_hiemstra.yaml deleted file mode 100644 index c9de77b2a..000000000 --- a/_data/people/justin_hiemstra.yaml +++ /dev/null @@ -1,6 +0,0 @@ -image: images/team/justin_hiemstra.jpg -institution: Morgridge Institute -title: Research Software Engineer -name: Justin Hiemstra -status: Staff -website: null diff --git a/_data/people/lili_bicoy.yaml b/_data/people/lili_bicoy.yaml deleted file mode 100644 index 76d075a79..000000000 --- a/_data/people/lili_bicoy.yaml +++ /dev/null @@ -1,7 +0,0 @@ -name: Lili Bicoy -shortname: -title: Student Science Writer -active: green -institution: Morgridge Institute for Research -website: -image: images/team/lili_bicoy.jpg \ No newline at end of file diff --git a/_data/people/matt_westphall.yaml b/_data/people/matt_westphall.yaml deleted file mode 100644 index 41e0f6d00..000000000 --- a/_data/people/matt_westphall.yaml +++ /dev/null @@ -1,6 +0,0 @@ -image: images/team/matt_westphall.jpeg -institution: University of Wisconsin-Madison -title: Research Cyberinfrastructure Specialist -name: Matt Westphall -status: Staff -website: null diff --git a/_data/people/matyasselmeci.yml b/_data/people/matyasselmeci.yml deleted file mode 100644 index 3ef80ed11..000000000 --- a/_data/people/matyasselmeci.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Mátyás (Mat) Selmeci -shortname: matyasselmeci -title: Software Integration Developer -active: green -institution: University of Wisconsin–Madison -website: -image: images/team/Mat-Selmeci.png diff --git a/_data/people/rachel-lombardi.yml b/_data/people/rachel-lombardi.yml deleted file mode 100644 index e2315e06c..000000000 --- a/_data/people/rachel-lombardi.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: "Rachel Lombardi" -image: "images/team/rachel-lombardi.jpg" -title: "Research Computing Facilitator" -institution: "University of Wisconsin–Madison" -#website: "" -linkedinurl: "" -weight: 5 diff --git a/_data/people/robrwg.yml b/_data/people/robrwg.yml deleted file mode 100644 index cb06ec66b..000000000 --- a/_data/people/robrwg.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Rob Gardner -shortname: robrwg -title: OSG Collaboration Support Lead and OSG Council Chair -active: green -institution: University of Chicago -website: https://efi.uchicago.edu/people/profile/rob-gardner/ -image: images/team/Rob-Gardner.png diff --git a/_data/people/ryan_jacobs.yaml b/_data/people/ryan_jacobs.yaml deleted file mode 100644 index f5c9c69c2..000000000 --- a/_data/people/ryan_jacobs.yaml +++ /dev/null @@ -1,6 +0,0 @@ -image: images/team/ryan_jacob.jpg -institution: University of Wisconsin-Madison -title: System Administrator Intern -name: Ryan Jacob -status: Student -website: null diff --git a/_data/people/smckee.yml b/_data/people/smckee.yml deleted file mode 100644 index 7a4dc1350..000000000 --- a/_data/people/smckee.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Shawn McKee -shortname: smckee -title: Network Area Coordinator -active: green -institution: University of Michigan-Ann Arbor -website: https://lsa.umich.edu/physics/people/research-scientists/smckee.html -image: images/team/Shawn-McKee.jpg diff --git a/_data/people/timtheisen.yml b/_data/people/timtheisen.yml deleted file mode 100644 index 9afc172e3..000000000 --- a/_data/people/timtheisen.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: Tim Theisen -shortname: timtheisen -title: Release Manager -active: green -institution: University of Wisconsin–Madison -website: -image: images/team/Tim-Theisen.png diff --git a/_data/people/william-swanson.yml b/_data/people/william-swanson.yml deleted file mode 100644 index fd53e680b..000000000 --- a/_data/people/william-swanson.yml +++ /dev/null @@ -1,4 +0,0 @@ -name: "William Swanson" -image: "images/team/william_swanson.jpg" -title: "Research Cyberinfrastructure Specialist" -institution: "University of Wisconsin–Madison" diff --git a/staff-list b/staff-list new file mode 160000 index 000000000..5c2a19974 --- /dev/null +++ b/staff-list @@ -0,0 +1 @@ +Subproject commit 5c2a19974e5b09ad14ebd5557504a04b1656883f