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 3e48f3e  Group compose actions into their own section in the UI
3e48f3e is described below

commit 3e48f3edd300760014e6343577ec27033bd015e4
Author: Sean B. Palmer <[email protected]>
AuthorDate: Thu Sep 11 19:30:17 2025 +0100

    Group compose actions into their own section in the UI
---
 atr/templates/check-selected-release-info.html |  8 +------
 atr/templates/check-selected.html              | 30 +++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/atr/templates/check-selected-release-info.html 
b/atr/templates/check-selected-release-info.html
index cc93c84..9b5fdc7 100644
--- a/atr/templates/check-selected-release-info.html
+++ b/atr/templates/check-selected-release-info.html
@@ -71,13 +71,7 @@
                tabindex="-1"><i class="bi bi-check-circle me-1"></i> Start 
voting</a>
           {% endif %}
         {% endif %}
-        <button class="btn btn-danger"
-                title="Delete this entire draft"
-                data-bs-toggle="modal"
-                data-bs-target="#delete-{{ release.name|slugify }}">
-          <i class="bi bi-trash me-1"></i> Delete draft
-        </button>
-        {{ dialog.delete_modal_with_confirm(release.name|slugify, "Delete 
candidate draft", "candidate draft", as_url(routes.draft.delete) , delete_form, 
"candidate_draft_name") }}
+        <a href="#more-actions" class="btn btn-outline-secondary"><i class="bi 
bi-gear me-1"></i> More actions</a>
       {% elif phase == "release_candidate" %}
         <a href="{{ as_url(routes.download.all_selected, 
project_name=release.project.name, version_name=release.version) }}"
            class="btn btn-primary"><i class="bi bi-download me-1"></i> 
Download files</a>
diff --git a/atr/templates/check-selected.html 
b/atr/templates/check-selected.html
index fbc5504..f06fef9 100644
--- a/atr/templates/check-selected.html
+++ b/atr/templates/check-selected.html
@@ -110,7 +110,8 @@
       <a class="btn btn-primary"
          href="{{ as_url(routes.distribution.stage, 
project=release.project.name, version=release.version) }}">Record a 
distribution</a>
     </p>
-    <h2>Ignored checks</h2>
+    <h2 id="more-actions">More actions</h2>
+    <h3 id="ignored-checks" class="mt-4">Ignored checks</h3>
     {% if info.ignored_errors or info.ignored_warnings %}
       {% set ignored_errors_count = info.ignored_errors|length %}
       {% set ignored_warnings_count = info.ignored_warnings|length %}
@@ -164,11 +165,11 @@
       You can also <a href="{{ as_url(routes.ignores.ignores, 
committee_name=release.committee.name) }}">manage which check results are 
ignored</a>.
     </p>
 
-    <h2>Debugging</h2>
+    <h3 id="debugging" class="mt-4">Debugging</h3>
     <div class="mb-2">
       <p>The following form is for debugging purposes only. It will create a 
new revision.</p>
     </div>
-    <div>
+    <div class="mb-3">
       <form method="post"
             action="{{ as_url(routes.draft.fresh, 
project_name=release.project.name, version_name=release.version) }}"
             class="mb-0">
@@ -178,6 +179,29 @@
       </form>
     </div>
 
+    <h3 id="delete-draft" class="mt-4">Delete this draft</h3>
+    <div>
+      <form method="post"
+            action="{{ as_url(routes.draft.delete, 
project_name=release.project.name, version_name=release.version) }}"
+            class="mb-0">
+        {{ delete_form.hidden_tag() }}
+
+        <div class="mb-3">
+          <label for="confirm_delete_draft" class="form-label">
+            Type <strong>DELETE</strong> to confirm:
+          </label>
+          <input class="form-control mt-2"
+                 id="confirm_delete_draft"
+                 name="confirm_delete"
+                 placeholder="DELETE"
+                 required=""
+                 type="text"
+                 value=""
+                 onkeyup="updateDeleteButton(this, 'delete-draft-button')" />
+        </div>
+        {{ delete_form.submit(class_="btn btn-danger", 
id_="delete-draft-button", disabled=True) }}
+      </form>
+    </div>
   {% endif %}
   {% if phase == "release_candidate" %}
     {% include "check-selected-candidate-forms.html" %}


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to