From 5fa724c495b08476c4f9a2f129df40ea02d0ee4c Mon Sep 17 00:00:00 2001 From: Harenome Ranaivoarivony-Razanajato Date: Wed, 18 Nov 2026 14:59:12 +0100 Subject: [PATCH 1/8] feat(web): add one page head for every page's title A title flush left, one line under it, the page's buttons right of the title's first line at the table controls' height (--tool-h), and one gap under it. --- app/static/style.css | 23 +++++++++++++++++++++-- app/templates/_page.html | 17 +++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 app/templates/_page.html diff --git a/app/static/style.css b/app/static/style.css index 9a003d91..3e4cbd24 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -5,6 +5,8 @@ base.html chooses the theme before paint; every asset remains local. */ :root { --topbar-height: 56px; + --tool-h: 2.1rem; /* a page's buttons and a table's controls: as tall as a small button with its icon */ + --h1-size: clamp(1.75rem, 2.5vw, 2.15rem); --nav-hover: #32363d; --nav-text: #d6d9df; color-scheme: dark; @@ -257,7 +259,25 @@ h1, h2, h3 { font-weight: 500; letter-spacing: -0.01em; } main { max-width: none; margin: 0; padding: 2.6rem clamp(1.25rem, 3vw, 3rem) 5rem; } .page-title { display: flex; align-items: baseline; gap: .75rem; flex-wrap: wrap; } -h1 { font-size: clamp(1.75rem, 2.5vw, 2.15rem); font-weight: 500; line-height: 1.22; letter-spacing: -.04em; margin: 0; } +h1 { font-size: var(--h1-size); font-weight: 500; line-height: 1.22; letter-spacing: -.04em; margin: 0; } + +/* the page head (templates/_page.html): the title flush left, one line under it, the page's buttons right of the + title's first line and centred on it; on a narrow screen the buttons go under, flush left. One gap under it. */ +.page-head { --h1-line: calc(var(--h1-size) * 1.22); display: grid; grid-template-columns: minmax(0, 1fr) auto; gap: .5rem 1.5rem; margin: 0 0 1.5rem; } +.page-head > h1 { grid-column: 1; grid-row: 1; overflow-wrap: anywhere; } +.page-head-mark { display: inline-flex; align-items: center; height: var(--h1-line); margin-right: .45em; vertical-align: top; } +.page-head .page-head-mark > * { width: calc(var(--h1-size) * .9); height: calc(var(--h1-size) * .9); } +.page-head-sub { grid-column: 1 / -1; display: flex; flex-wrap: wrap; align-items: center; gap: .35rem .6rem; min-width: 0; color: var(--text-dim); font-size: .9rem; line-height: 1.5; } +.page-head-sub .mono { color: var(--text); overflow-wrap: anywhere; } +.page-head-actions { grid-column: 2; grid-row: 1; align-self: start; display: flex; flex-wrap: wrap; justify-content: flex-end; align-items: center; gap: .5rem; + margin-top: calc((var(--h1-line) - var(--tool-h)) / 2); } +.page-head-actions :is(.btn, .nb-button) { height: var(--tool-h); padding-block: 0; } +main .page-head + * { margin-top: 0; } /* the head's gap is the only one */ +@media (max-width: 640px) { + .page-head { grid-template-columns: minmax(0, 1fr); } + .page-head-actions { grid-column: 1; grid-row: auto; justify-content: flex-start; margin-top: .25rem; } +} +@media (pointer: coarse) { .page-head { --tool-h: 2.75rem; } } h2 { font-size: 1.05rem; margin: 2rem 0 .75rem; } h3 { font-size: .72rem; margin: 1.25rem 0 .6rem; color: var(--text-dim); text-transform: uppercase; letter-spacing: .09em; font-weight: 500; } @@ -362,7 +382,6 @@ button.seg:hover { filter: brightness(1.25); } .table-buttons, .table-slot { display: flex; flex-wrap: wrap; justify-content: flex-end; align-items: center; gap: .75rem; } .table-buttons { margin-left: auto; } .table-buttons .menu { left: auto; right: 0; } /* opens leftwards, inside the page */ -.table-controls { --tool-h: 2.1rem; } /* every control in the row is as tall as a small button with its icon */ .table-controls :is(.btn, .seg-toggle, .filter-pill) { height: var(--tool-h); } .table-controls .filter-pill { min-height: 0; padding-block: 0; } /* a segmented toggle: a bordered group of links or buttons, the current one marked */ diff --git a/app/templates/_page.html b/app/templates/_page.html new file mode 100644 index 00000000..4bf4a092 --- /dev/null +++ b/app/templates/_page.html @@ -0,0 +1,17 @@ +{#- The page head: every page's title, styled in style.css ("the page head"), the shape the table toolkit + (_tables.html) and the card toolkit (_cards.html) sit under. #} + +{# A page's head: its `title`, the one h1, flush left; under it at most one line, `sub` (counts, an id, a badge or + pills, never a sentence); right of the title's line, `actions`, the page's buttons, each as tall as a table's + controls (--tool-h) and centred on that line, under `sub` on a narrow screen. `sub`, `actions` and `mark` are + markup, as a `{% set %}` block writes it; `mark` goes before the title (a benchmark's or an agent's logo). + `mono` sets the title as code (a task name); `id` names the h1. #} +{% macro page_head(title, sub='', actions='', mark='', mono=false, id='') %} +
+ {% if mark|trim %}{% endif %}{{ title }} + {%- if sub|trim %} +
{{ sub }}
{% endif %} + {%- if actions|trim %} +
{{ actions }}
{% endif %} +
+{%- endmacro %} From 0b13b822b1c0c299d70be14e092208b878dbf469 Mon Sep 17 00:00:00 2001 From: Harenome Ranaivoarivony-Razanajato Date: Wed, 18 Nov 2026 15:01:32 +0100 Subject: [PATCH 2/8] feat(runs): head the runs and workspaces pages with the page head Runs, the empty Runs page, a run, a run being prepared, Launches, the feasibility check, Classifier vs judge, the import page and Workspaces. A run's details are the line under its id and its buttons sit right of it. The empty Runs page loses its tagline. --- app/static/catalogue/catalogue.css | 5 ++--- app/static/runs/launches.css | 4 +--- app/static/runs/start.css | 6 +----- app/static/style.css | 4 ++-- app/static/workspaces/workspaces.css | 1 - app/templates/runs/feasibility.html | 6 +++--- app/templates/runs/index.html | 21 +++++++++------------ app/templates/runs/job.html | 13 ++++++------- app/templates/runs/launches.html | 3 ++- app/templates/runs/preparing.html | 5 ++--- app/templates/runs/reconcile.html | 6 +++--- app/templates/runs/setup.html | 7 ++----- app/templates/runs/start.html | 6 ++---- app/templates/workspaces/workspaces.html | 5 +++-- app/ui_tests/test_controls_apart.py | 4 ++-- app/ui_tests/test_run_routes.py | 4 ++-- 16 files changed, 42 insertions(+), 58 deletions(-) diff --git a/app/static/catalogue/catalogue.css b/app/static/catalogue/catalogue.css index 0d1d6cd7..9b23111e 100644 --- a/app/static/catalogue/catalogue.css +++ b/app/static/catalogue/catalogue.css @@ -116,8 +116,7 @@ /* Import paths and folders. */ .setup-wrap.import-setup { max-width: 820px; margin: 0; text-align: left; } -.import-setup h1 { font-size: 34px; font-weight: 500; letter-spacing: -.9px; } -.import-setup .subtitle { font-size: 14px; line-height: 1.8; color: var(--text-dim); justify-content: flex-start; max-width: 70ch; margin-top: 12px; } +.import-setup .subtitle { font-size: 14px; line-height: 1.8; color: var(--text-dim); justify-content: flex-start; max-width: 70ch; } .import-setup .setup-card { border-radius: 9px; padding: 28px 30px; margin-top: 27px; background: var(--surface); } .import-setup .field-label { color: var(--text); font-size: 13px; text-transform: none; letter-spacing: 0; font-weight: 500; display: block; margin-bottom: 10px; } .import-setup .divider { color: var(--text-dim); font-size: 11px; margin: 26px 0; } @@ -126,7 +125,7 @@ .import-setup .drop.over { background: var(--accent-soft); border-color: var(--accent); } .import-setup .submit-row { margin-top: 23px; }.import-setup .submit-row .primary { padding: 11px 25px; } .import-next { display: flex; gap: 15px; flex-wrap: wrap; color: var(--text-dim); font-size: 13px; border-top: 1px solid var(--border-soft); padding-top: 23px; margin-top: 25px; } -@media(max-width:640px){.setup-wrap.import-setup{margin:0}.import-setup h1{font-size:29px}.import-setup .setup-card{padding:22px 18px}.import-setup .drop{padding:26px 17px}.import-setup .field-label{font-size:12px}.import-setup .path-row input{font-size:16px}} +@media(max-width:640px){.setup-wrap.import-setup{margin:0}.import-setup .setup-card{padding:22px 18px}.import-setup .drop{padding:26px 17px}.import-setup .field-label{font-size:12px}.import-setup .path-row input{font-size:16px}} @media(pointer:coarse){.import-setup .add-btn,.import-setup .row-x{min-width:44px;min-height:44px}} /* Settings: what testing a host said. */ diff --git a/app/static/runs/launches.css b/app/static/runs/launches.css index 05f31fd9..86d14d40 100644 --- a/app/static/runs/launches.css +++ b/app/static/runs/launches.css @@ -1,8 +1,6 @@ /* The Runs page: runs grouped by the launch that made them. A launch is one block - its task checks, its agents on one 0-100% scale, raw as a tick on the adjusted bar - and the flat table is the second view. */ -.runs-head { justify-content: space-between; } -.runs-acts { display: inline-flex; flex-wrap: wrap; gap: 8px; } -.runs-glance { display: flex; flex-wrap: wrap; gap: 4px 16px; margin: -1.2rem 0 1rem; font-size: 13px; color: var(--text-dim); } +.runs-glance { display: flex; flex-wrap: wrap; gap: 4px 16px; margin: 0 0 1rem; font-size: 13px; color: var(--text-dim); } .runs-glance b { color: var(--text); font-weight: 500; } .runs-glance .st-paused b, .runs-glance .st-stopping b { color: var(--patch_failed_tests); } .runs-glance .st-stopped b, .runs-glance .st-failed b, .runs-glance .st-not b { color: var(--bad); } diff --git a/app/static/runs/start.css b/app/static/runs/start.css index 051de47b..8721b3c1 100644 --- a/app/static/runs/start.css +++ b/app/static/runs/start.css @@ -1,9 +1,7 @@ /* Runs with no workspace open: build a run, or bring the ones made elsewhere, or open a workspace already here. Colours are the app's tokens (style.css). */ .start { width: 100%; max-width: 1440px; margin: 0 auto; display: flex; flex-direction: column; gap: 28px; } -.start-head { display: flex; flex-direction: column; gap: 8px; } -.start-head h1 { margin: 0; } -.start-head p { margin: 0; font-size: 15px; color: var(--text-dim); } +.start > .page-head { margin-bottom: calc(var(--head-gap) - 28px); } /* the column's gap is part of the head's */ .start-ways { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(100%, 300px), 1fr)); gap: 18px; } .start-card { display: flex; flex-direction: column; gap: 14px; padding: clamp(24px, 2vw, 36px); border: 1px solid var(--border-soft); border-radius: 14px; background: var(--surface); color: var(--text); } .start-ic { width: 40px; height: 40px; border-radius: 10px; display: flex; align-items: center; justify-content: center; background: var(--accent-soft); color: var(--accent-strong); } @@ -24,8 +22,6 @@ .start-all { font-size: 13px; } .start .sr { position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0; overflow: hidden; clip: rect(0 0 0 0); white-space: nowrap; border: 0; } -.start-title { display: flex; align-items: center; gap: 12px; } -.start-count { border: 1px solid var(--border-soft); border-radius: 20px; padding: 3px 9px; font-size: 12px; color: var(--text-dim); } .start-card { min-height: clamp(256px, 22vh, 320px); box-shadow: var(--shadow); } .start-ic { flex: none; width: 42px; height: 42px; border: 1px solid color-mix(in srgb, var(--accent) 15%, transparent); } .start-ic .ic { width: 22px; height: 22px; } diff --git a/app/static/style.css b/app/static/style.css index 3e4cbd24..ab097f58 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -7,6 +7,7 @@ --topbar-height: 56px; --tool-h: 2.1rem; /* a page's buttons and a table's controls: as tall as a small button with its icon */ --h1-size: clamp(1.75rem, 2.5vw, 2.15rem); + --head-gap: 1.5rem; /* under a page's head, on every page */ --nav-hover: #32363d; --nav-text: #d6d9df; color-scheme: dark; @@ -263,7 +264,7 @@ h1 { font-size: var(--h1-size); font-weight: 500; line-height: 1.22; letter-spac /* the page head (templates/_page.html): the title flush left, one line under it, the page's buttons right of the title's first line and centred on it; on a narrow screen the buttons go under, flush left. One gap under it. */ -.page-head { --h1-line: calc(var(--h1-size) * 1.22); display: grid; grid-template-columns: minmax(0, 1fr) auto; gap: .5rem 1.5rem; margin: 0 0 1.5rem; } +.page-head { --h1-line: calc(var(--h1-size) * 1.22); display: grid; grid-template-columns: minmax(0, 1fr) auto; gap: .5rem 1.5rem; margin: 0 0 var(--head-gap); } .page-head > h1 { grid-column: 1; grid-row: 1; overflow-wrap: anywhere; } .page-head-mark { display: inline-flex; align-items: center; height: var(--h1-line); margin-right: .45em; vertical-align: top; } .page-head .page-head-mark > * { width: calc(var(--h1-size) * .9); height: calc(var(--h1-size) * .9); } @@ -1168,7 +1169,6 @@ pre.msg { color: var(--text); max-height: 220px; } .cat-other .cat-dot, .chip.cat-other::before { background: var(--text-faint); } .setup-wrap { max-width: 720px; margin: 7vh auto 0; text-align: center; } -.setup-wrap h1 { font-size: 2rem; } .setup-wrap .subtitle { justify-content: center; font-size: .95rem; } .setup-card { background: var(--surface); border: 1px solid var(--border); border-radius: 14px; padding: 2.25rem 2.5rem; margin-top: 1.75rem; text-align: left; } .field-label { font-size: .74rem; text-transform: uppercase; letter-spacing: .09em; color: var(--text-dim); font-weight: 500; margin-bottom: .55rem; } diff --git a/app/static/workspaces/workspaces.css b/app/static/workspaces/workspaces.css index d1d7d456..91f3d3a0 100644 --- a/app/static/workspaces/workspaces.css +++ b/app/static/workspaces/workspaces.css @@ -1,5 +1,4 @@ /* The Workspaces page: one row per workspace; its roots in a dialog (the Launches page's, runs/launches.css). */ -.ws-head { justify-content: space-between; align-items: center; } .ws-current td { background: var(--accent-soft); } .ws-current .count-btn { border-color: var(--text-faint); } /* the plain border blends into the open row */ .ws-show { display: inline-flex; flex-wrap: wrap; align-items: center; gap: 2px .4rem; } diff --git a/app/templates/runs/feasibility.html b/app/templates/runs/feasibility.html index af04743d..bf2cc289 100644 --- a/app/templates/runs/feasibility.html +++ b/app/templates/runs/feasibility.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}Feasibility · {{ job.job_id }} — Nullius{% endblock %} {% block crumb %}/ {{ job.job_id }} / feasibility{% endblock %} {% block head %} @@ -37,13 +38,12 @@ {% endblock %} {% block body %} -
-

