Merge pull request #1938 from ehuss/deploy

Deploy

Author: Manishearth

locales/en-US/governance.ftl

@@ -19,6 +19,7 @@ governance-team-email = Email the { $teamname }
 governance-team-repository = { $teamname } repository
 governance-team-discord = { $channel } on Discord
 governance-team-zulip = { $stream } on Zulip
+governance-team-matrix-room = { $room } on Matrix
 governance-user-github = GitHub: { $link }
 governance-user-team-leader = Team leader
 governance-members-header = Members

src/redirect.rs

@@ -24,6 +24,11 @@ static PAGE_REDIRECTS: &[(&str, &str)] = &[
     ("security.html", "policies/security"),
     ("team.html", "governance"),
     ("user-groups.html", "community"),
+    // Team changes
+    (
+        "governance/teams/release",
+        "governance/teams/infra#team-release",
+    ),
 ];
 
 static STATIC_FILES_REDIRECTS: &[(&str, &str)] = &[

src/teams.rs

@@ -59,7 +59,16 @@ impl Data {
         self.teams
             .into_iter()
             .filter(|team| team.website_data.is_some())
-            .filter(|team| matches!(team.subteam_of.as_deref(), None | Some("launching-pad")))
+            // On the main page, show the leadership-council, all top-level
+            // teams, and everything in the launching pad. We may want to
+            // consider putting launching pad teams in a separate page in the
+            // future?
+            .filter(|team| {
+                matches!(
+                    team.subteam_of.as_deref(),
+                    None | Some("launching-pad") | Some("leadership-council")
+                )
+            })
             .map(|team| IndexTeam {
                 url: format!(
                     "{}/{}",
@@ -99,9 +108,11 @@ impl Data {
 
         // Don't show pages for subteams
         if let Some(subteam) = &main_team.subteam_of {
-            // Launching-pad does not have a page of its own, but we do want
-            // to show the working groups that are inside it.
-            if subteam != "launching-pad" {
+            // Each launching-pad and leadership-council subteam has their own
+            // page. Subteams of those subteams do not get a page of their own
+            // (they are shown in their parent page). We may want to consider
+            // putting launching-pad teams into a separate page in the future.
+            if !matches!(subteam.as_ref(), "launching-pad" | "leadership-council") {
                 return Err(TeamNotFound.into());
             }
         }
@@ -120,6 +131,9 @@ impl Data {
 
         self.teams
             .into_iter()
+            // The leadership-council page should show just the
+            // leadership-council, not everything underneath it.
+            .filter(|_| main_team.name != "leadership-council")
             .filter(|team| team.website_data.is_some())
             .filter(|team| {
                 // For teams find not only direct subteams but also transitive ones.

templates/governance/group-team.html.hbs

@@ -1,7 +1,7 @@
-<a id="{{team-text team name}}" name="{{team.name}}"></a>
+<a id="team-{{team.name}}"></a>
 <div class="w-100 mw-none mw-8-m mw9-l ph3 center f3">
     <header class="pb0 pt5">
-        <a class="linkable-subheading" href="#{{team-text team name}}"><h2>{{team-text team name}}</h2></a>
+        <a class="linkable-subheading" href="#team-{{team.name}}"><h2>{{team-text team name}}</h2></a>
         <div class="highlight"></div>
     </header>
     <div>
@@ -36,6 +36,13 @@
                         </a>
                     </div>
                 {{/if}}
+                {{#if team.website_data.matrix_room}}
+                    <div class="pt4 pt3-l flex flex-column flex-row-l items-center-l">
+                        <a class="button button-secondary" href="https://matrix.to/#/{{team.website_data.matrix_room}}">
+                        {{#fluent "governance-team-matrix-room"}}{{#fluentparam "room"}}{{team.website_data.matrix_room}}{{/fluentparam}}{{/fluent}}
+                        </a>
+                    </div>
+                {{/if}}
             </div>
         </div>
     </div>