From 64e7417bccdbb85fecd9147fe8a87ee8941ac080 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Wed, 6 Mar 2024 12:10:32 +1100 Subject: [PATCH] [templates] Update links Since switching to the release_id instead of the release_name we're no longer generating HTML anchors as expected. The generated RST: ' 2024.1 TC Candidates ==================== ' Doesn't generate #2024.1-tc-candidates, instead it generates #tc-candidates. This is because docutils 'ids' cannot start with numerics ([1] is the implementation). So we need to change the text/anchors. It seems like including release specific names or ids isn't actually helpful. Let's drop them. [1] https://repo.or.cz/docutils.git/blob/refs/heads/master:/docutils/docutils/nodes.py#l2226 Change-Id: I4c48ade272ae3d9bd4a97fba7d30f909aac696f9 --- openstack_election/templates/combined_end_nominations.j2 | 4 ++-- openstack_election/templates/ptl_end_nominations.j2 | 2 +- openstack_election/templates/ptl_nominations_kickoff.j2 | 2 +- openstack_election/templates/ptl_voting_kickoff.j2 | 2 +- openstack_election/templates/tc_end_nominations.j2 | 2 +- openstack_election/templates/tc_voting_kickoff.j2 | 2 +- openstack_election/templates/tc_voting_last_days.j2 | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openstack_election/templates/combined_end_nominations.j2 b/openstack_election/templates/combined_end_nominations.j2 index f8ccca0c..b36ec18c 100644 --- a/openstack_election/templates/combined_end_nominations.j2 +++ b/openstack_election/templates/combined_end_nominations.j2 @@ -21,6 +21,6 @@ Polling will start {{ election_start }}. Thank you, -[0] https://governance.openstack.org/election/#{{ release }}-ptl-candidates -[1] https://governance.openstack.org/election/#{{ release }}-tc-candidates +[0] https://governance.openstack.org/election/#ptl-candidates +[1] https://governance.openstack.org/election/#tc-candidates [2] {{ leaderless_url }} diff --git a/openstack_election/templates/ptl_end_nominations.j2 b/openstack_election/templates/ptl_end_nominations.j2 index c02fe9b9..cfc14810 100644 --- a/openstack_election/templates/ptl_end_nominations.j2 +++ b/openstack_election/templates/ptl_end_nominations.j2 @@ -13,7 +13,7 @@ for those will be posted shortly after we setup the CIVS system. Thank you, -[0] https://governance.openstack.org/election/#{{ release }}-ptl-candidates +[0] https://governance.openstack.org/election/#ptl-candidates [1] {{ leaderless_url }} diff --git a/openstack_election/templates/ptl_nominations_kickoff.j2 b/openstack_election/templates/ptl_nominations_kickoff.j2 index bc2d0b20..70716741 100644 --- a/openstack_election/templates/ptl_nominations_kickoff.j2 +++ b/openstack_election/templates/ptl_nominations_kickoff.j2 @@ -22,7 +22,7 @@ Additional information about the nomination process can be found here: https://governance.openstack.org/election/ Shortly after election officials approve candidates, they will be listed here: -https://governance.openstack.org/election/#{{ release }}-ptl-candidates +https://governance.openstack.org/election/#ptl-candidates The electorate is requested to confirm their email address in gerrit[1], prior to {{ email_deadline }} so that the emailed ballots are mailed to the correct email diff --git a/openstack_election/templates/ptl_voting_kickoff.j2 b/openstack_election/templates/ptl_voting_kickoff.j2 index 8d371326..4b0ef788 100644 --- a/openstack_election/templates/ptl_voting_kickoff.j2 +++ b/openstack_election/templates/ptl_voting_kickoff.j2 @@ -36,7 +36,7 @@ please exercise your right to vote! Candidate statements/platforms can be found linked to Candidate names on this page: -https://governance.openstack.org/election/#{{ release }}-ptl-candidates +https://governance.openstack.org/election/#ptl-candidates Happy voting, diff --git a/openstack_election/templates/tc_end_nominations.j2 b/openstack_election/templates/tc_end_nominations.j2 index 6aaee313..97cd827c 100644 --- a/openstack_election/templates/tc_end_nominations.j2 +++ b/openstack_election/templates/tc_end_nominations.j2 @@ -11,4 +11,4 @@ Polling will start {{ election_start }}. Thank you, -[0] https://governance.openstack.org/election/#{{ release }}-tc-candidates +[0] https://governance.openstack.org/election/#tc-candidates diff --git a/openstack_election/templates/tc_voting_kickoff.j2 b/openstack_election/templates/tc_voting_kickoff.j2 index 2a9d5896..0a90faff 100644 --- a/openstack_election/templates/tc_voting_kickoff.j2 +++ b/openstack_election/templates/tc_voting_kickoff.j2 @@ -52,4 +52,4 @@ Thank you, at the email listed as your preferred email. That is where the ballot has been sent. [5] https://governance.openstack.org/election/#election-officials -[6] https://governance.openstack.org/election/#{{ release }}-tc-candidates +[6] https://governance.openstack.org/election/#tc-candidates diff --git a/openstack_election/templates/tc_voting_last_days.j2 b/openstack_election/templates/tc_voting_last_days.j2 index 5eabb8be..9e36faa4 100644 --- a/openstack_election/templates/tc_voting_last_days.j2 +++ b/openstack_election/templates/tc_voting_last_days.j2 @@ -12,7 +12,7 @@ vote. If you have voted, please encourage your colleagues to vote. Candidate statements are linked to the names of all confirmed candidates: -https://governance.openstack.org/election/#{{ release }}-tc-candidates +https://governance.openstack.org/election/#tc-candidates What to do if you don't see the email and have a commit in at least one of the official project teams' deliverable repositories[1]: