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 7d01a54 Integrate the viewer pages into the existing interface
7d01a54 is described below
commit 7d01a549599deaa48389b3a853ceb576987a835c
Author: Sean B. Palmer <[email protected]>
AuthorDate: Fri Mar 28 15:39:46 2025 +0200
Integrate the viewer pages into the existing interface
---
atr/templates/candidate-vote.html | 2 ++
atr/templates/draft-files.html | 2 +-
atr/templates/draft-modify.html | 15 +++++++++++----
atr/templates/preview-review.html | 4 ++++
atr/templates/release-review.html | 4 ++++
5 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/atr/templates/candidate-vote.html
b/atr/templates/candidate-vote.html
index d8fcc83..59ea571 100644
--- a/atr/templates/candidate-vote.html
+++ b/atr/templates/candidate-vote.html
@@ -53,6 +53,8 @@
</form>
<a class="btn btn-primary"
href="{{ as_url(routes.candidate.vote_project,
project_name=candidate.project.name, version=candidate.version) }}">Start
vote</a>
+ <a class="btn btn-outline-primary"
+ href="{{ as_url(routes.candidate.viewer,
project_name=candidate.project.name, version_name=candidate.version) }}">View
files</a>
</div>
</div>
</div>
diff --git a/atr/templates/draft-files.html b/atr/templates/draft-files.html
index 2e1181c..52cdc4f 100644
--- a/atr/templates/draft-files.html
+++ b/atr/templates/draft-files.html
@@ -57,7 +57,7 @@
<thead>
<tr>
<th>File path</th>
- <th>Status</th>
+ <th>Checks status</th>
<th>Actions</th>
</tr>
</thead>
diff --git a/atr/templates/draft-modify.html b/atr/templates/draft-modify.html
index 6d1cbd4..7abed95 100644
--- a/atr/templates/draft-modify.html
+++ b/atr/templates/draft-modify.html
@@ -31,14 +31,21 @@
{% if release.project.committee %}
<h6 class="card-subtitle mb-2 text-muted">{{
release.project.committee.display_name }}</h6>
{% endif %}
- <p class="card-text">
+ <div class="d-flex gap-2">
+ <a href="{{ as_url(routes.draft.files,
project_name=release.project.name, version_name=release.version) }}"
+ class="btn btn-sm btn-outline-primary">Checks and actions</a>
+ <a href="{{ as_url(routes.draft.viewer,
project_name=release.project.name, version_name=release.version) }}"
+ class="btn btn-sm btn-outline-primary">View files</a>
+ <a href="{{ as_url(routes.draft.add_project,
project_name=release.project.name, version_name=release.version) }}"
+ class="btn btn-sm btn-outline-primary">Upload file</a>
+ </div>
+ <p class="card-text mt-3">
{% if number_of_release_files(release) > 0 %}
- This candidate draft has <a href="{{
as_url(routes.draft.files, project_name=release.project.name,
version_name=release.version) }}">{{ number_of_release_files(release) }}
file(s)</a>.
+ This candidate draft has {{ number_of_release_files(release)
}} file(s).
{% else %}
This candidate draft doesn't have any files yet.
{% endif %}
- <a href="{{ as_url(routes.draft.add_project,
project_name=release.project.name, version_name=release.version) }}">Upload a
file using the browser</a>,
- or use the command below to add or modify files in this draft:
+ Use the command below to add or modify files in this draft:
</p>
</div>
<div class="card-footer bg-light border-1 pt-4 pb-4
position-relative">
diff --git a/atr/templates/preview-review.html
b/atr/templates/preview-review.html
index c58c0ed..982b915 100644
--- a/atr/templates/preview-review.html
+++ b/atr/templates/preview-review.html
@@ -39,6 +39,10 @@
<span class="preview-meta-item">Phase: {{
preview.phase.value.upper() }}</span>
<span class="preview-meta-item">Created: {{
preview.created.strftime("%Y-%m-%d %H:%M UTC") }}</span>
</div>
+ <div class="d-flex gap-3 align-items-center pt-2">
+ <a class="btn btn-outline-primary"
+ href="{{ as_url(routes.preview.viewer,
project_name=preview.project.name, version_name=preview.version) }}">View
files</a>
+ </div>
<!--
<div class="d-flex gap-3 align-items-center pt-2">
<a class="btn btn-primary" href="[[
as_url{routes.preview.review_detail, preview_id=preview.id} ]]">Review
preview</a>
diff --git a/atr/templates/release-review.html
b/atr/templates/release-review.html
index 5e59c75..6385f2a 100644
--- a/atr/templates/release-review.html
+++ b/atr/templates/release-review.html
@@ -37,6 +37,10 @@
<span class="release-meta-item">Phase: {{
release.phase.value.upper() }}</span>
<span class="release-meta-item">Created: {{
release.created.strftime("%Y-%m-%d %H:%M UTC") }}</span>
</div>
+ <div class="d-flex gap-3 align-items-center pt-2">
+ <a class="btn btn-outline-primary"
+ href="{{ as_url(routes.release.viewer,
project_name=release.project.name, version_name=release.version) }}">View
files</a>
+ </div>
<!--
<div class="d-flex gap-3 align-items-center pt-2">
<a class="btn btn-primary" href="[[
as_url{routes.release.review_detail, release_id=release.id} ]]">Review
release</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
