Skip to content

Commit

Permalink
Added staff-list submodule and made the adjustments.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rhymlore
Rhymlore committed Apr 12, 2024
1 parent a20e128 commit 29617fe
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
44 changes: 22 additions & 22 deletions _about/team.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion staff-list
Submodule staff-list updated 8 files
+2 −0 brian_bockelman.yml
+2 −0 christina_koch.yml
+4 −0 frank_wuerthwein.yml
+ − images/shawn_mckee.jpg
+2 −0 josh_drake.yml
+2 −0 miron_livny.yml
+2 −0 rob_gardner.yaml
+2 −0 tim_cartwright.yml

0 comments on commit 29617fe

Please sign in to comment.