diff --git a/containers/libreportal/frontend/components/backup/feature.json b/containers/libreportal/frontend/components/backup/feature.json index 344dda9..c727332 100644 --- a/containers/libreportal/frontend/components/backup/feature.json +++ b/containers/libreportal/frontend/components/backup/feature.json @@ -4,6 +4,5 @@ "module": "/components/backup/index.js", "handler": "handleBackup", "navId": "nav-backup", - "nav": { "label": "Backups", "order": 50 }, "order": 50 } diff --git a/containers/libreportal/frontend/components/manifest.dev.json b/containers/libreportal/frontend/components/manifest.dev.json index bc3283a..fa2e39e 100644 --- a/containers/libreportal/frontend/components/manifest.dev.json +++ b/containers/libreportal/frontend/components/manifest.dev.json @@ -74,10 +74,6 @@ ], "module": "/components/updater/index.js", "navId": "nav-updater", - "nav": { - "label": "Updates", - "order": 30 - }, "order": 30 }, { @@ -89,10 +85,6 @@ "module": "/components/backup/index.js", "handler": "handleBackup", "navId": "nav-backup", - "nav": { - "label": "Backups", - "order": 50 - }, "order": 50 } ] diff --git a/containers/libreportal/frontend/components/updater/feature.json b/containers/libreportal/frontend/components/updater/feature.json index 39ba73a..5daccdc 100644 --- a/containers/libreportal/frontend/components/updater/feature.json +++ b/containers/libreportal/frontend/components/updater/feature.json @@ -3,7 +3,6 @@ "routes": ["/updater", "/updater*"], "module": "/components/updater/index.js", "navId": "nav-updater", - "nav": { "label": "Updates", "order": 30 }, "order": 30, "note": "App Updater — per-app version tracking, CVE/security scanning, and disaster-recovery (snapshot-before-update + rollback). New feature (no legacy handler); routed via its module. Actions go through libreportal updater tasks." } diff --git a/containers/libreportal/frontend/core/kernel/js/spa.js b/containers/libreportal/frontend/core/kernel/js/spa.js index 9833535..ab61a81 100755 --- a/containers/libreportal/frontend/core/kernel/js/spa.js +++ b/containers/libreportal/frontend/core/kernel/js/spa.js @@ -575,16 +575,14 @@ class LibrePortalSPAClean { let activeId = 'nav-dashboard'; // default - if (path.startsWith('/app') || path.startsWith('/apps')) { + // Overview + the backup center live under the App Center umbrella now; + // /updater is redirected to /overview, so it never resolves here. + if (path.startsWith('/app') || path.startsWith('/apps') || path.startsWith('/overview') || path.startsWith('/backup')) { activeId = 'nav-app-center'; } else if (path.startsWith('/admin') || path.startsWith('/config') || path.startsWith('/ssh')) { activeId = 'nav-config'; } else if (path.startsWith('/tasks')) { activeId = 'nav-tasks'; - } else if (path.startsWith('/backup')) { - activeId = 'nav-backup'; - } else if (path.startsWith('/updater')) { - activeId = 'nav-updater'; } else if (path === '/' || path === '/dashboard') { activeId = 'nav-dashboard'; } diff --git a/containers/libreportal/frontend/core/topbar/html/topbar.html b/containers/libreportal/frontend/core/topbar/html/topbar.html index 620eacb..e88f472 100755 --- a/containers/libreportal/frontend/core/topbar/html/topbar.html +++ b/containers/libreportal/frontend/core/topbar/html/topbar.html @@ -57,23 +57,6 @@ Tasks - - - Backups - - - - Updates -