Draw one menu on every page
Each page wrote its own nav: the same links in a different order, some missing, the current page sometimes listed and sometimes not. A shared "nav" template now draws it everywhere — Cluster, People, Quotas, Usage, Mirror for an administrator, then Chat, Your keys and Sign out — with the current page marked by aria-current. Pages rendered outside the account pages (the dashboard, node logs) get it through the request context their admin wrapper sets. The admin listener's own page keeps its metrics/pprof/api links. The chat and key pages said "project proj-3kq7…"; they now show the project's path, and the key page no longer repeats the email. A test renders several admin pages and requires the same menu on each. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
c22c3a309b
commit
c9cd25efc2
23 files changed
+209
-44
No files matched your search
@@ -60,6 +60,7 @@ type keyRow struct {
|
||||
}
|
||||
|
||||
type adminUsersData struct {
|
||||
Nav Nav
|
||||
Pending []store.User
|
||||
Accounts []userRow
|
||||
Tree []store.TreeOrg
|
||||
@@ -342,7 +343,7 @@ func (p *AccountPages) adminOnly(
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
next(w, r, user)
|
||||
next(w, p.withNav(r, user), user)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -385,6 +386,7 @@ func (p *AccountPages) renderUsers(w http.ResponseWriter, r *http.Request,
|
||||
) {
|
||||
ctx := r.Context()
|
||||
d := adminUsersData{
|
||||
Nav: navFrom(r, "people"),
|
||||
Message: msg, Error: errMsg, Open: open, AdminID: admin.ID,
|
||||
CSRF: csrfFor(r),
|
||||
Version: p.version,
|
||||
|
||||
Reference in new issue
Block a user