Merge pull request #59 from uscms-software-and-computing/rct225-people-by-wbs-area

Rct225 people by wbs area

Author: rct225

Diff for: _data/orgs/blueprint.yml

@@ -1,2 +1,3 @@
 Name: Blueprint
 personnel:
+  - davidlange6

Diff for: _data/orgs/level1.yml

@@ -1,6 +1,5 @@
 name: Management
 personnel:
   - o_gutsche
-  - m_votava
   - tulika176
-  
+  - m_votava

Diff for: _data/orgs/project.yml

@@ -1,3 +1,3 @@
 name: Project
 personnel:
-  - rtuck225
+  - rct225

Diff for: _data/people/PerilousApricot.yml

@@ -1,8 +1,8 @@
 name: Andrew Melo
 shortname: PerilousApricot
-title: Facilities Co-Manager
+title: Facilities Co-Leader
 active: true
 institution: Vanderbilt University
 website:
 photo: /assets/images/team/Andrew_Melo.jpg
-presentations:
+presentations:

Diff for: _includes/wbs_list.html

@@ -0,0 +1 @@
+{% assign wbs_list = site.data.orgs | keys | sort %}

Diff for: _layouts/people.html

@@ -8,7 +8,9 @@
             <div class="presentation toppagelinks">
                 <div class="inner">
                     Team:
-                    <a href="/about/team.html">by institution</a>
+                    <a href="/about/team.html">by area</a>
+                    &#8226;
+                    <a href="/about/team_by_institution.html">by institution</a>
                     &#8226;
                     <a href="/about/team_alphabetical.html">by name</a>.
                 </div>
@@ -22,4 +24,4 @@
 
 
 </body>
-</html>
+</html>

Diff for: pages/about/team.md

@@ -6,25 +6,20 @@ title: US CMS S&C Team
 
 {% include image_caption.html url="../assets/images/210113 - Org Chart.png" alt="US CMS S&C Org Chart" description="" %}
 
-{% include institution_list.html %}
-{% assign univs = institution_list | hash_fetch: site.data.institutions %}
+{% include wbs_list.html %}
+{% assign areas = wbs_list | hash_fetch: site.data.orgs %}
 
 <h1>Full Team</h1><br>
 
 <div class="container-fluid">
   <div class="row">
-    {% for univ in univs %}
-      {% assign members = univ.personnel | hash_fetch: site.data.people
-                                         | where_exp:"item", "item.active and item.hidden != true"
-                                         | last_name_sort: "name" %}
+    {% for area in areas %}
+      {% assign members = area.personnel | hash_fetch: site.data.people
+                                         | where_exp:"item", "item.active and item.hidden != true" %}
 
       {% for person in members %}
         {% include standard_person_card.md person=person %}
       {% endfor %}
     {% endfor %}
   </div>
 </div>
-
-
-
-

Diff for: pages/about/team_by_institution.md

@@ -0,0 +1,27 @@
+---
+permalink: /about/team_by_institution.html
+layout: people
+title: US CMS S&C Team
+---
+
+{% include image_caption.html url="../assets/images/210113 - Org Chart.png" alt="US CMS S&C Org Chart" description="" %}
+
+{% include institution_list.html %}
+{% assign univs = institution_list | hash_fetch: site.data.institutions | sort_natural: "name" %}
+
+<h1>Full Team</h1><br>
+
+<div class="container-fluid">
+  <div class="row">
+    {% for univ in univs %}
+      {% assign members = univ.personnel | hash_fetch: site.data.people
+                                         | where_exp:"item", "item.active and item.hidden != true"
+                                         | last_name_sort: "name" %}
+
+
+      {% for person in members %}
+        {% include standard_person_card.md person=person %}
+      {% endfor %}
+    {% endfor %}
+  </div>
+</div>