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-atr-experiments.git
The following commit(s) were added to refs/heads/main by this push:
new 8903b18 Improve the sidebar and some page content
8903b18 is described below
commit 8903b18a76f9586fa474fcecef2d4462811eaed9
Author: Sean B. Palmer <[email protected]>
AuthorDate: Mon Feb 17 20:55:47 2025 +0200
Improve the sidebar and some page content
---
atr/static/css/atr.css | 16 ++++++++++-
atr/templates/includes/sidebar.html | 41 +++++++++++++++++++++++++++++
atr/templates/index.html | 31 +++++++++++++++++++++-
atr/templates/layouts/base.html | 12 +++++++++
atr/templates/release-signature-verify.html | 10 +++++--
atr/templates/user-keys-add.html | 10 +++++--
atr/templates/user-uploads.html | 16 ++++++++---
7 files changed, 127 insertions(+), 9 deletions(-)
diff --git a/atr/static/css/atr.css b/atr/static/css/atr.css
index f429fe6..c0e81ae 100644
--- a/atr/static/css/atr.css
+++ b/atr/static/css/atr.css
@@ -27,7 +27,7 @@ body {
font-weight: 425;
}
-input, textarea, button {
+input, textarea, button, select, option {
font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe
UI', Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
font-size: 17px;
line-height: 24px;
@@ -52,6 +52,10 @@ aside h1 span.rest {
color: #777;
}
+aside h3 {
+ margin-top: 1.5rem;
+}
+
.site-title {
text-decoration: none;
color: inherit;
@@ -68,6 +72,16 @@ label { font-weight: 500; border-bottom: 1px dashed #d1d2d3;
padding-bottom: 0.5
form.striking { background-color: #ffe; border: 1px solid #ddb; padding: 1rem;
border-radius: 0.5rem; }
+.hex {
+ font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
monospace;
+ font-size: 0.9em;
+ background: #fff;
+ padding: 0.25rem 0.5rem;
+ border-radius: 2px;
+ border: 1px solid #e0e0e0;
+ word-break: break-all;
+}
+
footer {
padding: 2rem;
background: #eee;
diff --git a/atr/templates/includes/sidebar.html
b/atr/templates/includes/sidebar.html
index c13a88f..c9fdcc7 100644
--- a/atr/templates/includes/sidebar.html
+++ b/atr/templates/includes/sidebar.html
@@ -26,6 +26,7 @@
{% endif %}
</div>
<nav>
+ <h3>Main pages</h3>
<ul>
<li>
<a href="{{ url_for('root') }}"
@@ -40,5 +41,45 @@
{% if request.endpoint == 'root_pmc_directory' %}class="active"{%
endif %}>PMC Directory</a>
</li>
</ul>
+
+ {% if current_user %}
+ <h3>Release management</h3>
+ <ul>
+ <li>
+ <a href="{{ url_for('root_add_release_candidate') }}"
+ {% if request.endpoint == 'root_add_release_candidate'
%}class="active"{% endif %}>Add Release Candidate</a>
+ </li>
+ <li>
+ <a href="{{ url_for('root_user_uploads') }}"
+ {% if request.endpoint == 'root_user_uploads' %}class="active"{%
endif %}>Your Uploads</a>
+ </li>
+ </ul>
+
+ <h3>User management</h3>
+ <ul>
+ <li>
+ <a href="{{ url_for('root_user_keys_add') }}"
+ {% if request.endpoint == 'root_user_keys_add' %}class="active"{%
endif %}>Add Signing Key</a>
+ </li>
+ <li>
+ <a href="{{ url_for('root_user_keys_delete') }}"
+ {% if request.endpoint == 'root_user_keys_delete'
%}class="active"{% endif %}>Delete Keys</a>
+ </li>
+ </ul>
+
+ {% if current_user.uid in ['cwells', 'fluxo', 'gmcdonald', 'humbedooh',
'sbp', 'tn', 'wave'] %}
+ <h3>Administration</h3>
+ <ul>
+ <li>
+ <a href="{{ url_for('secret_blueprint.secret_data') }}"
+ {% if request.endpoint == 'secret_blueprint.secret_data'
%}class="active"{% endif %}>Browse Database</a>
+ </li>
+ <li>
+ <a href="{{ url_for('secret_blueprint.secret_pmcs_update') }}"
+ {% if request.endpoint == 'secret_blueprint.secret_pmcs_update'
%}class="active"{% endif %}>Update PMCs</a>
+ </li>
+ </ul>
+ {% endif %}
+ {% endif %}
</nav>
</aside>
diff --git a/atr/templates/index.html b/atr/templates/index.html
index 1cd058b..3d7dd7a 100644
--- a/atr/templates/index.html
+++ b/atr/templates/index.html
@@ -6,7 +6,36 @@
{% block content %}
<h1>Apache Trusted Release</h1>
+
+ <p>
+ ATR is a release management platform for <a
href="https://www.apache.org";>Apache Software Foundation</a> projects. It
provides a standardized workflow for PMC members to submit, verify, and track
release candidates.
+ </p>
+
+ <h2>Key Features</h2>
+ <ul>
+ <li>Automated PMC roster synchronization with Whimsy</li>
+ <li>Release candidate tracking and state management</li>
+ <li>Secure key management for release managers</li>
+ <li>Signature verification for release artifacts</li>
+ </ul>
+
+ <h2>Getting Started</h2>
<p>
- Welcome to the Apache Trusted Release (ATR) platform. This system is used
to manage the release of Apache projects.
+ To submit a release candidate, you must be a PMC member of the target
project. First, <a href="{{ url_for('root_user_keys_add') }}">add your signing
key</a>, then <a href="{{ url_for('root_add_release_candidate') }}">upload your
release candidate</a>.
</p>
+
+ <h2>Documentation</h2>
+ <ul>
+ <li>
+ <a href="{{ url_for('root_pages') }}">Available endpoints and access
requirements</a>
+ </li>
+ <li>
+ <a href="{{ url_for('root_pmc_directory') }}">PMC directory and release
manager assignments</a>
+ </li>
+ {% if current_user %}
+ <li>
+ <a href="{{ url_for('root_user_uploads') }}">Track your uploaded
release candidates</a>
+ </li>
+ {% endif %}
+ </ul>
{% endblock content %}
diff --git a/atr/templates/layouts/base.html b/atr/templates/layouts/base.html
index 6d4dd6e..67dca38 100644
--- a/atr/templates/layouts/base.html
+++ b/atr/templates/layouts/base.html
@@ -14,6 +14,15 @@
href="{{ url_for('static', filename='css/normalize.css') }}" />
<link rel="stylesheet"
href="{{ url_for('static', filename='css/atr.css') }}" />
+ <style>
+ .warning-banner {
+ border: 2px solid #dc3545;
+ background: #fcc;
+ padding: 1rem;
+ margin: 0 0 2rem 0;
+ border-radius: 4px;
+ }
+ </style>
{% endblock stylesheets %}
{% block head_extra %}
{% endblock head_extra %}
@@ -33,6 +42,9 @@
<div class="main-container">
<main class="main-content">
+ <div class="warning-banner">
+ <strong>Pre-release Software:</strong> ATR is under active
development and not yet officially released. Use at your own risk.
+ </div>
{% block content %}
{% endblock content %}
</main>
diff --git a/atr/templates/release-signature-verify.html
b/atr/templates/release-signature-verify.html
index 6ce2fc3..0d4c697 100644
--- a/atr/templates/release-signature-verify.html
+++ b/atr/templates/release-signature-verify.html
@@ -161,8 +161,14 @@
{% endfor %}
</div>
+ <h2>Navigation</h2>
+
<div class="navigation">
- <a href="{{ url_for('root_user_uploads') }}">Back to Your Uploads</a>
- <a href="{{ url_for('root_pages') }}">Return to Main Page</a>
+ <p>
+ <a href="{{ url_for('root_user_uploads') }}">Back to Your Uploads</a>
+ </p>
+ <p>
+ <a href="{{ url_for('root_pages') }}">Return to Main Page</a>
+ </p>
</div>
{% endblock content %}
diff --git a/atr/templates/user-keys-add.html b/atr/templates/user-keys-add.html
index 46b9741..d8a886e 100644
--- a/atr/templates/user-keys-add.html
+++ b/atr/templates/user-keys-add.html
@@ -204,8 +204,14 @@
<button type="submit">Add Key</button>
</form>
+ <h2>Navigation</h2>
+
<div class="navigation">
- <a href="{{ url_for('root_user_uploads') }}">Back to Your Uploads</a>
- <a href="{{ url_for('root_pages') }}">Return to Main Page</a>
+ <p>
+ <a href="{{ url_for('root_user_uploads') }}">Back to Your Uploads</a>
+ </p>
+ <p>
+ <a href="{{ url_for('root_pages') }}">Return to Main Page</a>
+ </p>
</div>
{% endblock content %}
diff --git a/atr/templates/user-uploads.html b/atr/templates/user-uploads.html
index ed7c060..d456d93 100644
--- a/atr/templates/user-uploads.html
+++ b/atr/templates/user-uploads.html
@@ -45,6 +45,10 @@
border-radius: 2px;
}
+ .package div {
+ margin-bottom: 0.25rem;
+ }
+
.no-releases {
color: #666;
font-style: italic;
@@ -71,9 +75,15 @@
<div class="package-list">
{% for package in release.packages %}
<div class="package">
- <div>File: {{ package.file }}</div>
- <div>Signature: {{ package.signature }}</div>
- <div>Checksum (SHA-512): {{ package.checksum }}</div>
+ <div>
+ File: <span class="hex">{{ package.file }}</span>
+ </div>
+ <div>
+ Signature: <span class="hex">{{ package.signature }}</span>
+ </div>
+ <div>
+ Checksum (SHA-512): <span class="hex">{{ package.checksum
}}</span>
+ </div>
<p class="package-actions">
<a href="{{ url_for('root_release_signatures_verify',
release_key=release.storage_key) }}">Verify Signatures</a>
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
