* feat(brand): inline operator SVG logo + drop header subtitle (release 0.54.6)
Three header tweaks, one PR:
1. _app_header.html drops the small uppercase subtitle line below the
brand. instance.subtitle still flows into the CLAUDE.md preamble +
init welcome template ("Operated by …"); only the web header chrome
loses it.
2. get_instance_logo_svg() in app/instance_config.py reads
instance.logo_svg (yaml) / AGNES_INSTANCE_LOGO_SVG (env). The
yaml field was already documented in instance.yaml.example and the
template already supported inline <svg> via {{ config.LOGO_SVG |
safe }}, but router.py:344 hard-coded LOGO_SVG = "" — the middle
wire was missing. Now operators can paste a lockup directly into
their instance.yaml under instance.logo_svg: | and have it render
in the header. Resolution mirrors get_instance_brand (env > yaml >
""). instance.name remains independent: drives browser <title>
tags + page h1s + CLAUDE.md heading; the SVG is the web-header
visual only.
3. .app-header-logo svg gains max-height: 40px; width: auto; so any
operator's lockup scales via its viewBox to fit the 72px header
without per-asset width/height edits. Pairs with #2 — without the
clamp, raw artwork (e.g. a 1600x430 lockup) overflows the chrome.
Release-cut included per the same-PR rule (Unreleased contained only
these bullets after rebase onto 0.54.5).
* revert: keep app-header-subtitle span — out of scope for this PR
Initial commit dropped the subtitle line on the assumption that
the user wanted both the secondary header line AND the future-SVG
brand cleaned up. The actual ask was narrower: drop the hostname
suffix that renders inside instance.name ("Foundry AI (hostname)"),
which is a startup.sh concern, not a template one. Restore the
subtitle span and the CHANGELOG bullet that announced its removal.
PR scope narrows to LOGO_SVG wiring + CSS clamp only.
* fix(header): hide subtitle span when instance.subtitle is empty
Pre-fix the template fell back to the literal string 'Data Analyst
Portal' when INSTANCE_SUBTITLE was unset, so operators who left the
field empty saw a stray hardcoded label below their brand. Switched
to a Jinja {% if %} guard around the whole <span class="app-header-
subtitle"> so an empty subtitle produces no element at all — clean
header chrome instead of placeholder leak.
* feat(home): hide install-hero once onboarded + X close button
- Wrap the entire install-hero in `{% if not onboarded %}` so once
`users.onboarded=true` (auto-flipped by `agnes init` POSTing
/api/me/onboarded, or by the new X / existing fallback button) the
blue hero disappears entirely. Pre-PR the onboarded branch reused
the same shell with a "Welcome back" header + "Steps 1–4 done" badge
+ minimize toggle, which visually outweighed the actual nav hub.
- Add a circular × close button (top-right of the hero, rendered only
when not-onboarded). Click → window.confirm() asking the user to
acknowledge onboarding → POST /api/me/onboarded → reload. The
confirm string intentionally avoids the literal phrase
"Mark me as offboarded" because cli/commands/onboarded.py::status
scans /home's rendered HTML for that exact marker as a fallback for
the api/me/profile check.
- Lift the offboard escape hatch out of the hero into a discrete
`.offboard-strip` rendered below, gated `{% if onboarded %}`. Lets
the analyst flip back to the install view after wiping their
workspace folder.
- Centralize the /api/me/onboarded POST into a `postOnboarded()` JS
helper reused by the hero X, the existing "Mark me as onboarded"
fallback button, and the new offboard button.
Tests updated to match the new behavior:
- `test_home_onboarded_user_sees_nav_hub` — asserts the hero is gone
and the offboard strip is the only setup-flow remnant.
- `test_minimize_toggle_no_longer_rendered` (renamed) — asserts the
minimize toggle is absent in both states (was previously rendered
inside the now-hidden onboarded branch of the hero).
- `test_home_no_auto_transition_after_post_until_reload` — checks
offboard-strip presence post-flip instead of the removed
"Welcome back" hero copy.
* fix(home): X-close button used invalid source enum, hit 422
The X button's data-target-source was 'self_acknowledged_x' to give
audit_log a separate marker for X-vs-button-driven flips. But
app/api/me.py:38's OnboardedRequest pins source to a Literal of
['agnes_init', 'self_acknowledged', 'self_unmark'] — pydantic
returned 422 on every X click.
Confusing side effect: both buttons share self-mark-status as the
status element, so the failed X click rendered 'Failed (422)' next
to the still-functional 'Mark me as onboarded' button. Looked like
the button itself broke.
Fix: drop the _x suffix. Both surfaces now POST source='self_acknowledged'.
Distinction in audit_log is not load-bearing — the source field
captures user intent ('I'm onboarded'), not the specific UI affordance.
147 lines
11 KiB
HTML
147 lines
11 KiB
HTML
{# Shared modern header — used by base.html and dashboard.html.
|
|
Styles live in app/web/static/style-custom.css under the .app-* prefix. #}
|
|
{% if session.user %}
|
|
<header class="app-header">
|
|
<div class="app-header-left">
|
|
<a class="app-header-logo" href="/" aria-label="Home">
|
|
{% if config.LOGO_SVG %}{{ config.LOGO_SVG | safe }}{% else %}{{ config.INSTANCE_NAME or 'Data Analyst Portal' }}{% endif %}
|
|
</a>
|
|
{% if config.INSTANCE_SUBTITLE %}<span class="app-header-subtitle">{{ config.INSTANCE_SUBTITLE }}</span>{% endif %}
|
|
</div>
|
|
<div class="app-header-right">
|
|
{% set _path = request.url.path %}
|
|
{% set _home = home_route or '/dashboard' %}
|
|
{# Primary nav: Home → Marketplace → Data Packages → Memory.
|
|
Activity Center moved into the Admin dropdown — its content
|
|
is per-team adoption analytics that only admins consume in
|
|
practice (the route still allows any authed user for
|
|
direct deep-links). The "Home" link points at the
|
|
operator-resolved `home_route` (defaults to /dashboard for
|
|
OSS; customer instances flip to /home via env / yaml).
|
|
Setup local agent + My Stack used to live in the nav too;
|
|
Setup is reached from /home's install flow and My Stack
|
|
lives inside /marketplace as a tab. #}
|
|
<a class="app-nav-link {% if _path == _home or _path == '/' or _path == '/dashboard' or _path == '/home' %}is-active{% endif %}" href="{{ _home }}">Home</a>
|
|
<a class="app-nav-link {% if _path == '/marketplace' or _path.startswith('/marketplace/') %}is-active{% endif %}" href="/marketplace">Marketplace</a>
|
|
<a class="app-nav-link {% if _path.startswith('/catalog') %}is-active{% endif %}" href="/catalog">Data Packages</a>
|
|
{# Memory + Admin menu: both admin-only. Backend gates the routes
|
|
themselves via require_admin (see app/web/router.py for
|
|
/corporate-memory + /corporate-memory/admin + /admin/*), so
|
|
hiding the links is purely a visibility tidy-up — non-admins
|
|
who deep-link still get a 403 from the route handler. Single
|
|
guard wraps both for clarity. #}
|
|
{% if session.user.is_admin %}
|
|
{# "Memory" link moved into the Admin dropdown's Agent Experience
|
|
section (parallel to Curated Marketplaces / Flea Submissions /
|
|
Prompts). The primary nav no longer carries an admin-only
|
|
entry — primary nav stays consistently visible to all
|
|
authenticated users. #}
|
|
{% set _admin_active = _path.startswith('/admin/tables') or _path.startswith('/admin/tokens') or _path.startswith('/admin/users') or _path.startswith('/admin/groups') or _path.startswith('/admin/access') or _path.startswith('/admin/server-config') or _path.startswith('/admin/agent-prompt') or _path.startswith('/admin/workspace-prompt') or _path.startswith('/admin/marketplaces') or _path.startswith('/admin/store') or _path.startswith('/admin/scheduler-runs') or _path.startswith('/admin/activity') or _path.startswith('/admin/telemetry') or _path.startswith('/admin/usage') or _path.startswith('/admin/sessions') or _path.startswith('/corporate-memory') %}
|
|
<div class="app-nav-menu" id="adminNavMenu">
|
|
<button type="button"
|
|
class="app-nav-link app-nav-menu-trigger {% if _admin_active %}is-active{% endif %}"
|
|
id="adminNavTrigger"
|
|
aria-haspopup="menu" aria-expanded="false" aria-controls="adminNavPanel">
|
|
Admin
|
|
<svg class="app-nav-menu-chevron" width="10" height="10" viewBox="0 0 12 12" aria-hidden="true">
|
|
<path d="M2 4l4 4 4-4" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
|
|
</svg>
|
|
</button>
|
|
{# Admin dropdown is grouped into four named sections so admins
|
|
doing different jobs (debugging activity vs. managing users
|
|
vs. curating marketplaces) can land on the right page
|
|
without re-reading the full menu. Section headers are
|
|
non-clickable, set off by `.app-nav-menu-section` styling
|
|
(small caps, muted). Items keep the existing
|
|
`.app-nav-menu-item` look + active state. #}
|
|
<div class="app-nav-menu-panel" id="adminNavPanel" role="menu" hidden>
|
|
<div class="app-nav-menu-section">Activity Center</div>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/activity') %}is-active{% endif %}" role="menuitem" href="/admin/activity">Audit log</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/telemetry') or _path.startswith('/admin/usage') %}is-active{% endif %}" role="menuitem" href="/admin/telemetry">Telemetry</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/sessions') %}is-active{% endif %}" role="menuitem" href="/admin/sessions">Sessions</a>
|
|
|
|
<div class="app-nav-menu-section">Users & Access</div>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/users') %}is-active{% endif %}" role="menuitem" href="/admin/users">Users</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/groups') %}is-active{% endif %}" role="menuitem" href="/admin/groups">Groups</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/access') %}is-active{% endif %}" role="menuitem" href="/admin/access">Resource access</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/tokens') %}is-active{% endif %}" role="menuitem" href="/admin/tokens">Tokens</a>
|
|
|
|
<div class="app-nav-menu-section">Data</div>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/tables') %}is-active{% endif %}" role="menuitem" href="/admin/tables">Tables</a>
|
|
|
|
{# "Agent Experience" groups everything the admin curates
|
|
for what an analyst's AI agent sees / can do: which
|
|
plugins (curated + flea) are available, which prompt
|
|
Claude lands on at `agnes init`, and the CLAUDE.md
|
|
template injected into each workspace. #}
|
|
<div class="app-nav-menu-section">Agent Experience</div>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/marketplaces') %}is-active{% endif %}" role="menuitem" href="/admin/marketplaces">Curated Marketplaces</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/corporate-memory') %}is-active{% endif %}" role="menuitem" href="/corporate-memory">Curated Memory</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/store/submissions') %}is-active{% endif %}" role="menuitem" href="/admin/store/submissions">Flea Submissions</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/agent-prompt') %}is-active{% endif %}" role="menuitem" href="/admin/agent-prompt">Init Prompt</a>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/workspace-prompt') %}is-active{% endif %}" role="menuitem" href="/admin/workspace-prompt">Workspace Prompt</a>
|
|
|
|
<div class="app-nav-menu-section">Server</div>
|
|
<a class="app-nav-menu-item {% if _path.startswith('/admin/server-config') %}is-active{% endif %}" role="menuitem" href="/admin/server-config">Server config</a>
|
|
{# /admin/scheduler-runs collapsed into /admin/activity as
|
|
a `source=scheduler` filter — old route 308-redirects. #}
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
|
|
<div class="app-user-menu" id="userMenu">
|
|
<button type="button" class="app-user-menu-trigger" id="userMenuTrigger"
|
|
aria-haspopup="menu" aria-expanded="false" aria-controls="userMenuPanel">
|
|
{% if session.user.picture %}
|
|
<img src="{{ session.user.picture }}" alt="" class="app-avatar-img">
|
|
{% else %}
|
|
<span class="app-avatar">{{ (session.user.name or session.user.email)[:2] | upper }}</span>
|
|
{% endif %}
|
|
<svg class="app-user-menu-chevron" width="12" height="12" viewBox="0 0 12 12" aria-hidden="true">
|
|
<path d="M2 4l4 4 4-4" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
|
|
</svg>
|
|
</button>
|
|
<div class="app-user-menu-panel" id="userMenuPanel" role="menu" hidden>
|
|
<div class="app-user-menu-header">
|
|
<div class="app-user-menu-email">{{ session.user.email }}</div>
|
|
{% if session.user.is_admin %}
|
|
<div class="app-user-menu-role">Admin</div>
|
|
{% endif %}
|
|
</div>
|
|
<a class="app-user-menu-item {% if _path == '/profile' %}is-active{% endif %}" role="menuitem" href="/profile">Profile</a>
|
|
<a class="app-user-menu-item {% if _path == '/profile/sessions' %}is-active{% endif %}" role="menuitem" href="/profile/sessions">My sessions</a>
|
|
<a class="app-user-menu-item {% if _path == '/tokens' %}is-active{% endif %}" role="menuitem" href="/tokens">My tokens</a>
|
|
{% if config.DEBUG_AUTH_ENABLED %}
|
|
<a class="app-user-menu-item {% if _path.startswith('/me/debug') %}is-active{% endif %}" role="menuitem" href="/me/debug">Auth debug</a>
|
|
{% endif %}
|
|
<a class="app-user-menu-item" role="menuitem" href="{{ url_for('auth.logout') }}">Logout</a>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</header>
|
|
<script>
|
|
// Generic toggle pattern — used by both the user menu and the Admin nav dropdown.
|
|
function _wireDropdown(triggerId, panelId) {
|
|
var trigger = document.getElementById(triggerId);
|
|
var panel = document.getElementById(panelId);
|
|
if (!trigger || !panel) return;
|
|
function setOpen(open) {
|
|
trigger.setAttribute('aria-expanded', open ? 'true' : 'false');
|
|
if (open) { panel.removeAttribute('hidden'); }
|
|
else { panel.setAttribute('hidden', ''); }
|
|
}
|
|
trigger.addEventListener('click', function(e) {
|
|
e.stopPropagation();
|
|
setOpen(trigger.getAttribute('aria-expanded') !== 'true');
|
|
});
|
|
document.addEventListener('click', function(e) {
|
|
if (!panel.contains(e.target) && e.target !== trigger) setOpen(false);
|
|
});
|
|
document.addEventListener('keydown', function(e) {
|
|
if (e.key === 'Escape') { setOpen(false); trigger.focus(); }
|
|
});
|
|
}
|
|
_wireDropdown('userMenuTrigger', 'userMenuPanel');
|
|
_wireDropdown('adminNavTrigger', 'adminNavPanel');
|
|
</script>
|
|
{% endif %}
|