This is an automated email from the ASF dual-hosted git repository.
wave pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git
The following commit(s) were added to refs/heads/main by this push:
new 5bba5c9 Adjustments to topnav
5bba5c9 is described below
commit 5bba5c97af6c2d4f9cf547e90736cf4ee99c3903
Author: Dave Fisher <[email protected]>
AuthorDate: Sun Feb 8 11:25:46 2026 -0800
Adjustments to topnav
---
atr/templates/includes/topnav.html | 74 ++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 35 deletions(-)
diff --git a/atr/templates/includes/topnav.html
b/atr/templates/includes/topnav.html
index eb62316..f86526b 100644
--- a/atr/templates/includes/topnav.html
+++ b/atr/templates/includes/topnav.html
@@ -18,7 +18,7 @@
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse navbar-adp-offset" id="navbarADP">
- <ul class="navbar-nav me-auto">
+ <ul class="navbar-nav me-auto align-items-lg-center">
{% if current_user %}
<li class="nav-item dropdown">
<button class="nav-link dropdown-toggle btn"
@@ -197,6 +197,15 @@
aria-expanded="false"
aria-controls="menuAdmin">Admin</button>
<ul class="dropdown-menu" id="menuAdmin"
aria-labelledby="dropdownAdmin">
+ <li>
+ <div class="user-menu">
+ <span>{{ current_user.fullname }}</span>
+ (<code>{{ current_user.uid }}</code>)
+ </div>
+ </li>
+ <li>
+ <hr class="dropdown-divider" />
+ </li>
<li>
<a class="dropdown-item"
href="{{ as_url(admin.all_releases) }}"
@@ -278,50 +287,39 @@
</li>
</ul>
</li>
- {% endif %}
- </ul>
- <ul class="navbar-nav align-items-center">
- {% if current_user %}
- <li class="nav-item dropdown">
- <button class="nav-link dropdown-toggle btn"
- id="dropdownUser"
- type="button"
- data-bs-toggle="dropdown"
- aria-expanded="false"
- aria-controls="menuUser">User</button>
- <ul class="dropdown-menu dropdown-menu-end"
- id="menuUser"
- aria-labelledby="dropdownUser">
- <div class="user-menu">
- <span>{{ current_user.fullname }}</span>
- (<code>{{ current_user.uid }}</code>)
- </div>
- </ul>
- </li>
- {% endif %}
- <li class="nav-item">
- {% if current_user %}
- <a href="/auth?logout=/" class="logout-link btn btn-sm
btn-secondary ms-2">Log out</a>
{% else %}
- <a href="/auth?login={{ request.path }}" class="login-link btn
btn-sm btn-secondary ms-2">Log in</a>
+ {% if current_user %}
+ <li class="nav-item dropdown">
+ <button class="nav-link dropdown-toggle btn"
+ id="dropdownUser"
+ type="button"
+ data-bs-toggle="dropdown"
+ aria-expanded="false"
+ aria-controls="menuUser">User</button>
+ <ul class="dropdown-menu dropdown-menu"
+ id="menuUser"
+ aria-labelledby="dropdownUser">
+ <div class="user-menu">
+ <span>{{ current_user.fullname }}</span>
+ (<code>{{ current_user.uid }}</code>)
+ </div>
+ </ul>
+ </li>
{% endif %}
- </li>
+ {% endif %}
<li class="nav-item dropdown">
<button class="nav-link dropdown-toggle btn"
id="dropdownASF"
type="button"
data-bs-toggle="dropdown"
aria-expanded="false"
- aria-controls="menuASF">About The ASF</button>
- <ul class="dropdown-menu dropdown-menu-end"
+ aria-controls="menuASF">The ASF</button>
+ <ul class="dropdown-menu dropdown-menu"
id="menuASF"
aria-labelledby="dropdownASF">
<li>
<a class="dropdown-item"
href="https://www.apache.org/";>Foundation</a>
</li>
- <li>
- <hr class="dropdown-divider" />
- </li>
<li>
<a class="dropdown-item"
href="https://www.apache.org/licenses/";>License</a>
</li>
@@ -333,9 +331,6 @@
<a class="dropdown-item"
href="https://www.apache.org/foundation/thanks.html";>Thanks</a>
</li>
- <li>
- <hr class="dropdown-divider" />
- </li>
<li>
<a class="dropdown-item"
href="https://www.apache.org/security/";>Security</a>
</li>
@@ -346,6 +341,15 @@
</ul>
</li>
</ul>
+ <ul class="navbar-nav align-items-lg-center">
+ <li class="nav-item">
+ {% if current_user %}
+ <a href="/auth?logout=/" class="logout-link btn btn-sm
btn-secondary ms-2">Log out</a>
+ {% else %}
+ <a href="/auth?login={{ request.path }}" class="login-link btn
btn-sm btn-secondary ms-2">Log in</a>
+ {% endif %}
+ </li>
+ </ul>
</div>
</div>
</nav>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
