Skip to content

Commit c439ba7

Browse files
committed
Show archived teams on the website
1 parent c53ba8e commit c439ba7

File tree

6 files changed

+101
-0
lines changed

6 files changed

+101
-0
lines changed

locales/en-US/governance.ftl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ governance-rfc-blurb = Each major decision in Rust starts as a Request for Comme
1111
governance-teams-header = Teams
1212
governance-wgs-header = Working Groups
1313
14+
governance-archived-teams-header = Archived teams
15+
governance-archived-teams-link = Show archived teams
16+
governance-archived-teams-title = Archived teams
17+
governance-archived-alumni-thanks = We want to thank all past members for their invaluable contributions!
18+
governance-archived-teams-intro = This page contains archived teams (in alphabetical order) that are no longer active.
19+
1420
## governance/index-team.hbs
1521
governance-members = Members & Contacts
1622

src/render.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,18 @@ pub fn render_governance(render_ctx: &RenderCtx) -> anyhow::Result<()> {
207207
)?;
208208
}
209209

210+
let archived_teams_data = render_ctx.teams.archived_teams();
211+
for_all_langs("governance/archived-teams.html", |dst_path, lang| {
212+
render_ctx
213+
.page(
214+
"governance/archived-teams",
215+
"governance-archived-teams-title",
216+
&archived_teams_data,
217+
lang,
218+
)
219+
.render(dst_path)
220+
})?;
221+
210222
Ok(())
211223
}
212224

src/teams.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,18 @@ impl RustTeams {
194194
other_teams,
195195
})
196196
}
197+
198+
pub fn archived_teams(&self) -> ArchivedTeams {
199+
let mut teams: Vec<Team> = self
200+
.archived_teams
201+
.iter()
202+
.filter(|t| t.website_data.is_some())
203+
.cloned()
204+
.collect();
205+
teams.sort_by_key(|t| t.name.clone());
206+
207+
ArchivedTeams { teams }
208+
}
197209
}
198210

199211
#[derive(Serialize)]
@@ -221,6 +233,11 @@ pub struct PageData {
221233
other_teams: Vec<Team>,
222234
}
223235

236+
#[derive(Serialize)]
237+
pub struct ArchivedTeams {
238+
teams: Vec<Team>,
239+
}
240+
224241
pub fn load_rust_teams() -> anyhow::Result<RustTeams> {
225242
println!("Downloading Team API data");
226243

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<a id="team-{{team.name}}"></a>
2+
<div class="w-100 mw-none mw-8-m mw9-l ph3 center f3">
3+
<header class="pb0 pt5">
4+
<a class="linkable-subheading" href="#team-{{team.name}}">
5+
<h2>{{team-text team name}}</h2>
6+
</a>
7+
<div class="highlight"></div>
8+
</header>
9+
<div>
10+
<div class="mv4 flex flex-column flex-row-l justify-between">
11+
<p class="ma0 f2">{{team-text team description}}</p>
12+
</div>
13+
</div>
14+
{{#if team.alumni}}
15+
<div class="flex flex-column flex-row-l flex-wrap-l justify-start">
16+
{{#each team.alumni as |member|}}
17+
<div class="w-100 w-33-l mb3 flex flex-row items-center">
18+
<a class="mr4 w3 h3 flex-shrink-0" href="https://github.com/{{member.github}}">
19+
<img class="w-100 h-100 bg-white br2"
20+
src="https://avatars.githubusercontent.com/{{member.github}}"
21+
alt="{{member.name}}">
22+
</a>
23+
<div>
24+
{{member.name}}
25+
<div class="f4">
26+
GitHub: <a href="https://github.com/{{member.github}}">{{member.github}}</a>
27+
</div>
28+
{{#if member.roles}}
29+
<div class="f4">{{team-text ../team role (lookup member.roles 0)}}</div>
30+
{{/if}}
31+
</div>
32+
</div>
33+
{{/each}}
34+
</div>
35+
{{/if}}
36+
</div>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{{#*inline "page"}}
2+
<section class="green" style="padding-bottom: 10px;">
3+
<div class="w-100 mw-none mw-8-m mw9-l center f2">
4+
<p>{{fluent "governance-archived-teams-intro"}} {{fluent "governance-archived-alumni-thanks"}}</p>
5+
</div>
6+
</section>
7+
8+
{{#each data.teams as |team|}}
9+
<section class="green" style="padding-bottom: 15px;">
10+
{{> governance/archived-team team=team}}
11+
</section>
12+
{{/each}}
13+
14+
{{/inline}}
15+
{{~> (lookup this "parent")~}}

templates/governance/index.html.hbs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,20 @@
3737
</div>
3838
</section>
3939

40+
<section id="archived-teams" class="green">
41+
<div class="w-100 mw-none ph3 mw-8-m mw9-l center f3">
42+
<header>
43+
<h2>{{fluent "governance-archived-teams-header"}}</h2>
44+
<div class="highlight"></div>
45+
</header>
46+
<div class="mb2">Some past teams are no longer active. We call these "archived teams".</div>
47+
48+
<a href="{{baseurl}}/governance/archived-teams.html" class="center w-100 mw6 button button-secondary">
49+
{{fluent "governance-archived-teams-link"}}
50+
</a>
51+
</div>
52+
</div>
53+
</section>
54+
4055
{{/inline}}
4156
{{~> (lookup this "parent")~}}

0 commit comments

Comments
 (0)