Feasibility check

{{ job.job_id }}
+{% set sub %}{{ job.job_id }}{% endset %} +{{ page_head('Feasibility check', sub=sub) }}

Is each task feasible: can an empty solution fail, and can a reference solution pass? Harbor's nop and oracle controls answer that per task. It says nothing about whether an agent will succeed.

-
Task scope{{ report.scope }}
diff --git a/app/templates/runs/index.html b/app/templates/runs/index.html index 0fe61628..49316d72 100644 --- a/app/templates/runs/index.html +++ b/app/templates/runs/index.html @@ -1,5 +1,6 @@ {% from 'runs/_runtime.html' import what_ran, shard_link %} {% from '_tables.html' import heads, check_cell, controls %} +{% from '_page.html' import page_head %} {% from 'runs/_launch_ask.html' import delete_ask, dialogs %} {% extends "base.html" %} {% block title %}Runs — Nullius{% endblock %} @@ -71,18 +72,14 @@ {% block body %} -

Runs

- - Import - New run -
-{# Runs and trials are agents only: a control's trials are a check on the tasks, not results. - The checks are counted apart, as each launch counts them. #} -

- {{ launches|length }} launch{{ '' if launches|length == 1 else 'es' }}·{{ n_agent_runs }} run{{ '' if n_agent_runs == 1 else 's' }}·{{ n_trials }} trial{{ '' if n_trials == 1 else 's' }} - {%- if n_checks %}·{{ n_checks }} check{{ '' if n_checks == 1 else 's' }}{% endif %} -

+{#- Runs and trials are agents only: a control's trials are a check on the tasks, not results. + The checks are counted apart, as each launch counts them. #} +{% set counts %} + {{- launches|length }} launch{{ '' if launches|length == 1 else 'es' }}·{{ n_agent_runs }} run{{ '' if n_agent_runs == 1 else 's' }}·{{ n_trials }} trial{{ '' if n_trials == 1 else 's' }} + {%- if n_checks %}·{{ n_checks }} check{{ '' if n_checks == 1 else 's' }}{% endif %}{% endset %} +{% set actions %}Import + New run{% endset %} +{{ page_head('Runs', sub=counts, actions=actions) }}

{%- if workspace %}in {{ workspace.label }}{% endif -%} {%- for s, n in states|dictsort %}{{ n }} {{ s }}{% endfor -%} diff --git a/app/templates/runs/job.html b/app/templates/runs/job.html index 4a6128a0..8c9d1570 100644 --- a/app/templates/runs/job.html +++ b/app/templates/runs/job.html @@ -1,14 +1,14 @@ {% from 'runs/_execution.html' import execution_strip %} {% from 'traces/_attempts.html' import attempt_count %} {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}{{ job.job_id }} — Nullius{% endblock %} {% block crumb %}/ {{ job.job_id }}{% endblock %} {% block head %} {% endblock %} {% block body %} -

-

{{ job.job_id }}

+{% set meta %}
{% if job.agent_label %}{{ job.agent_label }}{% if job.agent_version %} v{{ job.agent_version }}{% endif %}{% endif %} {{ job.model_name }} @@ -21,17 +21,16 @@ {{ job.trials|length }}{% if job.n_planned and job.n_planned != job.trials|length %} of {{ job.n_planned }} planned{% endif %} trials {% if job.n_retries %}{{ job.n_retries }} retried{% endif %} {% if job.duration_min %}{{ job.duration_min|runtime }}{% endif %} -
-
+
{% endset %} +{% set actions %} {% if execution and execution.plan.recipe %}New run like this {% else %}New run like this{% endif %} {% set controls = feasibility_controls(job) %}{% if controls %}Feasibility · {{ controls|join(' + ') }}{% endif %} {% if job.harbor_command %}{% endif %} -
- + title="{{ job.harbor_command }}">Copy command{% endif %}{% endset %} +{{ page_head(job.job_id, sub=meta, actions=actions) }} {% if execution %}{{ execution_strip(execution, csrf, own=own if execution.plan.steps()|length > 1 else none, deletable=deletable) }}{% endif %} {% if job.is_preparing and not live_board and not ended %} diff --git a/app/templates/runs/launches.html b/app/templates/runs/launches.html index 568e4f98..ae5ff156 100644 --- a/app/templates/runs/launches.html +++ b/app/templates/runs/launches.html @@ -1,6 +1,7 @@ {% from '_tables.html' import table, cell, greyed %} {% from 'runs/_launch_ask.html' import delete_ask, dialogs %} {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}Launches — Nullius{% endblock %} {% block crumb %}/ launches{% endblock %} {% block head %} @@ -26,7 +27,7 @@ {% macro entry(e) %}{% if e[1] %}{{ e[0] }}{% else %}{{ e[0] }}{% endif %}{% endmacro %} {% block body %} -

Launches

+{{ page_head('Launches') }} {% if rows %} {% set cols = [dict(key='state', label='State', type='num', align='left', sticky=true, sr=true, fixed=true), dict(key='launch', label='Launch', sticky=true, menu=false, width='expand'), diff --git a/app/templates/runs/preparing.html b/app/templates/runs/preparing.html index 004d6b45..fb4e35db 100644 --- a/app/templates/runs/preparing.html +++ b/app/templates/runs/preparing.html @@ -1,14 +1,13 @@ {% from 'runs/_execution.html' import execution_strip %} {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}{{ job_id }} — Nullius{% endblock %} {% block crumb %}/ {{ job_id }}{% endblock %} {% block head %}{% endblock %} {% block body %} -
-

{{ job_id }}

+{{ page_head(job_id) }} {% if ex.plan.runner == 'harbor' %}

Started from the builder. This page becomes the live board as soon as Harbor writes the job.

{% elif ex.plan.runner == 'standard' %}

Started from the builder with Nullius. This page becomes the live board as soon as the install is done and the run starts.

{% else %}

Started from the builder with the {{ ex.plan.runner }} runner. This page becomes the live board as soon as this arm's questions are chosen, after the install.

{% endif %} -
{{ execution_strip(ex, csrf, waiting=true, own=own, deletable=deletable) }} {% endblock %} diff --git a/app/templates/runs/reconcile.html b/app/templates/runs/reconcile.html index 179792ff..ba7d58be 100644 --- a/app/templates/runs/reconcile.html +++ b/app/templates/runs/reconcile.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}Classifier vs judge · {{ job.job_id }} — Nullius{% endblock %} {% block crumb %}/ {{ job.job_id }} / classifier vs judge{% endblock %} {% block head %} @@ -15,13 +16,12 @@ {% endblock %} {% block body %} -
-

Classifier vs judge experimental

{{ job.job_id }}
+{% set sub %}experimental{{ job.job_id }}{% endset %} +{{ page_head('Classifier vs judge', sub=sub) }}

The recorded outcome is the classifier's deterministic reading of the exception, verifier and patch; the judge's failure_cause is its reading of the transcript. Where they disagree is listed first. The recorded outcome never changes.

-
{% if not view.applies %}
This is a control run ({{ job.agent_label }}): its outcomes are a check on the tasks and the verifier, not an agent's attempt, so a failure cause over its transcript has nothing to reconcile with.
diff --git a/app/templates/runs/setup.html b/app/templates/runs/setup.html index 533a0da9..170b2388 100644 --- a/app/templates/runs/setup.html +++ b/app/templates/runs/setup.html @@ -1,17 +1,14 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}{{ 'New workspace' if mode == 'new' else 'Import runs' }} — Nullius{% endblock %} {% block crumb %}/ {{ 'new workspace' if mode == 'new' else 'import' }}{% endblock %} {% block head %}{% endblock %} {% block body %}
+ {{ page_head('Add runs to ' ~ (target or workspace).label if mode == 'add' else 'New workspace' if mode == 'new' else 'Import runs') }} {% if mode == 'add' %} -

Add runs to {{ (target or workspace).label }}

Harbor{% if IMPORTERS %}, {{ IMPORTERS|join(' and ') }}{% endif %} output, recognised by shape.

- {% elif mode == 'new' %} -

New workspace

-

Point it at run folders on this machine, or drop them here.

{% else %} -

Import runs

Point it at run folders on this machine, or drop them here.

{% endif %} diff --git a/app/templates/runs/start.html b/app/templates/runs/start.html index b1f684a4..9f997dbb 100644 --- a/app/templates/runs/start.html +++ b/app/templates/runs/start.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}Runs — Nullius{% endblock %} {% block crumb %}/ runs{% endblock %} {% block head %}{% endblock %} @@ -6,10 +7,7 @@ {# No workspace open: the two ways to have runs - start one, or bring the ones made elsewhere - then the workspaces already here, and the mark last. #}
-
-

Runs

0 runs
-

Your next experiment starts here.

-
+ {{ page_head('Runs', sub='0 runs') }}
diff --git a/app/templates/workspaces/workspaces.html b/app/templates/workspaces/workspaces.html index 9dd1f398..2c273c37 100644 --- a/app/templates/workspaces/workspaces.html +++ b/app/templates/workspaces/workspaces.html @@ -1,5 +1,6 @@ {% from '_tables.html' import table, cell, greyed %} {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}Workspaces — Nullius{% endblock %} {% block crumb %}/ workspaces{% endblock %} {% block head %} @@ -10,8 +11,8 @@ {% macro ws_tr(ws) %} class="{{ 'ws-current' if workspace and ws.name == workspace.name }}" data-ws="{{ ws.name }}" data-search="{{ ws.label }} {{ ws.name }}" data-holder{% endmacro %} {% block body %} -

Workspaces

- New workspace
+{% set actions %}New workspace{% endset %} +{{ page_head('Workspaces', actions=actions) }} {% if workspaces %} {% set labels = workspaces|map(attribute='label')|list %} diff --git a/app/ui_tests/test_controls_apart.py b/app/ui_tests/test_controls_apart.py index f9267afa..69db5361 100644 --- a/app/ui_tests/test_controls_apart.py +++ b/app/ui_tests/test_controls_apart.py @@ -86,7 +86,7 @@ def get(self, path): return response.get_data(as_text=True) def header(self, html): - return text_of(re.search(r'

', html, re.S).group(0)) + return text_of(re.search(r'

.*?
', html, re.S).group(0)) def row(self, html, job_id): rows = [r for r in re.findall(r']*>.*?', html, re.S) if '' % job_id in r] @@ -189,7 +189,7 @@ def test_a_control_row_shows_its_verdict_and_sorts_apart(self): # -- the job page ----------------------------------------------------------- def test_the_job_page_of_a_control_reads_its_header_the_same_way(self): html = self.get("/job/tau-x-nop") - header = re.search(r'
.*?
', html, re.S).group(0) + header = re.search(r'
.*?
', html, re.S).group(0) self.assertIn('id="control-verdict" data-state="ok"', header) self.assertIn("5/5 rejected ✓", text_of(header)) self.assertIn("Feasibility · nop + oracle", text_of(header)) diff --git a/app/ui_tests/test_run_routes.py b/app/ui_tests/test_run_routes.py index 4a140738..ef385a4c 100644 --- a/app/ui_tests/test_run_routes.py +++ b/app/ui_tests/test_run_routes.py @@ -1002,7 +1002,7 @@ def test_one_name_column_and_no_open(self): self.assertNotIn('', row) # no two labels alike self.assertNotIn("workspaces/open", html.split('id="workspaces" data-table>', 1)[1]) # no Open, no "runs →" self.assertNotIn("runs →", html) - self.assertRegex(html, r'

Workspaces

\s*
.*?New workspace') + self.assertRegex(html, r'

Workspaces

\s*
.*?New workspace') def test_two_labels_alike_show_their_names(self): twin = workspace.create(self.home, [], label="witty pelican") @@ -1110,7 +1110,7 @@ def test_runs_and_checks_count_as_the_runs_and_launches_pages_count_them(self): web.shared.adopt_roots([str(d / "jobs")]) listed = self.cell(self.ws, 2), self.cell(self.ws, 3) page = self.get("/runs").get_data(as_text=True) - header = re.search(r'data-runs="(\d+)"', page).group(1), re.search(r"(\d+) checks\s*

", page).group(1) + header = re.search(r'data-runs="(\d+)"', page).group(1), re.search(r"(\d+) checks\s*", page).group(1) rows = [LaunchesPage.cells(self, r) for r in re.findall(r'', self.get("/launches").get_data(as_text=True), re.S) if self.ws.name in re.search(r'data-f-ws="([^"]*)"', r).group(1).split("\n")] launched = str(sum(int(r["runs"]) for r in rows)), str(sum(int(r["checks"]) for r in rows)) From 79d8affdbe10f80830174bc5ead0293a082f4720 Mon Sep 17 00:00:00 2001 From: Harenome Ranaivoarivony-Razanajato Date: Wed, 18 Nov 2026 15:03:10 +0100 Subject: [PATCH 3/8] feat(catalogue): head the catalogue pages with the page head Benchmarks, a benchmark, its Harbor form, Agents, Capabilities, an agent or a capability, Kits and a kit. A benchmark's tags move from above its title to the line under it, its logo before the title; an agent's and a kit's title leaves its card. The Agents and Capabilities count drops its protocol notes. --- app/static/catalogue/catalogue.css | 29 +++---------------------- app/static/style.css | 4 ++-- app/templates/agents/entry.html | 23 +++++++++----------- app/templates/agents/kits.html | 9 +++++--- app/templates/agents/standard.html | 13 +++-------- app/templates/catalogue/benchmark.html | 24 ++++++++++---------- app/templates/catalogue/benchmarks.html | 12 +++------- app/templates/catalogue/new.html | 18 ++++++--------- app/templates/catalogue/use_bundle.html | 2 +- app/ui_tests/test_agents.py | 6 ++--- 10 files changed, 49 insertions(+), 91 deletions(-) diff --git a/app/static/catalogue/catalogue.css b/app/static/catalogue/catalogue.css index 9b23111e..6064e35b 100644 --- a/app/static/catalogue/catalogue.css +++ b/app/static/catalogue/catalogue.css @@ -1,9 +1,6 @@ /* Benchmarks: two shelves of cards, official then community; a card opens its benchmark's page. */ .bench-index, .bench-page { width: 100%; max-width: 1120px; margin: 0 auto; } .bench-index:not(.bench-new) { max-width: 1320px; } -.bench-index-head { display: flex; flex-wrap: wrap; align-items: flex-end; justify-content: space-between; gap: 16px; margin-bottom: 20px; } -.bench-index-head h1 { margin: 0; font-size: 30px; font-weight: 500; letter-spacing: -.01em; } -.bench-count { margin: 6px 0 0; color: var(--text-dim); font-size: 14px; } /* the cards' controls row, under the title */ .bench-index > .table-controls { margin: 0 0 24px; } .bench-shelf { margin: 0 0 34px; } @@ -35,8 +32,6 @@ .bench-harness { font: 12px var(--mono); color: var(--text-faint); } .bench-card-title { display: flex; align-items: center; gap: 10px; font-size: 20px; font-weight: 500; letter-spacing: -.01em; } .bench-mark { flex: none; width: 22px; height: 22px; color: var(--accent); } -.bench-head h1 { display: flex; align-items: center; gap: 14px; } -.bench-head h1 .bench-mark { width: 32px; height: 32px; } .bench-card-domain { margin-top: -6px; font-size: 14px; line-height: 1.5; color: var(--text-dim); } /* up to three stats in columns of one width, each its label then its value */ .bench-stats { display: grid; grid-template-columns: repeat(3, minmax(min-content, 1fr)); gap: 8px; margin: auto 0 0; padding-top: 14px; border-top: 1px solid var(--border-soft); } @@ -48,14 +43,7 @@ .bench-none { color: var(--text-dim); font-size: 14px; } /* A benchmark's page: what it is, what runs it, its datasets, its limits, how to cite it. */ -.bench-head { display: flex; flex-wrap: wrap; justify-content: space-between; align-items: flex-start; gap: 20px; margin-bottom: 24px; } -.bench-head-copy { flex: 1 1 480px; min-width: 0; display: flex; flex-direction: column; gap: 12px; } -.bench-tags { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; } -.bench-tags .chip { font-size: 12px; } -.bench-head h1 { margin: 0; font-size: 36px; font-weight: 500; letter-spacing: -.015em; } -.bench-domain { margin: 0; max-width: 62ch; font-size: 16px; line-height: 1.55; color: var(--text-dim); } -.bench-actions { display: flex; flex-wrap: wrap; gap: 10px; } -.bench-actions .btn { min-height: 44px; } +.bench-domain { margin: 0 0 24px; max-width: 62ch; font-size: 16px; line-height: 1.55; color: var(--text-dim); } .bench-blocked { margin: 0 0 28px; padding: 12px 16px; border: 1px solid var(--border); border-radius: 10px; background: var(--surface-2); font-size: 14px; line-height: 1.55; color: var(--text); } .bench-body { display: flex; flex-wrap: wrap; align-items: flex-start; gap: 32px; } .bench-main { flex: 999 1 560px; min-width: 0; display: flex; flex-direction: column; gap: 40px; } @@ -109,7 +97,6 @@ .bench-tree { margin: 0; overflow-x: auto; font: 12.5px/1.8 var(--mono); color: var(--text-dim); background: var(--surface); border: 1px solid var(--border-soft); border-radius: 10px; padding: 12px 14px; } @media (min-width: 1100px) { .bench-aside { position: sticky; top: calc(var(--topbar-height) + 16px); } } @media (max-width: 640px) { - .bench-head h1 { font-size: 28px; } .bench-rows > div { grid-template-columns: minmax(0, 1fr); gap: 6px; } .bench-cols { grid-template-columns: minmax(0, 1fr); } } @@ -136,9 +123,6 @@ /* Add a Harbor benchmark: two steps, the dataset read from Harbor, then the entry. */ /* Add at the right of the title */ -.bench-head-tools { display: flex; align-items: flex-end; gap: 12px; flex: 0 1 auto; } -.bench-head-tools .btn { min-height: 44px; white-space: nowrap; flex: none; } -@media (max-width: 640px) { .bench-head-tools { flex-wrap: wrap; width: 100%; } } .bench-new { max-width: 860px; } .nb-step { background: var(--surface); border: 1px solid var(--border-soft); border-radius: 12px; padding: 20px; margin: 0 0 18px; } .nb-step h2 { display: flex; align-items: center; gap: 10px; margin: 0 0 16px; font-size: 16px; font-weight: 500; } @@ -174,7 +158,6 @@ .nb-save { display: flex; justify-content: flex-end; gap: 10px; margin-bottom: 40px; } /* Delete on a benchmark's page: the button opens its question in place, under the actions */ -.bench-actions { position: relative; } .bench-delete summary { list-style: none; } .bench-delete summary::-webkit-details-marker { display: none; } .btn.danger, .bench-delete summary.btn.ghost.danger { color: var(--bad); border-color: color-mix(in srgb, var(--bad) 45%, var(--border)); } @@ -184,10 +167,8 @@ width: min(420px, calc(100vw - 32px)); padding: 14px; background: var(--surface); border: 1px solid var(--bad); border-radius: 10px; box-shadow: 0 12px 32px #0005; font-size: 14px; } .bench-delete-ask span { flex: 1 1 100%; } .catalogue-restore[open] summary { border-color: var(--accent); } -.catalogue-restore, .bench-actions:has(.catalogue-restore) { min-width: 0; max-width: 100%; } +.catalogue-restore, .page-head-actions:has(.catalogue-restore) { min-width: 0; max-width: 100%; } .catalogue-restore .bench-delete-ask { position: static; width: 420px; max-width: 100%; box-sizing: border-box; margin-top: 8px; border-color: var(--border); } -.std-head.std-entry-head { flex-wrap: wrap; align-items: flex-start; } -.std-entry-head > .bench-actions { margin-left: auto; } .nb-msg { font-size: 13px; font-weight: 400; color: var(--text-dim); } .nb-msg.bad { color: var(--bad); } .bench-new input.invalid { border-color: var(--bad); } @@ -220,10 +201,7 @@ .std-problems { border: 1px solid var(--bad); border-radius: 10px; padding: 12px 16px; margin: 0 0 18px; font-size: 13px; } .std-problems strong { color: var(--bad); } .std-card { padding: 22px; border-radius: 12px; background: var(--surface); border: 1px solid var(--border-soft); margin: 0 0 18px; } -.std-head { display: flex; gap: 14px; align-items: center; } -.std-head h2 { margin: 0 0 6px; font-size: 20px; } .std-mark { width: 40px; height: 40px; border-radius: 10px; display: grid; place-items: center; background: var(--accent-soft); color: var(--accent); font: 500 18px/1 var(--mono); flex: none; } -.std-tags { display: flex; flex-wrap: wrap; gap: 6px; } .std-tag { padding: 2px 9px; border: 1px solid var(--border); border-radius: 5px; font: 11px/1.5 var(--mono); color: var(--text-dim); } .std-versions { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; margin: 4px 0 14px; } .std-versions > span { font-size: 12px; color: var(--text-dim); margin-right: 4px; } @@ -231,7 +209,7 @@ .std-versions a b { font: 500 13px/1.3 var(--mono); } .std-versions a small { font-size: 11px; color: var(--text-dim); } .std-versions a[aria-current="page"] { border-color: var(--accent); background: color-mix(in srgb, var(--accent) 10%, transparent); } -.std-summary { margin: 14px 0 4px; line-height: 1.6; } +.std-summary { margin: 0 0 4px; line-height: 1.6; } .std-source { margin: 16px 0 22px; padding: 16px; border: 1px solid var(--border-soft); border-radius: 10px; background: var(--bg); } .std-source h2 { margin: 0 0 12px; font-size: 15px; font-weight: 500; } .std-source-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(220px, 100%), 1fr)); gap: 12px 20px; margin: 0; } @@ -266,7 +244,6 @@ @media (max-width: 760px) { .std-cols, .std-form { grid-template-columns: 1fr; } } .std-mark.small { width: 28px; height: 28px; border-radius: 8px; font-size: 14px; } .std-clamp { display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; overflow: hidden; } -.std-head h1 { margin: 0 0 6px; } dialog.std-how { width: min(880px, calc(100vw - 32px)); max-height: calc(100vh - 64px); overflow: auto; padding: 24px 28px; border: 1px solid var(--border); border-radius: 14px; background: var(--surface); color: var(--text); line-height: 1.6; font-size: 14px; } dialog.std-how::backdrop { background: rgba(0, 0, 0, .45); } .std-how-head { display: flex; justify-content: space-between; align-items: center; gap: 12px; } diff --git a/app/static/style.css b/app/static/style.css index ab097f58..7dddf644 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -270,7 +270,7 @@ h1 { font-size: var(--h1-size); font-weight: 500; line-height: 1.22; letter-spac .page-head .page-head-mark > * { width: calc(var(--h1-size) * .9); height: calc(var(--h1-size) * .9); } .page-head-sub { grid-column: 1 / -1; display: flex; flex-wrap: wrap; align-items: center; gap: .35rem .6rem; min-width: 0; color: var(--text-dim); font-size: .9rem; line-height: 1.5; } .page-head-sub .mono { color: var(--text); overflow-wrap: anywhere; } -.page-head-actions { grid-column: 2; grid-row: 1; align-self: start; display: flex; flex-wrap: wrap; justify-content: flex-end; align-items: center; gap: .5rem; +.page-head-actions { position: relative; grid-column: 2; grid-row: 1; align-self: start; display: flex; flex-wrap: wrap; justify-content: flex-end; align-items: center; gap: .5rem; margin-top: calc((var(--h1-line) - var(--tool-h)) / 2); } .page-head-actions :is(.btn, .nb-button) { height: var(--tool-h); padding-block: 0; } main .page-head + * { margin-top: 0; } /* the head's gap is the only one */ @@ -284,7 +284,7 @@ h3 { font-size: .72rem; margin: 1.25rem 0 .6rem; color: var(--text-dim); text-transform: uppercase; letter-spacing: .09em; font-weight: 500; } h3 .total { margin-left: .15rem; color: var(--text); font-weight: 600; text-transform: none; letter-spacing: normal; } .subtitle { color: var(--text-dim); font-size: .9rem; line-height: 1.75; margin: .75rem 0 1.75rem; max-width: 105ch; } -.subtitle .mono { color: var(--text); } +.subtitle .mono { color: var(--text); overflow-wrap: anywhere; } .muted { color: var(--text-dim); } .dot { color: var(--text-faint); margin: 0 .5rem; } diff --git a/app/templates/agents/entry.html b/app/templates/agents/entry.html index e3ce4188..19e2466a 100644 --- a/app/templates/agents/entry.html +++ b/app/templates/agents/entry.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% from "catalogue/use_bundle.html" import use_bundle %} {% set plural = 'Agents' if kind == 'agent' else 'Capabilities' %} {% block title %}{{ title }} — Nullius{% endblock %} @@ -8,20 +9,16 @@ {# One of the standard's agents (or capabilities): its definition, the ports it proved, what it can run. docs/standard.md #}
{% set d = e.d %} + {% set tags %} + {% if kind == 'capability' %}{{ d.kind }}{% endif %} + {{ e.protocol }} + {% if d.example %}example{% endif %} + {% if versions %}{{ 'default version' if d._version == d._default else 'not the default version' }}{% endif %} + {% endset %} + {% set actions %}{% if restore_bundle and local %}{{ use_bundle('agents' if kind == 'agent' else 'capabilities', d.key, csrf) }}{% endif %}{% endset %} + {% set mark %}{{ agent_mark(kind, d.key, d.label) }}{% endset %} + {{ page_head(d.label, sub=tags, actions=actions, mark=mark, id='std-' ~ d.key) }}
-
- -
-

{{ d.label }}

-
- {% if kind == 'capability' %}{{ d.kind }}{% endif %} - {{ e.protocol }} - {% if d.example %}example{% endif %} - {% if versions %}{{ 'default version' if d._version == d._default else 'not the default version' }}{% endif %} -
-
- {% if restore_bundle and local %}
{{ use_bundle('agents' if kind == 'agent' else 'capabilities', d.key, csrf) }}
{% endif %} -

{{ d.summary }}

{% if versions %} {# Each version has its own pins and its own proofs: a new release is offered only once it has proven its ports. #} diff --git a/app/templates/agents/kits.html b/app/templates/agents/kits.html index 74c8909d..1ec9413a 100644 --- a/app/templates/agents/kits.html +++ b/app/templates/agents/kits.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}{{ entry.label ~ ' kit' if entry else 'Kits' }} — Nullius{% endblock %} {% block crumb %}/ kits{% if entry %} / {{ entry.label }}{% endif %}{% endblock %} {% block head %} @@ -7,8 +8,10 @@ {% block body %} {% if entry %} {% set d = entry.d %} -
-

{{ entry.label }} kit

{{ entry.port }}v{{ entry.version }}{{ d.datasets|sum(attribute='units') }} checks
+
+ {% set tags %}{{ entry.port }}v{{ entry.version }}{{ d.datasets|sum(attribute='units') }} checks{% endset %} + {{ page_head(entry.label ~ ' kit', sub=tags) }} +

{{ d.summary }}

Pass criteria

{{ d.score.says }}.

Every basic check must pass to prove this port.

{% if d.get('skills') %}

Skills

{% for name, description in d.skills.items() %}
{{ name }}
{{ description }}
{% endfor %}

Skills are recorded separately from the basic port proof.

{% endif %} @@ -37,7 +40,7 @@

Checks

{% else %}
-

Kits

{{ items|length }} conformance kits

+ {{ page_head('Kits', sub=items|length ~ ' conformance kits') }} {#- A card's fields (web/agents.py `_kit_card`); the family's pills filter them. #} {% set cols = [dict(key='family', label='Family', card='tag', class='std-tag', filter='pills'), dict(key='version', label='Version', card='meta'), dict(key='title', label='Name', card='title'), dict(key='port', label='Port', card='text', style='code'), diff --git a/app/templates/agents/standard.html b/app/templates/agents/standard.html index 5f1effac..42c5b91e 100644 --- a/app/templates/agents/standard.html +++ b/app/templates/agents/standard.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% set plural = 'Agents' if kind == 'agent' else 'Capabilities' %} {% block title %}{{ plural }} — Nullius{% endblock %} {% block crumb %}/ {{ plural|lower }}{% endblock %} @@ -8,16 +9,8 @@ {% block body %} {# The standard's agents (or capabilities) as cards, as the benchmarks are; a card opens its own page. docs/standard.md #}
-
-
-

{{ plural }}

-

{{ items|length }} {{ plural|lower if items|length != 1 else kind }} · - {% if kind == 'agent' %}driven over ACP, the benchmark's tools served over MCP{% else %}driven over JSON lines{% endif %} · every model call through the relay

-
-
- -
-
+ {% set actions %}{% endset %} + {{ page_head(plural, sub=items|length ~ ' ' ~ (plural|lower if items|length != 1 else kind), actions=actions) }} {% from "catalogue/add_dialog.html" import add_dialog %} {% set a = 'an agent' if kind == 'agent' else 'a capability' %} diff --git a/app/templates/catalogue/benchmark.html b/app/templates/catalogue/benchmark.html index ec8adfb8..81ff62d5 100644 --- a/app/templates/catalogue/benchmark.html +++ b/app/templates/catalogue/benchmark.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% from "catalogue/use_bundle.html" import use_bundle %} {% block title %}{{ b.title }} — Nullius{% endblock %} {% block crumb %}/ benchmarks / {{ b.key }}{% endblock %} @@ -7,20 +8,16 @@ {% set ds = cat.datasets_of(b) %}{% set tasks = cat.tasks_of(b) %}{% set files = cat.files(b.key) %} {% set ways = (['the Nullius standard'] if 'standard' in b.harness else []) + (['Harbor'] if 'harbor' in b.harness else []) %}{% set runs_with = ways|join(' or ') if ways else 'no harness here' %}
-
-
-
{% if b.category %}{{ b.category }}{% endif %}{{ b.label }}
-

{{ b.title }}

- {% if b.domain %}

{{ b.domain }}

{% endif %} -
-
- {% if b.usable_routes %}Build a run {% endif %} - {% if b.citation %}Cite{% endif %} - {% if editable %}Edit{% endif %} + {% set mark %}{% endset %} + {% set tags %}{% if b.category %}{{ b.category }}{% endif %}{{ b.label }}{% endset %} + {% set actions %} + {% if b.usable_routes %}Build a run {% endif %} + {% if b.citation %}Cite{% endif %} + {% if editable %}Edit{% endif %} {#- deleting asks first, in place: the button opens the question, never a dialog #} {% if restore_bundle %}{% if local %}{{ use_bundle('benchmarks', b.key, csrf) }}{% endif %} {% elif editable and deletable %}
- Delete + Delete
Delete {{ b.key }} and its folder? Runs made from it stay. @@ -28,8 +25,9 @@

{% endif %} -
-
+ {% endset %} + {{ page_head(b.title, sub=tags, actions=actions, mark=mark) }} + {% if b.domain %}

{{ b.domain }}

{% endif %} {% if b.blocker %}

No usable route — {{ b.blocker }}

{% endif %}
diff --git a/app/templates/catalogue/benchmarks.html b/app/templates/catalogue/benchmarks.html index 2f37cdc7..b5f7085f 100644 --- a/app/templates/catalogue/benchmarks.html +++ b/app/templates/catalogue/benchmarks.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}Benchmarks — Nullius{% endblock %} {% block crumb %}/ benchmarks{% endblock %} {% block head %} @@ -8,15 +9,8 @@ {% set listed = cat.listed_benchmarks %} {% set count = namespace(datasets=0) %}{% for b in listed %}{% set count.datasets = count.datasets + b.datasets|length %}{% endfor %}
-
-
-

Benchmarks

-

{{ listed|length }} benchmarks · {{ count.datasets }} datasets

-
-
- -
-
+ {% set actions %}{% endset %} + {{ page_head('Benchmarks', sub=listed|length ~ ' benchmarks · ' ~ count.datasets ~ ' datasets', actions=actions) }} {#- Two routes in: the Nullius standard (a paper's own scripts as its Original setup), or Harbor. The assistant asks which (the import-benchmark skill); by hand, each route has its own way. #} diff --git a/app/templates/catalogue/new.html b/app/templates/catalogue/new.html index 0838ad7d..5dc53616 100644 --- a/app/templates/catalogue/new.html +++ b/app/templates/catalogue/new.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {#- one form, two uses: `editing` is the key of the entry being changed, or none to add one #} {% block title %}{{ 'Edit ' ~ values.get('title', editing) if editing else 'Add a Harbor benchmark' }} — Nullius{% endblock %} {% block crumb %}/ benchmarks / {% if editing %}{{ editing }} / edit{% else %}add{% endif %}{% endblock %} @@ -10,17 +11,12 @@ {{ title }}{% if sub %}{{ sub }}{% endif %} {% endmacro %}
-
-
- {% if editing %} -

Edit {{ values.get('title') or editing }}

-

Saving writes {{ catalogue_dir }}/benchmarks/{{ editing }}/benchmark.json; the entry's other files and fields are kept.

- {% else %} -

Add a Harbor benchmark

-

Name the dataset, read it from Harbor, check the entry. Saving writes {{ catalogue_dir }}/benchmarks/<key>/benchmark.json.

- {% endif %} -
-
+ {{ page_head('Edit ' ~ (values.get('title') or editing) if editing else 'Add a Harbor benchmark') }} + {% if editing %} +

Saving writes {{ catalogue_dir }}/benchmarks/{{ editing }}/benchmark.json; the entry's other files and fields are kept.

+ {% else %} +

Name the dataset, read it from Harbor, check the entry. Saving writes {{ catalogue_dir }}/benchmarks/<key>/benchmark.json.

+ {% endif %} {% if not writable %}

Benchmarks are added from a browser on the application host only.

{% endif %} {% if errors %} diff --git a/app/templates/catalogue/use_bundle.html b/app/templates/catalogue/use_bundle.html index 315b8f62..bd1f2ce9 100644 --- a/app/templates/catalogue/use_bundle.html +++ b/app/templates/catalogue/use_bundle.html @@ -1,6 +1,6 @@ {% macro use_bundle(group, key, csrf) -%}
- Use bundled entry + Use bundled entry
Remove your custom files and local proof records for {{ key }}? Saved runs and results stay. diff --git a/app/ui_tests/test_agents.py b/app/ui_tests/test_agents.py index 9acee267..16a00593 100644 --- a/app/ui_tests/test_agents.py +++ b/app/ui_tests/test_agents.py @@ -184,7 +184,7 @@ def test_the_add_dialog_builds_a_prompt_and_keeps_the_steps_by_hand_for_each_kin ("/capabilities", "a capability", ".claude/skills/import-capability/SKILL.md", ("nullius standard new capability my-memory", ""project"", "from my_memory import Store"))): html = self.get(url).get_data(as_text=True) - self.assertIn(f'', html) + self.assertIn(f'', html) self.assertIn('With an assistant<"), html.index(">By hand<")) # the assistant's tab first self.assertIn('aria-selected="true">With an assistant<', html) @@ -210,7 +210,7 @@ def test_the_add_dialog_builds_a_prompt_and_keeps_the_steps_by_hand_for_each_kin def test_an_agents_page_has_its_ports_and_what_it_runs(self): html = self.get("/agents/fake").get_data(as_text=True) - card = html[html.index('id="fake"'):] + card = html[html.index('
'):] self.assertIn("Fake agent", card) self.assertIn(">1/1", card) self.assertIn('Proven', card) # agent.task/v1's record @@ -223,7 +223,7 @@ def test_features_lists_each_feature_by_its_kind(self): self.assertIn("

Capabilities

", html) self.assertIn('href="/capabilities/fakemem"', html) html = self.get("/capabilities/fakemem").get_data(as_text=True) - card = html[html.index('id="fakemem"'):] + card = html[html.index('
'):] self.assertIn('memory', card) self.assertIn("cap.memory/v1", card) self.assertNotIn("agent.task/v1", card) From bda4657ee0464cfa73a549c42d8a8b7e2bc8ca63 Mon Sep 17 00:00:00 2001 From: Harenome Ranaivoarivony-Razanajato Date: Wed, 18 Nov 2026 15:03:47 +0100 Subject: [PATCH 4/8] feat(builder): head the run builder and Recipes with the page head The builder's title takes the one h1 size and loses its sentence; its recipe buttons take the page head's height. --- app/static/builder/command-builder.css | 11 +++++------ app/static/builder/recipes.css | 1 - app/templates/builder/new_run.html | 9 ++++----- app/templates/builder/recipes.html | 7 ++++--- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/static/builder/command-builder.css b/app/static/builder/command-builder.css index 9ef09621..e3350f93 100644 --- a/app/static/builder/command-builder.css +++ b/app/static/builder/command-builder.css @@ -1,7 +1,7 @@ #nullius-builder { --nb-bg: var(--bg); --nb-surface: var(--surface); --nb-soft: var(--surface-2); --nb-text: var(--text); --nb-muted: var(--text-dim); --nb-line: var(--border); --nb-blue: var(--accent); --nb-tint: var(--accent-soft); --nb-ok: var(--ok); --nb-warn: var(--warn); --nb-red: var(--bad); color: var(--text); font: 14px/1.5 var(--sans); text-align: left; } -#nullius-builder *{box-sizing:border-box}#nullius-builder button,#nullius-builder input,#nullius-builder select{font:inherit}#nullius-builder button{cursor:pointer}#nullius-builder button:disabled{cursor:default;opacity:.55}#nullius-builder button:focus-visible,#nullius-builder input:focus-visible,#nullius-builder select:focus-visible,#nullius-builder summary:focus-visible{outline:2px solid var(--nb-blue);outline-offset:3px}#nullius-builder [hidden]{display:none!important}#nullius-builder h1,#nullius-builder h2,#nullius-builder h3,#nullius-builder p{margin:0}#nullius-builder h1{font-size:29px;line-height:1.2;letter-spacing:-1px;font-weight:500}#nullius-builder h2{font-size:19px;font-weight:500;letter-spacing:-.35px}#nullius-builder h3{font-size:14px;font-weight:500}#nullius-builder small{font-size:12px;color:var(--nb-muted)}#nullius-builder strong{font-weight:500}#nullius-builder .nb-mono{font:12px/1.65 var(--mono);overflow-wrap:anywhere}#nullius-builder .nb-heading{display:flex;justify-content:space-between;align-items:flex-start;gap:12px;margin-bottom:23px}#nullius-builder .nb-kicker{font:11px/1.5 var(--mono);letter-spacing:1.2px;color:var(--nb-muted);text-transform:uppercase;margin-bottom:9px}#nullius-builder .nb-heading p{margin-top:8px;color:var(--nb-muted);font-size:13px}#nullius-builder .nb-button{display:inline-flex;align-items:center;justify-content:center;gap:7px;border:1px solid var(--nb-line);color:var(--nb-text);background:var(--nb-surface);border-radius:7px;padding:8px 12px;white-space:nowrap;font-size:12px}#nullius-builder .nb-button:hover{border-color:var(--nb-blue)}#nullius-builder .nb-primary{background:var(--nb-blue);color:var(--nb-bg);border-color:var(--nb-blue)}#nullius-builder svg{width:16px;height:16px}#nullius-builder .nb-steps{display:flex;gap:4px;border-bottom:1px solid var(--nb-line);margin-bottom:24px}#nullius-builder .nb-step{flex:1;display:flex;align-items:center;justify-content:center;gap:7px;padding:12px 3px;background:none;border:0;border-bottom:2px solid transparent;color:var(--nb-muted);font-size:12px}#nullius-builder .nb-step[aria-pressed=true]{color:var(--nb-blue);border-bottom-color:var(--nb-blue)}#nullius-builder .nb-step em{font:11px var(--mono);font-style:normal;color:inherit}#nullius-builder .nb-layout{display:grid;grid-template-columns:minmax(0,1fr) minmax(265px,.68fr);gap:26px;align-items:start}#nullius-builder .nb-editor{min-width:0}#nullius-builder .nb-sectionhead{display:flex;justify-content:space-between;align-items:center;gap:12px;margin-bottom:17px}#nullius-builder .nb-state{font:11px/1.4 var(--mono);color:var(--nb-ok);margin-top:4px;display:block}#nullius-builder .nb-state.warn{color:var(--nb-warn)}#nullius-builder .nb-note{padding:12px 0;color:var(--nb-muted);font-size:12px;line-height:1.7}#nullius-builder .nb-notice{padding:12px 14px;background:var(--nb-soft);border-left:2px solid var(--nb-warn);border-radius:0 6px 6px 0;font-size:12px;color:var(--nb-muted);margin:15px 0}#nullius-builder .nb-notice strong{display:block;color:var(--nb-warn);margin-bottom:3px}#nullius-builder .nb-field{display:grid;gap:7px;color:var(--nb-muted);font-size:12px;margin-bottom:16px}#nullius-builder .nb-field input,#nullius-builder .nb-field select{width:100%;min-width:0;color:var(--nb-text);border:1px solid var(--nb-line);border-radius:7px;background:var(--nb-surface);padding:10px 11px;font-size:13px}#nullius-builder select option{color:var(--nb-text);background:var(--nb-surface)}#nullius-builder .nb-field input[type=checkbox]{width:17px;height:17px;accent-color:var(--nb-blue)}#nullius-builder .nb-two{display:grid;grid-template-columns:1fr 1fr;gap:14px}#nullius-builder input[type=checkbox]{accent-color:var(--nb-blue);width:17px;height:17px;flex-shrink:0}#nullius-builder .nb-subtabs{display:flex;flex-wrap:wrap;gap:4px;margin-bottom:17px}#nullius-builder .nb-subtab{border:0;background:none;color:var(--nb-muted);border-radius:6px;padding:7px 10px;font-size:12px}#nullius-builder .nb-subtab[aria-pressed=true]{background:var(--nb-soft);color:var(--nb-text)}#nullius-builder .nb-bottom{display:flex;justify-content:space-between;align-items:center;gap:12px;border-top:1px solid var(--nb-line);padding-top:18px;margin-top:23px}#nullius-builder .nb-reviewrow{padding:14px 0;border-bottom:1px solid var(--nb-line);display:flex;justify-content:space-between;align-items:center;gap:12px}#nullius-builder .nb-reviewrow small{display:block;margin-bottom:3px}#nullius-builder .nb-reviewrow strong{overflow-wrap:anywhere}#nullius-builder .nb-custom{border:1px solid var(--nb-line);border-radius:8px;padding:13px;margin-bottom:10px;background:var(--nb-surface)}#nullius-builder .nb-custom .nb-field{margin-bottom:9px}#nullius-builder .nb-rowhead{display:flex;justify-content:space-between;align-items:center;margin-bottom:10px}#nullius-builder .nb-remove{border:0;background:none;color:var(--nb-muted);padding:3px 7px}#nullius-builder .nb-error{color:var(--nb-red);font-size:12px;margin-top:8px}#nullius-builder details{border-top:1px solid var(--nb-line);margin-top:16px;padding-top:12px}#nullius-builder summary{cursor:pointer;font-size:12px;color:var(--nb-muted)}#nullius-builder .nb-badge{color:var(--nb-blue);font-size:11px}#nullius-builder .nb-headingactions{display:flex;gap:6px;flex-wrap:wrap;justify-content:flex-end} +#nullius-builder *{box-sizing:border-box}#nullius-builder button,#nullius-builder input,#nullius-builder select{font:inherit}#nullius-builder button{cursor:pointer}#nullius-builder button:disabled{cursor:default;opacity:.55}#nullius-builder button:focus-visible,#nullius-builder input:focus-visible,#nullius-builder select:focus-visible,#nullius-builder summary:focus-visible{outline:2px solid var(--nb-blue);outline-offset:3px}#nullius-builder [hidden]{display:none!important}#nullius-builder h1,#nullius-builder h2,#nullius-builder h3,#nullius-builder p{margin:0}#nullius-builder h2{font-size:19px;font-weight:500;letter-spacing:-.35px}#nullius-builder h3{font-size:14px;font-weight:500}#nullius-builder small{font-size:12px;color:var(--nb-muted)}#nullius-builder strong{font-weight:500}#nullius-builder .nb-mono{font:12px/1.65 var(--mono);overflow-wrap:anywhere}#nullius-builder .nb-kicker{font:11px/1.5 var(--mono);letter-spacing:1.2px;color:var(--nb-muted);text-transform:uppercase;margin-bottom:9px}#nullius-builder .nb-button{display:inline-flex;align-items:center;justify-content:center;gap:7px;border:1px solid var(--nb-line);color:var(--nb-text);background:var(--nb-surface);border-radius:7px;padding:8px 12px;white-space:nowrap;font-size:12px}#nullius-builder .nb-button:hover{border-color:var(--nb-blue)}#nullius-builder .nb-primary{background:var(--nb-blue);color:var(--nb-bg);border-color:var(--nb-blue)}#nullius-builder svg{width:16px;height:16px}#nullius-builder .nb-steps{display:flex;gap:4px;border-bottom:1px solid var(--nb-line);margin-bottom:24px}#nullius-builder .nb-step{flex:1;display:flex;align-items:center;justify-content:center;gap:7px;padding:12px 3px;background:none;border:0;border-bottom:2px solid transparent;color:var(--nb-muted);font-size:12px}#nullius-builder .nb-step[aria-pressed=true]{color:var(--nb-blue);border-bottom-color:var(--nb-blue)}#nullius-builder .nb-step em{font:11px var(--mono);font-style:normal;color:inherit}#nullius-builder .nb-layout{display:grid;grid-template-columns:minmax(0,1fr) minmax(265px,.68fr);gap:26px;align-items:start}#nullius-builder .nb-editor{min-width:0}#nullius-builder .nb-sectionhead{display:flex;justify-content:space-between;align-items:center;gap:12px;margin-bottom:17px}#nullius-builder .nb-state{font:11px/1.4 var(--mono);color:var(--nb-ok);margin-top:4px;display:block}#nullius-builder .nb-state.warn{color:var(--nb-warn)}#nullius-builder .nb-note{padding:12px 0;color:var(--nb-muted);font-size:12px;line-height:1.7}#nullius-builder .nb-notice{padding:12px 14px;background:var(--nb-soft);border-left:2px solid var(--nb-warn);border-radius:0 6px 6px 0;font-size:12px;color:var(--nb-muted);margin:15px 0}#nullius-builder .nb-notice strong{display:block;color:var(--nb-warn);margin-bottom:3px}#nullius-builder .nb-field{display:grid;gap:7px;color:var(--nb-muted);font-size:12px;margin-bottom:16px}#nullius-builder .nb-field input,#nullius-builder .nb-field select{width:100%;min-width:0;color:var(--nb-text);border:1px solid var(--nb-line);border-radius:7px;background:var(--nb-surface);padding:10px 11px;font-size:13px}#nullius-builder select option{color:var(--nb-text);background:var(--nb-surface)}#nullius-builder .nb-field input[type=checkbox]{width:17px;height:17px;accent-color:var(--nb-blue)}#nullius-builder .nb-two{display:grid;grid-template-columns:1fr 1fr;gap:14px}#nullius-builder input[type=checkbox]{accent-color:var(--nb-blue);width:17px;height:17px;flex-shrink:0}#nullius-builder .nb-subtabs{display:flex;flex-wrap:wrap;gap:4px;margin-bottom:17px}#nullius-builder .nb-subtab{border:0;background:none;color:var(--nb-muted);border-radius:6px;padding:7px 10px;font-size:12px}#nullius-builder .nb-subtab[aria-pressed=true]{background:var(--nb-soft);color:var(--nb-text)}#nullius-builder .nb-bottom{display:flex;justify-content:space-between;align-items:center;gap:12px;border-top:1px solid var(--nb-line);padding-top:18px;margin-top:23px}#nullius-builder .nb-reviewrow{padding:14px 0;border-bottom:1px solid var(--nb-line);display:flex;justify-content:space-between;align-items:center;gap:12px}#nullius-builder .nb-reviewrow small{display:block;margin-bottom:3px}#nullius-builder .nb-reviewrow strong{overflow-wrap:anywhere}#nullius-builder .nb-custom{border:1px solid var(--nb-line);border-radius:8px;padding:13px;margin-bottom:10px;background:var(--nb-surface)}#nullius-builder .nb-custom .nb-field{margin-bottom:9px}#nullius-builder .nb-rowhead{display:flex;justify-content:space-between;align-items:center;margin-bottom:10px}#nullius-builder .nb-remove{border:0;background:none;color:var(--nb-muted);padding:3px 7px}#nullius-builder .nb-error{color:var(--nb-red);font-size:12px;margin-top:8px}#nullius-builder details{border-top:1px solid var(--nb-line);margin-top:16px;padding-top:12px}#nullius-builder summary{cursor:pointer;font-size:12px;color:var(--nb-muted)}#nullius-builder .nb-badge{color:var(--nb-blue);font-size:11px} @media(max-width:850px){#nullius-builder .nb-layout{grid-template-columns:1fr}} -@media(max-width:520px){#nullius-builder .nb-heading{flex-direction:column}#nullius-builder .nb-headingactions{justify-content:flex-start}#nullius-builder .nb-step{font-size:11px;gap:3px;flex-direction:column}#nullius-builder .nb-two{grid-template-columns:1fr;gap:0}#nullius-builder h1{font-size:26px}#nullius-builder .nb-field input,#nullius-builder .nb-field select{font-size:16px}} +@media(max-width:520px){#nullius-builder .nb-step{font-size:11px;gap:3px;flex-direction:column}#nullius-builder .nb-two{grid-template-columns:1fr;gap:0}#nullius-builder .nb-field input,#nullius-builder .nb-field select{font-size:16px}} @media(pointer:coarse){#nullius-builder button{min-height:44px}} #nullius-builder .nb-layout { grid-template-columns: minmax(0, 1fr); gap: clamp(24px, 3vw, 48px); } @@ -32,7 +32,7 @@ #nullius-builder .nb-button[aria-disabled=true] { opacity: .55; cursor: default; border-color: var(--nb-line); } /* it cannot here: greyed, its reason the tooltip */ #nullius-builder .nb-field input { scroll-margin-top: 100px; } -@media(max-width:520px) { #nullius-builder .nb-headingactions { gap: 8px; } #nullius-builder .nb-errorlist { padding: 10px; } #nullius-builder .nb-field input { font-size: 16px; } } +@media(max-width:520px) { #nullius-builder .nb-errorlist { padding: 10px; } #nullius-builder .nb-field input { font-size: 16px; } } #nullius-builder h3 { text-transform: none; letter-spacing: -.1px; } #nullius-builder #nb-status:empty { min-height: 0; margin: 0; } @@ -51,11 +51,9 @@ /* Configuration hierarchy: labels lead; help text stays readable. */ #nullius-builder { font-size: 15px; line-height: 1.6; } -#nullius-builder h1 { font-size: 32px; font-weight: 500; } #nullius-builder h2 { font-size: 24px; font-weight: 500; line-height: 1.3; } #nullius-builder h3 { font-size: 18px; font-weight: 500; } #nullius-builder small { font-size: 13px; font-weight: 400; line-height: 1.6; } -#nullius-builder .nb-heading p { font-size: 15px; } #nullius-builder .nb-steps { display: grid; grid-auto-flow: column; grid-auto-columns: minmax(0,1fr); } #nullius-builder .nb-step { font-size: 14px; padding-block: 15px; } #nullius-builder .nb-step em { font-size: 12px; } @@ -74,6 +72,7 @@ #nullius-builder .nb-notice strong { font-size: 15px; font-weight: 500; margin-bottom: 5px; } #nullius-builder summary { font-size: 14px; } #nullius-builder .nb-button { font-size: 14px; padding: 10px 14px; } +#nullius-builder .page-head-actions .nb-button { padding-block: 0; font-size: .8rem; } /* the page head's height, a small button's text */ #nullius-builder .nb-subtab { font-size: 13px; } #nullius-builder .nb-dialog { color: var(--nb-text); background: var(--nb-surface); border: 1px solid var(--nb-line); border-radius: 14px; padding: 30px; width: min(500px,calc(100vw - 32px)); box-shadow: 0 24px 80px #0006; } #nullius-builder .nb-dialog::backdrop { background: #0008; backdrop-filter: blur(3px); } @@ -81,7 +80,7 @@ #nullius-builder .nb-dialog .nb-field { margin-top: 24px; } #nullius-builder .nb-dialogactions { display: flex; justify-content: flex-end; gap: 10px; margin-top: 26px; } #nullius-builder .nb-save-message { min-height: 2em; } -@media(max-width:650px) { #nullius-builder .nb-steps { grid-auto-flow: row; grid-template-columns: repeat(3,minmax(0,1fr)); } #nullius-builder .nb-step { flex-direction: row; font-size: 13px; } #nullius-builder h1 { font-size: 29px; } #nullius-builder h2 { font-size: 22px; } #nullius-builder .nb-categories .nb-subtab { padding: 9px 10px; } #nullius-builder .nb-dialog { padding: 22px; } #nullius-builder .nb-field input, #nullius-builder .nb-field select { font-size: 16px; } } +@media(max-width:650px) { #nullius-builder .nb-steps { grid-auto-flow: row; grid-template-columns: repeat(3,minmax(0,1fr)); } #nullius-builder .nb-step { flex-direction: row; font-size: 13px; } #nullius-builder h2 { font-size: 22px; } #nullius-builder .nb-categories .nb-subtab { padding: 9px 10px; } #nullius-builder .nb-dialog { padding: 22px; } #nullius-builder .nb-field input, #nullius-builder .nb-field select { font-size: 16px; } } /* The effective per-phase limits under the timeout multiplier, live. */ #nullius-builder .nb-timeouts { width: 100%; border-collapse: collapse; margin: 8px 0 6px; font-size: 12px; } #nullius-builder .nb-timeouts th, #nullius-builder .nb-timeouts td { text-align: left; padding: 5px 10px 5px 0; border-bottom: 1px solid var(--nb-line); } diff --git a/app/static/builder/recipes.css b/app/static/builder/recipes.css index a08e2f55..62a393be 100644 --- a/app/static/builder/recipes.css +++ b/app/static/builder/recipes.css @@ -1,5 +1,4 @@ /* The Recipes page: one row per saved recipe; Info and Delete in one dialog (the Launches page's, runs/launches.css). */ -.rcp-head { justify-content: space-between; align-items: center; } .rcp-name { overflow-wrap: anywhere; } /* a name wraps, never cut */ .rcp-warn { display: flex; align-items: center; gap: 4px; margin-top: 2px; font-size: 12.5px; color: var(--patch_failed_tests); cursor: help; } .rcp-warn .ic { width: 14px; height: 14px; } diff --git a/app/templates/builder/new_run.html b/app/templates/builder/new_run.html index 6289014a..5e4408a1 100644 --- a/app/templates/builder/new_run.html +++ b/app/templates/builder/new_run.html @@ -1,19 +1,18 @@ {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}Run builder — Nullius{% endblock %} {% block crumb %}/ run builder{% endblock %} {% block head %}{% endblock %} {% block body %}
-
-

Set up the next experiment.

Choose what to test. Keep every setting explicit.

-
+ {% set actions %} -
-
+ {% endset %} + {{ page_head('Set up the next experiment.', actions=actions) }} {#- a message is a toast at the bottom left: it goes after a few seconds, its bar counting them, or on its ×. A popover, so it shows above the Saved recipes dialog too -#}
diff --git a/app/templates/builder/recipes.html b/app/templates/builder/recipes.html index 93f9ab4b..5c09c652 100644 --- a/app/templates/builder/recipes.html +++ b/app/templates/builder/recipes.html @@ -1,5 +1,6 @@ {% from '_tables.html' import table, cell, greyed %} {% extends "base.html" %} +{% from '_page.html' import page_head %} {% block title %}Recipes — Nullius{% endblock %} {% block crumb %}/ recipes{% endblock %} {% block head %} @@ -11,9 +12,9 @@ {% block body %} {% set local, why = builder_data.local, builder_data.recipesWhy %} -

Recipes

- -
+{% set actions %} + {% endset %} +{{ page_head('Recipes', actions=actions) }} {% if recipes %} {#- a column per step of the run builder, 01 to 07, by its key in command-builder-core.js (STEP) #} From fc68d0dd5766fef314e67c7c4adde393302062b4 Mon Sep 17 00:00:00 2001 From: Harenome Ranaivoarivony-Razanajato Date: Wed, 18 Nov 2026 15:04:13 +0100 Subject: [PATCH 5/8] feat(compare): head the comparison pages with the page head Only the title line changes: a comparison and one task side by side. --- app/static/compare/comparison.css | 1 - app/templates/compare/compare.html | 3 ++- app/templates/compare/compare_task.html | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/static/compare/comparison.css b/app/static/compare/comparison.css index c55ea594..b7407dbd 100644 --- a/app/static/compare/comparison.css +++ b/app/static/compare/comparison.css @@ -1,5 +1,4 @@ /* Comparison controls share the shell's theme and leave data colours alone. */ -.compare-title { justify-content: space-between; align-items: center; } .cohort-note { margin: 1rem 0 1.6rem; padding: 1rem 1.2rem; background: var(--surface-2); border-radius: 7px; color: var(--text-dim); font-size: .85rem; line-height: 1.7; } .cohort-note p { margin: 0; } .cohort-note p + p { margin-top: .55rem; } diff --git a/app/templates/compare/compare.html b/app/templates/compare/compare.html index df0a32a0..0dffc29c 100644 --- a/app/templates/compare/compare.html +++ b/app/templates/compare/compare.html @@ -1,6 +1,7 @@ {% from 'runs/_runtime.html' import what_ran, shard_link %} {% from 'traces/_attempts.html' import attempt_count %} {% from '_tables.html' import classes, controls %} +{% from '_page.html' import page_head %} {% extends "base.html" %} {% block title %}Compare {{ jobs|length }} run{{ '' if jobs|length == 1 else 's' }} — Nullius{% endblock %} {% block head %} @@ -77,7 +78,7 @@ {% endmacro %} -

Comparing {{ jobs|length }} run{{ '' if jobs|length == 1 else 's' }}

+{{ page_head('Comparing ' ~ jobs|length ~ ' run' ~ ('' if jobs|length == 1 else 's')) }} {% if jobs %}

{{ n_shared }} task{{ '' if n_shared == 1 else 's' }} run by every side· diff --git a/app/templates/compare/compare_task.html b/app/templates/compare/compare_task.html index e2efcdb1..29f0f602 100644 --- a/app/templates/compare/compare_task.html +++ b/app/templates/compare/compare_task.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% from 'traces/_attempts.html' import attempt_count %} +{% from '_page.html' import page_head %} {% block title %}{{ task }} side by side — Nullius{% endblock %} {% block head %}