This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-release.git
The following commit(s) were added to refs/heads/main by this push:
new be63d04 Update Jost and use it to improve the composition page
be63d04 is described below
commit be63d044ed113dab3f0ab3ee672f13a65b035cc2
Author: Sean B. Palmer <[email protected]>
AuthorDate: Tue Apr 22 15:27:18 2025 +0100
Update Jost and use it to improve the composition page
---
atr/routes/draft.py | 9 +++++----
atr/routes/release.py | 2 +-
atr/static/css/atr.css | 1 -
atr/static/webfonts/jost-v.woff2 | Bin 50396 -> 102620 bytes
atr/templates/draft-add-files.html | 2 +-
atr/templates/draft-content.html | 15 ++++++++++++++-
atr/templates/draft-vote-start.html | 2 +-
atr/templates/index-committer.html | 2 +-
8 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/atr/routes/draft.py b/atr/routes/draft.py
index 8f6c983..8bdf2bd 100644
--- a/atr/routes/draft.py
+++ b/atr/routes/draft.py
@@ -156,7 +156,7 @@ async def add(session: routes.CommitterSession) ->
response.Response | str:
project_name=str(form.project_name.data),
version=str(form.version_name.data), asf_uid=session.uid
)
return await session.redirect(
- content,
+ compose,
project_name=project.name,
version_name=new_release.version,
success="Release candidate draft created successfully",
@@ -236,8 +236,9 @@ async def add_files(session: routes.CommitterSession,
project_name: str, version
)
[email protected]("/draft/content/<project_name>/<version_name>")
-async def content(session: routes.CommitterSession, project_name: str,
version_name: str) -> response.Response | str:
+# TODO: Rename to compose.release?
[email protected]("/compose/<project_name>/<version_name>")
+async def compose(session: routes.CommitterSession, project_name: str,
version_name: str) -> response.Response | str:
"""Show the contents of the release candidate draft."""
if not any((p.name == project_name) for p in (await
session.user_projects)):
return await session.redirect(add, error="You do not have access to
this project")
@@ -1161,7 +1162,7 @@ async def vote_start(
# TODO: Consider relaxing this to all committers
# Otherwise we must not show the vote form
if not user.is_committee_member(release.committee, session.uid):
- return await session.redirect(content, error="You must be on the
PMC of this project to start a vote")
+ return await session.redirect(compose, error="You must be on the
PMC of this project to start a vote")
committee = util.unwrap(release.committee)
sender = f"{session.uid}@apache.org"
diff --git a/atr/routes/release.py b/atr/routes/release.py
index 7a0de6b..845f55e 100644
--- a/atr/routes/release.py
+++ b/atr/routes/release.py
@@ -157,7 +157,7 @@ async def start(session: routes.CommitterSession,
project_name: str) -> response
)[0]
# Redirect to the new draft's overview page on success
return await session.redirect(
- draft.content,
+ draft.compose,
project_name=project.name,
version_name=new_release.version,
success="Release candidate draft created successfully",
diff --git a/atr/static/css/atr.css b/atr/static/css/atr.css
index c564793..1305bd2 100644
--- a/atr/static/css/atr.css
+++ b/atr/static/css/atr.css
@@ -2,7 +2,6 @@
font-family: "Jost";
src: url("../webfonts/jost-v.woff2") format("woff2");
font-weight: 100 900;
- font-style: normal;
}
@font-face {
diff --git a/atr/static/webfonts/jost-v.woff2 b/atr/static/webfonts/jost-v.woff2
index eedcc3f..aed32a2 100644
Binary files a/atr/static/webfonts/jost-v.woff2 and
b/atr/static/webfonts/jost-v.woff2 differ
diff --git a/atr/templates/draft-add-files.html
b/atr/templates/draft-add-files.html
index 28a7162..46e1718 100644
--- a/atr/templates/draft-add-files.html
+++ b/atr/templates/draft-add-files.html
@@ -9,7 +9,7 @@
{% endblock description %}
{% block content %}
- <a href="{{ as_url(routes.draft.content, project_name=project_name,
version_name=version_name) }}"
+ <a href="{{ as_url(routes.draft.compose, project_name=project_name,
version_name=version_name) }}"
class="back-link">← Back to {{ project_display_name }} {{ version_name
}}</a>
<h1>Add files to {{ project_display_name }} {{ version_name }}</h1>
diff --git a/atr/templates/draft-content.html b/atr/templates/draft-content.html
index ed57976..fb639d3 100644
--- a/atr/templates/draft-content.html
+++ b/atr/templates/draft-content.html
@@ -21,11 +21,24 @@
width: 2em;
text-align: center;
}
+
+ h1 strong {
+ font-weight: 550;
+ }
+
+ h1 em {
+ font-weight: 425;
+ font-style: normal;
+ font-variation-settings: "ital" 0.5;
+ color: #555555;
+ }
</style>
{% endblock stylesheets %}
{% block content %}
- <h1>{{ release.project.display_name }} {{ version_name }}</h1>
+ <h1>
+ Compose <strong>{{ release.project.display_name.removeprefix("Apache ")
}}</strong> <em>{{ version_name }}</em>
+ </h1>
<p class="intro">
Manage the <strong>candidate draft</strong> for {{
release.project.display_name }} {{ version_name }}. Add files, review checks,
and promote when ready.
</p>
diff --git a/atr/templates/draft-vote-start.html
b/atr/templates/draft-vote-start.html
index af8317d..44d5506 100644
--- a/atr/templates/draft-vote-start.html
+++ b/atr/templates/draft-vote-start.html
@@ -105,7 +105,7 @@
<div class="mt-4 col-md-9 offset-md-3">
{{ form.submit(class_='btn btn-primary') }}
- <a href="{{ as_url(routes.draft.content,
project_name=release.project.name, version_name=release.version) }}"
+ <a href="{{ as_url(routes.draft.compose,
project_name=release.project.name, version_name=release.version) }}"
class="btn btn-link text-secondary">Cancel</a>
</div>
</form>
diff --git a/atr/templates/index-committer.html
b/atr/templates/index-committer.html
index 2f040e1..2b8a1b7 100644
--- a/atr/templates/index-committer.html
+++ b/atr/templates/index-committer.html
@@ -119,7 +119,7 @@
{% for release in active_releases %}
{% set current_phase_index = phase_index_map.get(release.phase,
-1) %}
{% if release.phase.value == "release_candidate_draft" %}
- {% set release_link = as_url(routes.draft.content,
project_name=release.project.name, version_name=release.version) %}
+ {% set release_link = as_url(routes.draft.compose,
project_name=release.project.name, version_name=release.version) %}
{% elif release.phase.value == "release_candidate" %}
{% set release_link = as_url(routes.candidate.view,
project_name=release.project.name, version_name=release.version) %}
{% elif release.phase.value == "release_preview" %}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
