Include roles and leadership status in the person page

Author: Kobzol

src/teams.rs

@@ -263,7 +263,7 @@ impl RustTeams {
                 TeamMode::Member | TeamMode::Alumni => ctx.get_toplevel_team_url(team),
                 TeamMode::MemberOfArchivedTeam => Some("archived-teams.html".to_string()),
             };
-            teams.push(PersonTeam::new(team, url));
+            teams.push(PersonTeam::new(team, member, url));
         }
 
         for team in &self.archived_teams {
@@ -378,32 +378,41 @@ pub struct PersonTeam {
     team: Team,
     toplevel_url: Option<String>,
     webpage_name: String,
+    roles: Vec<String>,
 }
 
 impl PersonTeam {
-    fn new(team: &Team, toplevel_url: Option<String>) -> Self {
+    fn new(team: &Team, member: &TeamMember, toplevel_url: Option<String>) -> Self {
+        // Turn inside-rust-reviewers into Inside Rust Reviewers
+        let normalize_name = |name: &str| {
+            name.split("-")
+                .map(|p| {
+                    p.chars()
+                        .take(1)
+                        .flat_map(|c| c.to_uppercase())
+                        .chain(p.chars().skip(1))
+                        .collect::<String>()
+                })
+                .collect::<Vec<String>>()
+                .join(" ")
+        };
+
         let webpage_name = team
             .website_data
             .as_ref()
             .map(|w| w.name.clone())
-            .unwrap_or_else(|| {
-                // Turn inside-rust-reviewers into Inside Rust Reviewers
-                team.name
-                    .split("-")
-                    .map(|p| {
-                        p.chars()
-                            .take(1)
-                            .flat_map(|c| c.to_uppercase())
-                            .chain(p.chars().skip(1))
-                            .collect::<String>()
-                    })
-                    .collect::<Vec<String>>()
-                    .join(" ")
-            });
+            .unwrap_or_else(|| normalize_name(&team.name));
+
+        let mut roles = vec![];
+        if member.is_lead {
+            roles.push("Lead".to_string());
+        }
+        roles.extend(member.roles.iter().map(|r| normalize_name(r)));
         Self {
             team: team.clone(),
             toplevel_url,
             webpage_name,
+            roles,
         }
     }
 }

templates/governance/person.html.hbs

@@ -3,20 +3,26 @@
     <li>
       {{#if team.toplevel_url }}
         <a href="{{../baseurl}}/governance/{{team.toplevel_url}}{{ team-anchor team.team }}">
-          {{ team.webpage_name }}
-        </a>
+          {{ team.webpage_name }}</a>
       {{else}}
         {{ team.webpage_name }}
       {{/if}}
+      {{#if team.roles }}
+        ({{~#each team.roles as |role index|~}}
+        {{#if (eq index 0)~}}
+          <b>{{role}}</b>{{~else~}}, <b>{{role}}</b>
+        {{~/if}}
+        {{~/each~}})
+      {{/if}}
     </li>
   {{/each}}
 {{/inline}}
 
 {{#*inline "page"}}
   <section class="green" style="padding-bottom: 10px;">
-    <div class="w-100 mw-none mw-8-m mw9-l center f2">
-      <div class="w-100 w-50-l mb3 flex flex-row items-center">
-        <a class="mr4 w4 h4 flex-shrink-0" href="https://github.com/{{data.github}}">
+    <div class="w-100 mw-none mw-8-m mw9-l center f1">
+      <div class="w-100 w-50-l mb3 flex flex-row items-start">
+        <a class="mr4 w5 h5 flex-shrink-0" href="https://github.com/{{data.github}}">
           <img class="w-100 h-100 bg-white br2"
                src="https://avatars.githubusercontent.com/{{data.github}}"
                alt="{{data.name}}">