diff --git a/AGENTS.md b/AGENTS.md index 1fc2152ab..ca9374e58 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -424,7 +424,8 @@ matching its directory. PSR-4 autoloads from `web/includes/` → | `Sbpp\Config` | settings cache | | `Sbpp\Api\Api` | JSON API dispatcher | | `Sbpp\Api\ApiError` | structured API error | -| `Sbpp\View\AdminTabs` | admin sub-route sidebar mounter | +| `Sbpp\View\AdminTabs` | edit-* Back-link mounter (empty tabs) | +| `Sbpp\View\AdminNavCatalog` | Pattern A section catalogs for the main-sidebar accordion (#1490) | | `Sbpp\View\BrandLogo` | `template.logo` resolver with `is_file()` fallback to `images/favicon.svg` — single source for the navbar + login chrome brand-mark renders; rejects path-traversal + null-bytes + the v1.x default (case-insensitive); fail-closed on missing `SB_THEMES` | | `Sbpp\View\Toast` | server-side toast emitter (`emit(kind, title, body, ?redirect)` — replaces v1.x `ShowBox(...)`) | | `Sbpp\View\*` | view DTOs (page-level + partials) | @@ -2734,36 +2735,41 @@ Regression guards: ### Sub-paged admin routes (`?section=…` routing) Admin routes that subdivide into a small fixed set of sub-tasks -(servers / mods / groups / comms / settings / **admins** / **bans**) +(servers / mods / groups / settings / **admins** / **bans**) ride the **`?section=` URL pattern** instead of stacking all panes in one DOM. Each section is its own URL — linkable, back-button-friendly, server-rendered, works without JS — and the page handler renders exactly one View per request. -Reference: `web/pages/admin.settings.php` is the long-standing -canonical shape; #1239 brought servers / mods / groups / comms onto -the same convention; #1259 unified the chrome on the Settings-style -vertical sidebar partial `core/admin_sidebar.tpl`; #1275 collapsed -the dual-pattern world by migrating admin-admins (`admins` / -`add-admin` / `overrides`) and admin-bans (`add-ban` / `protests` -/ `submissions` / `import` / `group-ban`) onto Pattern A too, -deleting the page-level ToC partial along the way. +#1490 — section chrome lives in the main sidebar accordion +---------------------------------------------------------- +Pre-#1490 Pattern A pages mounted a second rail +(`core/admin_sidebar.tpl` via `AdminTabs`) beside the main app +sidebar, which ate ~14rem of content width and duplicated "Add …" +links that already existed as header CTAs. #1490 nests every +section link under its admin category in the **main** sidebar as a +`
`. `Sbpp\View\AdminNavCatalog` +is the single source for those children (navbar + page-handler +routing). Comms and Export stay flat (no children). Do NOT +reintroduce a second admin rail or header Add CTAs that only +duplicate accordion entries. + +Reference: `web/pages/admin.servers.php` + `AdminNavCatalog` + +`core/navbar.tpl`. #1239 / #1259 / #1275 established `?section=` +routing; #1490 moved the chrome into the main sidebar. #1275 — the page-level ToC pattern is removed --------------------------------------------- Pre-#1275 admin-admins and admin-bans rode a "Pattern B" page-level ToC — a sticky anchor sidebar that emitted `#fragment` URLs and -scrolled within a single long-scroll DOM. The chrome looked -identical to Pattern A (#1266 unified them) but the routing -semantics diverged: clicks emitted `#fragment` URLs, browser back -went to the previous *page* not the previous section, and link -sharing broke. #1275 unified everything on Pattern A so the URL -shape is the **only** sub-route nav contract on the panel. The -`page_toc.tpl` partial, the cross-template `.page-toc-shell` -wrappers, and the `IntersectionObserver` active-link script are -all gone; if you find any new prose / code that introduces a -parallel "page ToC" or `#fragment` admin nav, it's an anti-pattern -(see "Anti-patterns" below). +scrolled within a single long-scroll DOM. #1275 unified everything +on Pattern A so the URL shape is the **only** sub-route nav +contract on the panel. The `page_toc.tpl` partial, the +cross-template `.page-toc-shell` wrappers, and the +`IntersectionObserver` active-link script are all gone; if you find +any new prose / code that introduces a parallel "page ToC" or +`#fragment` admin nav, it's an anti-pattern (see "Anti-patterns" +below). Page-handler shape: @@ -2771,77 +2777,48 @@ Page-handler shape: $canList = $userbank->HasAccess(ADMIN_OWNER | ADMIN_LIST_SERVERS); $canAdd = $userbank->HasAccess(ADMIN_OWNER | ADMIN_ADD_SERVER); -/** @var list $sections */ -$sections = [ - ['slug' => 'list', 'name' => 'List servers', 'permission' => …, 'url' => '?p=admin&c=servers§ion=list', 'icon' => 'server'], - ['slug' => 'add', 'name' => 'Add new server', 'permission' => …, 'url' => '?p=admin&c=servers§ion=add', 'icon' => 'plus'], -]; - -$validSlugs = ['list', 'add']; +$sections = \Sbpp\View\AdminNavCatalog::sectionsFor('servers'); +$validSlugs = array_column($sections, 'slug'); $section = (string) ($_GET['section'] ?? ''); if (!in_array($section, $validSlugs, true)) { $section = $canList ? 'list' : ($canAdd ? 'add' : 'list'); } -// AdminTabs opens the sidebar shell + emits the