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 0e3bc0a Display drafts in a single column and rsync commands on a
single line
0e3bc0a is described below
commit 0e3bc0a6d557eaa9597ad5ac107432107b9ba19f
Author: Sean B. Palmer <[email protected]>
AuthorDate: Thu Apr 10 14:40:21 2025 +0100
Display drafts in a single column and rsync commands on a single line
---
atr/templates/draft-add.html | 5 ++---
atr/templates/draft-evaluate.html | 3 +--
atr/templates/drafts.html | 17 +++++++----------
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/atr/templates/draft-add.html b/atr/templates/draft-add.html
index 9dd6358..9d7b466 100644
--- a/atr/templates/draft-add.html
+++ b/atr/templates/draft-add.html
@@ -59,7 +59,7 @@
<p>Or use one of the commands below to create or update a candidate
draft.</p>
- <div class="row row-cols-1 row-cols-md-2 g-4 mb-5">
+ <div class="row row-cols-1 g-4 mb-5">
{% for project in projects %}
{% set candidate_drafts = project.candidate_drafts %}
@@ -90,8 +90,7 @@
data-clipboard-target="#cmd-newdraft-{{
project.name|slugify }}">
<i class="bi bi-clipboard"></i> Copy
</button>
- <pre class="small mb-0" id="cmd-newdraft-{{
project.name|slugify }}">rsync -av -e 'ssh -p 2222' your/files/ \
- {{ asf_id }}@{{ server_domain }}:/{{ project.name }}/VERSION/</pre>
+ <pre class="small mb-0" id="cmd-newdraft-{{
project.name|slugify }}">rsync -av -e 'ssh -p 2222' ${YOUR_FILES}/ {{ asf_id
}}@{{ server_domain }}:/{{ project.name }}/${VERSION}/</pre>
</div>
</div>
</div>
diff --git a/atr/templates/draft-evaluate.html
b/atr/templates/draft-evaluate.html
index 6ac89d9..36a2c75 100644
--- a/atr/templates/draft-evaluate.html
+++ b/atr/templates/draft-evaluate.html
@@ -191,8 +191,7 @@
<i class="bi bi-clipboard"></i> Copy
</button>
<pre class="small mb-0" id="cmd-newdraft-{{ release.project.name|slugify
}}">
-rsync -av -e 'ssh -p 2222' your/files/ \
- {{ asf_id }}@{{ server_domain }}:/{{ project_name }}/{{ version_name }}/
+rsync -av -e 'ssh -p 2222' ${YOUR_FILES}/ {{ asf_id }}@{{ server_domain }}:/{{
project_name }}/{{ version_name }}/
</pre>
</div>
</div>
diff --git a/atr/templates/drafts.html b/atr/templates/drafts.html
index 8b44b4b..2b870cb 100644
--- a/atr/templates/drafts.html
+++ b/atr/templates/drafts.html
@@ -21,7 +21,7 @@
<li>A candidate draft is only editable until submitted for voting</li>
</ul>
- <div class="row row-cols-1 row-cols-md-2 g-4 mb-5">
+ <div class="row row-cols-1 g-4 mb-5">
{% for release in candidate_drafts %}
{% set release_id = release.name %}
<div class="col" id="{{ release.name }}">
@@ -37,6 +37,11 @@
<div class="d-flex gap-2 mb-2">
<a href="{{ as_url(routes.draft.evaluate,
project_name=release.project.name, version_name=release.version) }}"
class="btn btn-sm btn-outline-primary">Evaluate files</a>
+ <a href="{{ as_url(routes.draft.promote) }}#{{ release.name }}"
+ class="btn btn-sm btn-outline-success">Promote draft</a>
+ <button class="btn btn-sm btn-outline-danger me-2"
+ data-bs-toggle="modal"
+ data-bs-target="#delete-{{ release_id }}">Delete
draft</button>
<a href="{{ as_url(routes.draft.view,
project_name=release.project.name, version_name=release.version) }}"
class="btn btn-sm btn-outline-secondary">View files</a>
<a href="{{ as_url(routes.draft.add_file,
project_name=release.project.name, version_name=release.version) }}"
@@ -44,13 +49,6 @@
<a href="{{ as_url(routes.draft.revisions,
project_name=release.project.name, version_name=release.version) }}"
class="btn btn-sm btn-outline-secondary">Revisions</a>
</div>
- <div class="d-flex gap-2">
- <a href="{{ as_url(routes.draft.promote) }}#{{ release.name }}"
- class="btn btn-sm btn-outline-success">Promote draft</a>
- <button class="btn btn-sm btn-outline-danger"
- data-bs-toggle="modal"
- data-bs-target="#delete-{{ release_id }}">Delete
draft</button>
- </div>
<p class="card-text mt-3">
{% if number_of_release_files(release) > 0 %}
This candidate draft has {{ number_of_release_files(release)
}} file(s).
@@ -65,8 +63,7 @@
data-clipboard-target="#cmd-{{ release.name|slugify }}">
<i class="bi bi-clipboard"></i> Copy
</button>
- <pre class="small mb-0" id="cmd-{{ release.name|slugify }}">rsync
-av -e 'ssh -p 2222' your/files/ \
- {{ asf_id }}@{{ server_domain }}:/{{ release.project.name }}/{{
release.version }}/</pre>
+ <pre class="small mb-0" id="cmd-{{ release.name|slugify }}">rsync
-av -e 'ssh -p 2222' ${YOUR_FILES}/ {{ asf_id }}@{{ server_domain }}:/{{
release.project.name }}/{{ release.version }}/</pre>
</div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
