Skip to content

Commit 97d9064

Browse files
committed
Move launching pad to its own page
1 parent 57a3c62 commit 97d9064

File tree

3 files changed

+5
-27
lines changed

3 files changed

+5
-27
lines changed

locales/en-US/teams.ftl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ governance-team-lang-docs-description = Developing and writing the docs related
5656
governance-team-lang-ops-name = lang-ops team
5757
governance-team-lang-ops-description = Operations for the lang team: preparing agenda, issue triage, scheduling and documenting meetings
5858
59+
governance-team-launching-pad-name = Launching pad
60+
governance-team-launching-pad-description = An interim home for teams
61+
5962
governance-team-leadership-council-name = Leadership council
6063
governance-team-leadership-council-description = Charged with the success of the Rust Project as whole, consisting of representatives from top-level teams
6164

src/teams.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ use crate::cache::{Cache, Cached};
1515
#[derive(Default, Serialize)]
1616
pub struct IndexData {
1717
teams: Vec<IndexTeam>,
18-
wgs: Vec<IndexTeam>,
1918
}
2019

2120
#[derive(Serialize)]
@@ -63,13 +62,11 @@ impl Data {
6362
.into_iter()
6463
.filter(|team| team.website_data.is_some())
6564
// On the main page, show the leadership-council, all top-level
66-
// teams, and everything in the launching pad. We may want to
67-
// consider putting launching pad teams in a separate page in the
68-
// future?
65+
// teams.
6966
.filter(|team| {
7067
matches!(
7168
team.subteam_of.as_deref(),
72-
None | Some("launching-pad") | Some("leadership-council")
69+
None | Some("leadership-council")
7370
)
7471
})
7572
.map(|team| IndexTeam {
@@ -82,16 +79,12 @@ impl Data {
8279
})
8380
.for_each(|team| match team.team.kind {
8481
TeamKind::Team => data.teams.push(team),
85-
TeamKind::WorkingGroup => data.wgs.push(team),
8682
_ => {}
8783
});
8884

8985
data.teams.sort_by_key(|index_team| {
9086
Reverse(index_team.team.website_data.as_ref().unwrap().weight)
9187
});
92-
data.wgs.sort_by_key(|index_team| {
93-
Reverse(index_team.team.website_data.as_ref().unwrap().weight)
94-
});
9588
Ok(data)
9689
}
9790

@@ -374,9 +367,6 @@ mod tests {
374367
assert_eq!(res.teams.len(), 1);
375368
assert_eq!(res.teams[0].url, "teams/bar");
376369
assert_eq!(res.teams[0].team.name, "bar");
377-
assert_eq!(res.wgs.len(), 1);
378-
assert_eq!(res.wgs[0].url, "wgs/foo");
379-
assert_eq!(res.wgs[0].team.name, "foo");
380370
}
381371

382372
#[test]

templates/governance/index.html.hbs

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

40-
<section id="working-groups" class="green">
41-
<div class="w-100 mw-none ph3 mw-8-m mw9-l center f3">
42-
<header>
43-
<h2>{{fluent "governance-wgs-header"}}</h2>
44-
<div class="highlight"></div>
45-
</header>
46-
<div class="flex flex-column flex-row-l flex-wrap-l justify-start tc">
47-
48-
{{#each data.wgs as |team| ~}}
49-
{{> governance/index-team}}
50-
{{/each~}}
51-
</div>
52-
</div>
53-
</section>
54-
5540
{{/inline}}
5641
{{~> (lookup this "parent")~}}

0 commit comments

Comments
 (0)