diff --git a/i18n/en/Admin.resx b/i18n/en/Admin.resx index d2a47e16..4a283a25 100644 --- a/i18n/en/Admin.resx +++ b/i18n/en/Admin.resx @@ -50,12 +50,16 @@ Look for new and changed sequences on disk Sequences unverified + unverified + unverified Verify Read every original again and compare its SHA-256 + Actions Cancel Discard the changes Close Close this panel + The value of {0} is not valid; correct it and save again.long Keep Leave everything as it is Load more @@ -64,13 +68,22 @@ Save Save the changes on the server Saved. + Type the name above first + Type {0} to confirmlong + Type the name exactly as shown to confirm Recent activity All logs Open the audit log Archive Storage by year + {0} camera + {0} cameras discovery off discovery on + {0} done today + {0} done today + {0} failed + {0} failed {0} free {0} queued · {1} done today · {2} failedlong Jobs @@ -82,14 +95,25 @@ of {0} online originals {0} + {0} photo + {0} photos {0} photos · {1} cameras Queue and history Open the Jobs page + {0} queued + {0} queued + Read the dashboard again running + sequence + sequences sequences Storage frames per day · {0} total · peak {1}long Uploads · last 30 days + {0} sequence without proxieslong + {0} sequences without proxieslong + {0} worker + {0} workers {0} workers The server did not answer; try again.long Adopt @@ -137,9 +161,12 @@ Show or hide the job log {0} running · {1} nodes onlinelong No render nodes + Give a user the render-node right; their Titano client can then offer the PC Node Node Render nodes + {0} node online + {0} nodes online Owner Pause Stop at the next checkpoint and keep the progress @@ -154,7 +181,11 @@ Put the job back in the queue from its checkpoint Retry Queue the job again from its last checkpoint + {0} running + {0} running server + Show all + Show jobs in every state State Target Language of this panel @@ -186,10 +217,26 @@ Download Save this log file Nothing recorded yet + disabled + display name + enabled + no quota + notes + permissions + quota {0} + rating + role {0} + edit settings + tags + title Log files From + {0} line + {0} lines {0} lines How many of the latest lines to show + {0} sequence reassignedlong + {0} sequences reassignedlong Read the log again Audit Changes to users, sequences, the archive and settings @@ -247,6 +294,8 @@ Max file (MB) Largest single upload accepted Network and TLS + The PEM file was not found; enter its full path on the server.long + Used only in Own certificate mode Restart required Saved ports, TLS, workers, chunk size or job history apply after a restart Server @@ -269,7 +318,16 @@ Jobs this server runs at the same time Sign out Sign out of the admin panel + Switch between light and dark + {0} account + {0} accounts Active + {0} active + {0} active + Change password + Choose a new password for your account; your other sessions end + Clear search + Show every account again Password copied. Copy the password Create @@ -298,6 +356,9 @@ Always required for accounts created here New user Create an account; the user must change the password at first sign-in + Password changed. + Passwords: PBKDF2-SHA512, {0} character minimumlong + Passwords: PBKDF2-SHA512, {0} characters minimumlong Passwords: PBKDF2-SHA512, {0} characters minimum · tokens expire after {1} days idlelong Quota Originals uploaded by this user count against the quota; 0 = unlimited @@ -312,13 +373,17 @@ Import, edit, render, upload and download Upload only; cannot edit sequences Browse and download renders only + Replace your password; this session stays signed in Search Filter by user or display name Sign-in log Who signed in from where, and when Status + That user name is taken; choose another.long Temporary password Give this to the user; they must replace it at first sign-in + tokens expire after {0} day idlelong + tokens expire after {0} days idlelong Uploads 30 d User Username diff --git a/i18n/it/Admin.it.resx b/i18n/it/Admin.it.resx index 45da50d6..d53594df 100644 --- a/i18n/it/Admin.it.resx +++ b/i18n/it/Admin.it.resx @@ -50,12 +50,16 @@ Cerca sequenze nuove e modificate sul disco Sequenze non verificate + non verificata + non verificate Verifica Rileggi ogni originale e confronta il suo SHA-256 + Azioni Annulla Scarta le modifiche Chiudi Chiudi questo pannello + Il valore di {0} non è valido; correggilo e salva di nuovo. Mantieni Lascia tutto com'è Carica altri @@ -64,13 +68,22 @@ Salva Salva le modifiche sul server Salvato. + Prima digita il nome qui sopra + Digita {0} per confermare + Digita il nome esattamente come mostrato per confermare Attività recenti Tutti i log Apri il registro di controllo Archivio Spazio per anno + {0} fotocamera + {0} fotocamere rilevamento spento rilevamento attivo + {0} completato oggi + {0} completati oggi + {0} fallito + {0} falliti {0} liberi {0} in coda · {1} completati oggi · {2} falliti Job @@ -82,14 +95,25 @@ di {0} online originali {0} + {0} foto + {0} foto {0} foto · {1} fotocamere Coda e cronologia Apri la pagina Job + {0} in coda + {0} in coda + Rileggi la panoramica in corso + sequenza + sequenze sequenze Spazio foto al giorno · {0} totali · picco {1} Caricamenti · ultimi 30 giorni + {0} sequenza senza proxy + {0} sequenze senza proxy + {0} worker + {0} worker {0} worker Il server non ha risposto; riprova. Adozione @@ -137,9 +161,12 @@ Mostra o nascondi il log del job {0} in corso · {1} nodi online Nessun nodo di rendering + Concedi a un utente il permesso di nodo di rendering; il suo client Titano potrà offrire il PC Nodo Nodo Nodi di rendering + {0} nodo online + {0} nodi online Proprietario Pausa Fermati al prossimo punto di controllo e mantieni l'avanzamento @@ -154,7 +181,11 @@ Rimetti il job in coda dal suo punto di controllo Riprova Rimetti in coda il job dall'ultimo punto di controllo + {0} in corso + {0} in corso server + Mostra tutti + Mostra i job in ogni stato Stato Oggetto Lingua di questo pannello @@ -186,10 +217,26 @@ Scarica Salva questo file di log Ancora nessuna registrazione + disattivato + nome visualizzato + riattivato + nessuna quota + note + permessi + quota {0} + valutazione + ruolo {0} + impostazioni di modifica + tag + titolo File di log Da + {0} riga + {0} righe {0} righe Quante delle ultime righe mostrare + {0} sequenza riassegnata + {0} sequenze riassegnate Rileggi il log Controllo Modifiche a utenti, sequenze, archivio e impostazioni @@ -247,6 +294,8 @@ File massimo (MB) Caricamento singolo più grande accettato Rete e TLS + File PEM non trovato; inserisci il percorso completo sul server. + Usato solo in modalità Certificato proprio Riavvio richiesto Porte, TLS, worker, dimensione blocchi o cronologia job salvati valgono dopo un riavvio Server @@ -269,7 +318,16 @@ Job che questo server esegue contemporaneamente Esci Esci dal pannello di amministrazione + Alterna tema chiaro e scuro + {0} account + {0} account Attivo + {0} attivo + {0} attivi + Cambia password + Scegli una nuova password per il tuo account; le altre sessioni terminano + Cancella ricerca + Mostra di nuovo tutti gli account Password copiata. Copia la password Crea @@ -298,6 +356,9 @@ Sempre richiesto per gli account creati qui Nuovo utente Crea un account; l'utente deve cambiare la password al primo accesso + Password cambiata. + Password: PBKDF2-SHA512, almeno {0} carattere + Password: PBKDF2-SHA512, almeno {0} caratteri Password: PBKDF2-SHA512, almeno {0} caratteri · i token scadono dopo {1} giorni di inattività Quota Gli originali caricati da questo utente contano nella quota; 0 = illimitata @@ -312,13 +373,17 @@ Importa, modifica, esegue rendering, carica e scarica Solo caricamento; non può modificare le sequenze Solo consultazione e download dei rendering + Sostituisci la password; questa sessione resta collegata Cerca Filtra per nome utente o nome visualizzato Registro accessi Chi ha effettuato l'accesso, da dove e quando Stato + Questo nome utente è già in uso; scegline un altro. Password temporanea Comunicala all'utente; dovrà sostituirla al primo accesso + i token scadono dopo {0} giorno di inattività + i token scadono dopo {0} giorni di inattività Caricamenti 30 g Utente Nome utente diff --git a/src/Titano.Server/Admin/web/admin.css b/src/Titano.Server/Admin/web/admin.css index feb6c1a8..1e48cf7e 100644 --- a/src/Titano.Server/Admin/web/admin.css +++ b/src/Titano.Server/Admin/web/admin.css @@ -1,94 +1,111 @@ -/* Titano Server admin — DESIGN.md light tokens (the web admin is light-only), mockups Admin.html and AdminUsers.html. */ +/* Titano Server admin — DESIGN.md tokens in light and dark (BRIEF §14.8), mockups Admin.html and AdminUsers.html. + Logical properties throughout, so right-to-left languages mirror the layout. */ :root { - --bg: #f3f3f3; - --chrome: #ffffff; - --surface: #ffffff; - --card: #ffffff; - --card-hover: #f5f5f5; - --stroke: #e5e5e5; - --stroke-strong: #d1d1d1; - --text: #1a1a1a; - --text-muted: #616161; - --text-faint: #9e9e9e; - --accent: #0067c0; - --accent-hover: #1975c5; - --on-accent: #ffffff; - --accent-selected: #e8f1fa; - --sun: #e08a1e; - --sun-soft: #fff4e5; - --success: #0f7b4f; - --warning: #9a6700; - --error: #c42b1c; + color-scheme: light dark; + --bg: light-dark(#f3f3f3, #1f1f23); + --chrome: light-dark(#ffffff, #1a1a1e); + --surface: light-dark(#ffffff, #26262c); + --card: light-dark(#ffffff, #2f3038); + --card-hover: light-dark(#f5f5f5, #383943); + --card-pressed: light-dark(#ebebeb, #2a2b32); + --stroke: light-dark(#e5e5e5, #3e404a); + --stroke-strong: light-dark(#d1d1d1, #535663); + --text: light-dark(#1a1a1a, #f2f3f5); + --text-muted: light-dark(#616161, #a9aeb9); + --text-faint: light-dark(#9e9e9e, #7b818e); + --accent: light-dark(#0067c0, #4cc2ff); + --accent-hover: light-dark(#1975c5, #6fcfff); + --link-hover: light-dark(#004c8c, #6fcfff); + --on-accent: light-dark(#ffffff, #0b1b24); + --accent-selected: light-dark(#e8f1fa, rgba(76, 194, 255, .25)); + --sun: light-dark(#e08a1e, #f5a524); + --sun-soft: light-dark(#fff4e5, rgba(245, 165, 36, .15)); + --success: light-dark(#0f7b4f, #35c48f); + --warning: light-dark(#9a6700, #e8b339); + --error: light-dark(#c42b1c, #f0625d); + --shadow: light-dark(rgba(0, 0, 0, .18), rgba(0, 0, 0, .4)); + --scrim: light-dark(rgba(0, 0, 0, .25), rgba(0, 0, 0, .6)); --radius: 6px; --radius-card: 8px; --font: "Segoe UI Variable Text", "Segoe UI", system-ui, -apple-system, "Noto Sans", sans-serif; --mono: Consolas, "Cascadia Mono", ui-monospace, monospace; } +/* The header's theme button overrides the operating system's choice. */ +:root[data-theme="light"] { color-scheme: light; } +:root[data-theme="dark"] { color-scheme: dark; } * { box-sizing: border-box; } html, body { height: 100%; } body { margin: 0; font: 13px/1.45 var(--font); color: var(--text); background: var(--bg); } button, input, select { font: inherit; color: inherit; } a { color: var(--accent); } -a:hover { color: #004c8c; } +a:hover { color: var(--link-hover); } h1, h2 { margin: 0; } h2 { font-size: 14px; font-weight: 600; } .num { font-variant-numeric: tabular-nums; } .mono { font-family: var(--mono); } .muted { color: var(--text-muted); } -.right { text-align: right; justify-self: end; } +.end { text-align: end; justify-self: end; } .nowrap { white-space: nowrap; } .ellipsis { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; min-width: 0; } .spacer { flex: 1; } +.sr-only { position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0; overflow: hidden; clip-path: inset(50%); white-space: nowrap; border: 0; } [hidden] { display: none !important; } /* Shell */ -.shell { display: grid; grid-template-columns: 220px 1fr; min-height: 100vh; } -.sidebar { background: var(--chrome); border-right: 1px solid var(--stroke); display: flex; flex-direction: column; padding: 16px 12px; position: sticky; top: 0; height: 100vh; } -.brand { display: flex; align-items: center; gap: 10px; padding: 4px 8px 18px; } +/* The sidebar column keeps the chrome colour below the sticky sidebar on long pages. */ +.shell { display: grid; grid-template-columns: 220px minmax(0, 1fr); min-height: 100vh; background: var(--chrome); } +.sidebar { display: flex; flex-direction: column; padding: 16px 12px; position: sticky; top: 0; height: 100vh; min-width: 0; } +.brand { display: flex; align-items: center; gap: 10px; padding: 4px 8px 18px; min-width: 0; } .brand img { width: 22px; height: 22px; } .brand strong { display: block; font-size: 14px; } .brand span { display: block; font-size: 11px; color: var(--text-muted); } .brand.large img { width: 40px; height: 40px; } -.brand.large strong { font-size: 18px; } +.brand.large h2 { font-size: 18px; } .nav { display: grid; gap: 2px; } .nav a { display: flex; align-items: center; gap: 10px; height: 36px; padding: 0 10px; border-radius: var(--radius); color: var(--text); text-decoration: none; } -.nav a:hover { background: var(--card-hover); } +.nav a:hover { background: var(--card-hover); color: var(--text); } .nav a[aria-current="page"] { background: var(--accent-selected); color: var(--accent); font-weight: 600; } .nav svg { flex: none; } -.badge { margin-left: auto; min-width: 18px; padding: 0 6px; border-radius: 8px; background: var(--accent); color: var(--on-accent); font-size: 11px; font-weight: 600; text-align: center; } +.badge { margin-inline-start: auto; min-width: 18px; padding: 0 6px; border-radius: 8px; background: var(--accent); color: var(--on-accent); font-size: 11px; font-weight: 600; text-align: center; font-variant-numeric: tabular-nums; } .badge.quiet { background: none; color: var(--text-muted); font-weight: 400; } .sidebar .user { margin-top: auto; border-top: 1px solid var(--stroke); padding: 8px 10px 0; display: flex; align-items: center; gap: 10px; } -.user .who { flex: 1; min-width: 0; } -.user .who strong { display: block; } +.user .who { flex: 1; min-width: 0; display: flex; flex-direction: column; } .user .who span { color: var(--text-muted); font-size: 11px; } -.main { display: flex; flex-direction: column; min-width: 0; } -.header { min-height: 60px; display: flex; align-items: center; gap: 14px; padding: 0 24px; border-bottom: 1px solid var(--stroke); background: var(--chrome); flex-wrap: wrap; } -.header h1 { font-size: 18px; font-weight: 600; } -.header .meta { color: var(--text-muted); } -.header .actions { display: flex; align-items: center; gap: 8px; } -.header .language { width: auto; } -.content { padding: 24px; display: grid; gap: 20px; align-content: start; } +.main { display: flex; flex-direction: column; min-width: 0; background: var(--bg); border-inline-start: 1px solid var(--stroke); } +.header { position: sticky; top: 0; z-index: 5; min-height: 60px; display: flex; align-items: center; gap: 14px; padding: 0 24px; border-bottom: 1px solid var(--stroke); background: var(--chrome); } +.header h1 { font-size: 18px; font-weight: 600; white-space: nowrap; } +.header h1:focus { outline: none; } +.header .meta { flex: 0 1 auto; min-width: 0; color: var(--text-muted); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.header .actions { display: flex; align-items: center; gap: 8px; flex: none; } +.header .language { width: auto; flex: none; } +.header > .btn { flex: none; } +.content { padding: 24px; display: grid; gap: 20px; align-content: start; min-width: 0; } /* Controls */ .btn { height: 32px; min-width: 44px; padding: 0 12px; border: 1px solid var(--stroke); border-radius: var(--radius); background: var(--card); cursor: pointer; display: inline-flex; align-items: center; justify-content: center; gap: 8px; text-decoration: none; color: var(--text); white-space: nowrap; } -.btn:hover { background: var(--card-hover); border-color: var(--stroke-strong); } -.btn:focus-visible, .input:focus-visible, .chip:focus-visible, .link:focus-visible, a:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; } +.btn:hover { background: var(--card-hover); border-color: var(--stroke-strong); color: var(--text); } +.btn:active { background: var(--card-pressed); } +.btn:focus-visible, .chip:focus-visible, .link:focus-visible, a:focus-visible, pre.log:focus-visible, +input[type="checkbox"]:focus-visible, input[type="radio"]:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; } .btn.primary { background: var(--accent); border-color: var(--accent); color: var(--on-accent); font-weight: 600; } -.btn.primary:hover { background: var(--accent-hover); } +.btn.primary:hover { background: var(--accent-hover); border-color: var(--accent-hover); color: var(--on-accent); } .btn.destructive { border-color: var(--error); color: var(--error); background: transparent; } .btn.subtle { border-color: transparent; background: transparent; } .btn.icon { width: 32px; min-width: 32px; padding: 0; } .btn.small { height: 28px; padding: 0 10px; font-size: 12px; } .btn:disabled { opacity: .4; cursor: default; } -.btn[aria-pressed="true"] { color: var(--accent); border-color: var(--accent); } -.link { border: 0; background: none; padding: 0; color: var(--text); cursor: pointer; text-align: left; } +/* Pressed toggles: accent text, a doubled accent border and bold text, so the state does not rest on colour alone. */ +.btn[aria-pressed="true"], .chip[aria-pressed="true"] { color: var(--accent); border-color: var(--accent); box-shadow: inset 0 0 0 1px var(--accent); font-weight: 600; } +.link { border: 0; background: none; padding: 0; color: var(--text); cursor: pointer; text-align: start; } .link:hover { color: var(--accent); } +.link.ellipsis { display: block; max-width: 100%; } .input { height: 32px; width: 100%; padding: 0 10px; border: 1px solid var(--stroke); border-radius: var(--radius); background: var(--card); } .input:hover { border-color: var(--stroke-strong); } -.input:focus { border-color: var(--accent); outline: none; } -.input[aria-invalid="true"] { border-color: var(--error); } +/* The transparent outline shows in Windows High Contrast, where border colours are forced. */ +.input:focus { border-color: var(--accent); box-shadow: 0 0 0 1px var(--accent); outline: 2px solid transparent; } +.input[aria-invalid="true"] { border-color: var(--error); box-shadow: 0 0 0 1px var(--error); } .input:disabled, .input[readonly] { background: var(--bg); color: var(--text-muted); } .input.small { height: 28px; width: auto; font-size: 12px; } .input.narrow { width: 120px; } @@ -96,85 +113,125 @@ h2 { font-size: 14px; font-weight: 600; } input[type="checkbox"], input[type="radio"] { accent-color: var(--accent); margin: 0; } .chips, .button-row { display: flex; gap: 8px; flex-wrap: wrap; } .chip { height: 24px; padding: 0 10px; border: 1px solid var(--stroke); border-radius: 12px; background: var(--card); font-size: 11px; cursor: pointer; } -.chip[aria-pressed="true"] { border-color: var(--accent); color: var(--accent); } .chip.warn { border-color: var(--warning); color: var(--warning); cursor: default; display: inline-flex; align-items: center; } .segmented { display: inline-flex; } -.segmented .btn { border-radius: 0; margin-left: -1px; } -.segmented .btn:first-child { border-radius: var(--radius) 0 0 var(--radius); } -.segmented .btn:last-child { border-radius: 0 var(--radius) var(--radius) 0; } +.segmented .btn { border-radius: 0; margin-inline-start: -1px; } +.segmented .btn:first-child { margin-inline-start: 0; border-start-start-radius: var(--radius); border-end-start-radius: var(--radius); } +.segmented .btn:last-child { border-start-end-radius: var(--radius); border-end-end-radius: var(--radius); } +.segmented .btn[aria-pressed="true"] { position: relative; } -/* Panels and tiles */ -.panel { background: var(--surface); border: 1px solid var(--stroke); border-radius: var(--radius-card); padding: 16px 18px; display: grid; gap: 10px; align-content: start; min-width: 0; } +/* Panels and tiles. Panels are size containers: tables inside drop secondary columns when the panel is narrow. */ +.panel { background: var(--surface); border: 1px solid var(--stroke); border-radius: var(--radius-card); padding: 16px 18px; display: grid; gap: 10px; align-content: start; min-width: 0; container-type: inline-size; } .panel.flush { padding: 0; gap: 0; overflow-x: auto; } -.panel-head { display: flex; align-items: center; gap: 12px; } +.panel-head { display: flex; align-items: center; gap: 12px; min-width: 0; } .panel-head h2 { flex: 1; } +.panel-head > .ellipsis { flex: 0 1 auto; } .panel-head.padded { padding: 12px 18px; border-bottom: 1px solid var(--stroke); } -.empty { padding: 24px 18px; color: var(--text-muted); } -.tiles { display: grid; grid-template-columns: repeat(auto-fit, minmax(230px, 1fr)); gap: 20px; } +.empty { padding: 24px 18px; color: var(--text-muted); display: flex; align-items: center; gap: 12px; flex-wrap: wrap; } +.panel:not(.flush) > .empty { padding: 8px 0; } +.tiles { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 20px; } .tile { gap: 8px; } -.tile .label, .tile .sub { font-size: 12px; color: var(--text-muted); } -.tile .value { font-size: 26px; font-weight: 600; display: flex; align-items: baseline; gap: 6px; } +.tile .label { font-size: 12px; font-weight: 400; color: var(--text-muted); } +.tile .sub { font-size: 12px; color: var(--text-muted); } +.tile .value { font-size: 26px; font-weight: 600; display: flex; flex-wrap: wrap; align-items: baseline; column-gap: 6px; } .tile .value small { font-size: 13px; font-weight: 400; color: var(--text-muted); } .grid { display: grid; gap: 20px; } -.grid.two { grid-template-columns: repeat(auto-fit, minmax(380px, 1fr)); } -.grid.wide-right { grid-template-columns: minmax(300px, 1fr) minmax(400px, 1.4fr); } +.grid.two { grid-template-columns: repeat(auto-fit, minmax(min(380px, 100%), 1fr)); } +.grid.wide-right { grid-template-columns: minmax(0, 1fr) minmax(0, 1.4fr); } -/* Bars and charts (SVG attributes only: the panel runs under a strict CSP) */ +/* Bars and charts (SVG attributes only: the panel runs under a strict CSP). Progress fills from the reading start. */ svg.bar { width: 100%; height: 6px; display: block; } svg.bar .track { fill: var(--stroke); } svg.bar .fill { fill: var(--accent); } svg.bar.muted .fill { fill: var(--text-faint); } +[dir="rtl"] svg.bar { transform: scaleX(-1); } svg.chart { width: 100%; height: auto; max-height: 220px; } svg.chart .axis { stroke: var(--stroke); } svg.chart .column { fill: var(--accent); } svg.chart.sun .column { fill: var(--sun); } svg.chart text { font: 10px var(--font); text-anchor: middle; } +svg.chart text.start { text-anchor: start; } +svg.chart text.end { text-anchor: end; } svg.chart .value { fill: var(--text); } svg.chart .label { fill: var(--text-muted); } .progress-cell { display: flex; align-items: center; gap: 8px; min-width: 0; } -.progress-cell svg.bar { flex: 1; min-width: 40px; } +.progress-cell svg.bar { flex: 1 1 0; min-width: 16px; } +.progress-cell span { flex: 0 1 auto; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } -/* Tables (grid rows, 52 px in the admin) */ -.table { display: grid; min-width: 0; } -.table .thead, .table .row { display: grid; gap: 12px; align-items: center; padding: 0 18px; } -.table .thead { font-size: 11px; color: var(--text-muted); padding-top: 10px; padding-bottom: 10px; border-bottom: 1px solid var(--stroke); } +/* Tables: ARIA rows laid out as subgrids of one grid, so every column fits its widest cell; 52 px rows in the admin. */ +.table { display: grid; column-gap: 12px; min-width: 0; } +.table > [role="rowgroup"], .table .thead, .table .row { grid-column: 1 / -1; display: grid; grid-template-columns: subgrid; } +.table .thead, .table .row { align-items: center; padding: 0 18px; } +.table .thead { font-size: 11px; color: var(--text-muted); padding-block: 10px; border-bottom: 1px solid var(--stroke); white-space: nowrap; } .table .row { min-height: 52px; border-bottom: 1px solid var(--stroke); } .table .row:hover { background: var(--card-hover); } .table .row.dim { color: var(--text-muted); } -.table.compact .row { min-height: 32px; padding: 0; grid-template-columns: 1fr auto auto auto; border-bottom: 0; } +.table .row.log-row { min-height: 0; padding: 0; } +.table .row.log-row:hover { background: none; } +.table [role="cell"], .table [role="columnheader"] { min-width: 0; } +.table .wide { grid-column: 1 / -1; } +.table.users { grid-template-columns: minmax(120px, 1.4fr) max-content minmax(100px, 1.3fr) minmax(70px, 1fr) max-content max-content max-content; } +.table.jobs { grid-template-columns: minmax(70px, max-content) minmax(120px, 1.6fr) minmax(60px, max-content) minmax(90px, 1fr) max-content max-content max-content; } +.table.jobs-mini { grid-template-columns: minmax(60px, max-content) minmax(80px, 1.5fr) minmax(50px, max-content) minmax(70px, 1fr) max-content max-content; } +.table.jobs-mini .thead, .table.jobs-mini .row { padding: 0; } +.table.jobs-mini .row { min-height: 40px; border-bottom: 0; } +.table.nodes { grid-template-columns: minmax(100px, 1fr) minmax(60px, max-content) minmax(100px, 1.2fr) max-content max-content max-content; } +.table.audit { grid-template-columns: max-content minmax(70px, .8fr) minmax(90px, max-content) minmax(100px, 2fr) minmax(0, max-content); } +.table.audit .row { min-height: 40px; } +.table.compact .row { min-height: 32px; padding: 0; border-bottom: 0; } .table.compact .row:hover { background: none; } -.table.users .thead, .table.users .row { grid-template-columns: minmax(110px, 1.4fr) 90px minmax(100px, 1.2fr) minmax(80px, 1fr) 70px 70px 230px; } -.table.jobs .thead, .table.jobs .row { grid-template-columns: 110px minmax(140px, 1.5fr) 100px minmax(110px, 1fr) 100px 80px 280px; } -.table.jobs-mini .thead, .table.jobs-mini .row { grid-template-columns: 96px minmax(120px, 1.5fr) 92px minmax(100px, 1fr) 90px 80px; padding: 0; min-height: 40px; } -.table.jobs-mini .row { border-bottom: 0; } -.table.nodes .thead, .table.nodes .row { grid-template-columns: minmax(140px, 1fr) 120px minmax(140px, 1fr) 170px 100px 100px; } -.table.audit .thead, .table.audit .row { grid-template-columns: 170px 120px 170px minmax(160px, 1fr) 130px; min-height: 40px; } +.table.compact.stats { grid-template-columns: minmax(0, 1fr) max-content max-content; } +.table.compact.files { grid-template-columns: minmax(0, 1fr) max-content max-content max-content; } +@container (max-width: 900px) { + .table.users { grid-template-columns: minmax(140px, 1.4fr) max-content minmax(120px, 1.3fr) max-content max-content; } + .table.users .col-seen, .table.users .col-uploads { display: none; } + .table.jobs { grid-template-columns: minmax(70px, max-content) minmax(100px, 1.6fr) minmax(80px, 1fr) max-content max-content; } + .table.jobs .col-node, .table.jobs .col-created { display: none; } + .table.nodes { grid-template-columns: minmax(100px, 1fr) minmax(100px, 1.2fr) max-content max-content; } + .table.nodes .col-owner, .table.nodes .col-heartbeat { display: none; } + .table.audit { grid-template-columns: max-content minmax(70px, .8fr) minmax(90px, max-content) minmax(100px, 2fr); } + .table.audit .col-from { display: none; } +} +@container (max-width: 700px) { + .table.users { grid-template-columns: minmax(110px, 1fr) max-content max-content max-content; } + .table.users .col-quota { display: none; } +} +@container (max-width: 620px) { + .table.users { grid-template-columns: minmax(100px, 1fr) max-content max-content; } + .table.users .col-status { display: none; } +} +@container (max-width: 560px) { + .table.jobs-mini { grid-template-columns: minmax(60px, max-content) minmax(80px, 1.5fr) minmax(60px, 1fr) max-content max-content; } + .table.jobs-mini .col-node { display: none; } +} .table-foot { display: flex; align-items: center; gap: 16px; padding: 10px 18px; font-size: 12px; } -.row-actions { display: flex; gap: 6px; justify-content: flex-end; flex-wrap: wrap; } +.table-foot a { white-space: nowrap; } +.row-actions { display: flex; gap: 6px; justify-content: flex-end; } .person { display: flex; align-items: center; gap: 10px; min-width: 0; } .stack { display: flex; flex-direction: column; min-width: 0; } .stack small { font-size: 11px; color: var(--text-muted); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } .avatar { width: 30px; height: 30px; flex: none; border-radius: 50%; background: var(--accent-selected); color: var(--accent); display: grid; place-items: center; font-weight: 600; } .avatar.uploader { background: var(--sun-soft); color: var(--warning); } -.row.dim .avatar { background: #eeeeee; color: var(--text-muted); } +.row.dim .avatar { background: var(--card-pressed); color: var(--text-muted); } .state { white-space: nowrap; } .state.running { color: var(--accent); } .state.done { color: var(--success); } .state.failed { color: var(--error); } .state.paused { color: var(--warning); } .state.queued, .state.cancelled { color: var(--text-muted); } -.activity { display: grid; grid-template-columns: 64px 1fr; column-gap: 12px; row-gap: 9px; font-size: 12px; } -pre.log { margin: 0; padding: 12px 18px; background: var(--bg); border-top: 1px solid var(--stroke); font: 12px/1.5 var(--mono); white-space: pre-wrap; overflow: auto; max-height: 260px; } +.activity { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: max-content minmax(0, 1fr); column-gap: 12px; row-gap: 9px; font-size: 12px; } +.activity li { grid-column: 1 / -1; display: grid; grid-template-columns: subgrid; } +pre.log { margin: 0; padding: 12px 18px; background: var(--bg); border-top: 1px solid var(--stroke); font: 12px/1.5 var(--mono); white-space: pre-wrap; overflow-wrap: anywhere; overflow: auto; max-height: 260px; text-align: left; } pre.log.tall { max-height: 60vh; border-top: 0; } /* Forms */ -.split { display: grid; grid-template-columns: 1fr auto; gap: 20px; align-items: start; } -.side { width: 340px; } +.split { display: grid; grid-template-columns: minmax(0, 1fr) auto; gap: 20px; align-items: start; } +.side { width: clamp(300px, 26vw, 340px); } .form { display: grid; gap: 12px; } -.form label { display: grid; gap: 6px; color: var(--text-muted); } +.form label, .field-label { display: grid; gap: 6px; color: var(--text-muted); } .form label.check, label.check { display: flex; align-items: center; gap: 8px; color: var(--text); } .form fieldset { border: 0; margin: 0; padding: 0; display: grid; gap: 8px; } -.form legend { color: var(--text-muted); margin-bottom: 8px; } +.form legend { color: var(--text-muted); margin-bottom: 8px; padding: 0; } .form h2 { font-size: 16px; } .inline { display: flex; align-items: center; gap: 8px; } .buttons { display: flex; gap: 8px; justify-content: flex-end; } @@ -182,20 +239,20 @@ pre.log.tall { max-height: 60vh; border-top: 0; } .settings { display: grid; gap: 20px; } .field { display: grid; grid-template-columns: 180px minmax(0, 420px); align-items: center; gap: 12px; color: var(--text-muted); } .settings-form .field { grid-template-columns: 140px minmax(0, 1fr); } -.fingerprint { font: 12px var(--mono); color: var(--text); overflow-wrap: anywhere; } +.fingerprint { font: 12px var(--mono); color: var(--text); } /* Dialogs and toasts */ -dialog.dialog { border: 1px solid var(--stroke); border-radius: 12px; padding: 20px 22px; width: 420px; max-width: calc(100vw - 32px); box-shadow: 0 8px 24px rgba(0, 0, 0, .18); } -dialog.dialog::backdrop { background: rgba(0, 0, 0, .25); } +dialog.dialog { border: 1px solid var(--stroke); border-radius: 12px; padding: 20px 22px; width: 420px; max-width: calc(100vw - 32px); background: var(--surface); color: var(--text); box-shadow: 0 8px 24px var(--shadow); } +dialog.dialog::backdrop { background: var(--scrim); } dialog.dialog form { display: grid; gap: 14px; } -dialog.dialog h2 { font-size: 16px; } +dialog.dialog h2 { font-size: 16px; overflow-wrap: anywhere; } dialog.dialog p { margin: 0; color: var(--text-muted); } -#toasts { position: fixed; right: 24px; bottom: 24px; display: grid; gap: 8px; z-index: 10; } -.toast { width: 420px; max-width: calc(100vw - 48px); padding: 12px 14px; background: var(--card); border: 1px solid var(--stroke); border-left: 3px solid var(--accent); border-radius: var(--radius-card); box-shadow: 0 4px 16px rgba(0, 0, 0, .12); } -.toast.error { border-left-color: var(--error); } +#toasts { position: fixed; inset-inline-end: 24px; bottom: 24px; display: grid; gap: 8px; z-index: 10; } +.toast { width: 420px; max-width: calc(100vw - 48px); padding: 12px 14px; color: var(--text); background: var(--card); border: 1px solid var(--stroke); border-inline-start: 3px solid var(--accent); border-radius: var(--radius-card); box-shadow: 0 4px 16px var(--shadow); } +.toast.error { border-inline-start-color: var(--error); } /* About */ -.about dl { display: grid; grid-template-columns: 180px 1fr; gap: 8px 16px; margin: 0; } +.about dl { display: grid; grid-template-columns: 180px minmax(0, 1fr); gap: 8px 16px; margin: 0; } .about dt { color: var(--text-muted); } .about dd { margin: 0; overflow-wrap: anywhere; } @@ -207,13 +264,25 @@ dialog.dialog p { margin: 0; color: var(--text-muted); } .login label { display: grid; gap: 6px; color: var(--text-muted); } .login .row { display: flex; gap: 8px; } +/* Windows High Contrast: selection and progress in system colours, since backgrounds and fills are not forced. */ +@media (forced-colors: active) { + .btn[aria-pressed="true"], .chip[aria-pressed="true"], .nav a[aria-current="page"] { forced-color-adjust: none; background: Highlight; color: HighlightText; border-color: Highlight; } + svg.bar .fill, svg.chart .column { fill: Highlight; } + svg.bar .track { fill: GrayText; } + svg.chart .axis { stroke: CanvasText; } + svg.chart text { fill: CanvasText; } +} + @media (max-width: 900px) { - .shell { grid-template-columns: 1fr; } - .sidebar { flex-direction: row; overflow-x: auto; padding: 8px; position: static; height: auto; } + .shell { grid-template-columns: minmax(0, 1fr); } + .sidebar { flex-direction: row; overflow-x: auto; padding: 8px; position: static; height: auto; border-bottom: 1px solid var(--stroke); } + .main { border-inline-start: 0; } .sidebar .brand, .sidebar .user { display: none; } .nav { display: flex; gap: 4px; } - .nav a span:not(.badge) { display: none; } - .split, .grid.wide-right { grid-template-columns: 1fr; } + .nav a > span:not(.badge) { position: absolute; width: 1px; height: 1px; overflow: hidden; clip-path: inset(50%); white-space: nowrap; } + .header { position: static; flex-wrap: wrap; padding-block: 10px; } + .tiles { grid-template-columns: repeat(2, minmax(0, 1fr)); } + .split, .grid.wide-right { grid-template-columns: minmax(0, 1fr); } .side { width: auto; } - .field { grid-template-columns: 1fr; } + .field { grid-template-columns: minmax(0, 1fr); } } diff --git a/src/Titano.Server/Admin/web/app.js b/src/Titano.Server/Admin/web/app.js index 29d8834a..3acf157e 100644 --- a/src/Titano.Server/Admin/web/app.js +++ b/src/Titano.Server/Admin/web/app.js @@ -1,21 +1,24 @@ // Titano Server admin panel — vanilla ES modules, no build step (BRIEF §14.8). import { api, ApiFailure } from "./api.js"; -import { t, loadStrings, applyStrings, setLanguage, languages, culture } from "./i18n.js"; +import { t, plural, loadStrings, applyStrings, setLanguage, languages, culture } from "./i18n.js"; import { icons } from "./icons.js"; -import { escapeHtml, attr, errorText, nativeName } from "./ui.js"; +import { escapeHtml, attr, errorText, nativeName, formatNumber } from "./ui.js"; const app = document.getElementById("app"); const pages = ["dashboard", "users", "archive", "jobs", "settings", "logs", "about"]; +const THEME_KEY = "titano.admin.theme"; let info = null; let events = null; const listeners = new Set(); +applyTheme(storedTheme()); + async function start() { await loadStrings(); info = await api.get("/api/v1/server/info").catch(() => null); await api.resume(); - window.addEventListener("hashchange", render); + window.addEventListener("hashchange", () => render("title")); window.addEventListener("titano:signed-out", () => { events?.stop(); events = null; @@ -29,11 +32,12 @@ function currentPage() { return pages.includes(p) ? p : "dashboard"; } -function render() { +/** Draws the page for the session state; focus names the shell element that gets the keyboard focus. */ +function render(focus = null) { const user = api.user(); if (!user) return renderLogin(); if (user.mustChangePassword) return renderPasswordChange(); - renderShell(currentPage()); + renderShell(currentPage(), focus); } function brand() { @@ -41,11 +45,12 @@ function brand() { } function renderLogin(message = "") { + document.title = `${t("Admin.Login.SignIn")} · Titano Server`; app.innerHTML = ` ${brand()} - + ${escapeHtml(message)} @@ -74,6 +79,7 @@ function renderLogin(message = "") { } function renderPasswordChange() { + document.title = `${t("Admin.Password.Title")} · Titano Server`; app.innerHTML = ` @@ -114,9 +120,10 @@ function renderPasswordChange() { form.querySelector("input").focus(); } -function renderShell(page) { +function renderShell(page, focus) { const nav = pages.map((p) => ` - ${icons[p]}`).join(""); + ${icons[p]} + `).join(""); const user = api.user(); const options = languages().map((code) => `${escapeHtml(nativeName(code))}`).join(""); app.innerHTML = ` @@ -125,23 +132,25 @@ function renderShell(page) { ${brand()} ${nav} - ${escapeHtml(user.username.slice(0, 1).toUpperCase())} - ${escapeHtml(user.username)} + ${escapeHtml(user.username.slice(0, 1).toUpperCase())} + ${escapeHtml(user.username)} ${icons.power} - + ${options} + ${icons.moon} - + `; applyStrings(app); + document.title = `${t(`Admin.Nav.${cap(page)}`)} · Titano Server`; app.querySelector("#signout").addEventListener("click", async () => { events?.stop(); events = null; @@ -150,20 +159,39 @@ function renderShell(page) { }); app.querySelector("#language").addEventListener("change", async (e) => { await setLanguage(e.target.value); - render(); + render("language"); }); + app.querySelector("#theme").addEventListener("click", (e) => { + const theme = isDark() ? "light" : "dark"; + applyTheme(theme); + try { + localStorage.setItem(THEME_KEY, theme); + } catch { + // Only this page keeps the theme then. + } + e.currentTarget.setAttribute("aria-pressed", String(theme === "dark")); + }); + if (focus) app.querySelector(`#${focus}`)?.focus(); + events ??= api.events((e) => listeners.forEach((fn) => fn(e))); listeners.clear(); + pages.forEach(showBadge); updateBadges(); listeners.add((e) => { if (e.type === "jobState") updateBadges(); }); + const meta = app.querySelector("#meta"); const content = app.querySelector("#content"); const context = { api, info, - meta: app.querySelector("#meta"), + /** Header text after the title (one line, full text in the tooltip); paths and file names stay left to right. */ + setMeta(text, { ltr = false } = {}) { + meta.textContent = text; + meta.title = text; + meta.dir = ltr ? "ltr" : "auto"; + }, actions: app.querySelector("#actions"), onEvent: (fn) => listeners.add(fn), }; @@ -174,24 +202,60 @@ function renderShell(page) { }); } +const badgeCounts = new Map(); let badgeTimer = null; +let badgeAgain = false; -/** Running jobs and accounts, as nav badges (refreshed at most every two seconds). */ +/** Running jobs and accounts as nav badges: fetched at most every two seconds (then once more if asked meanwhile). */ function updateBadges() { - if (badgeTimer) return; + if (badgeTimer) { + badgeAgain = true; + return; + } badgeTimer = setTimeout(() => { badgeTimer = null; + if (badgeAgain) { + badgeAgain = false; + updateBadges(); + } }, 2000); - api.get("/api/v1/jobs?state=running&limit=100").then((page) => setBadge("jobs", page.items.length, true)).catch(() => {}); - api.get("/api/v1/users").then((users) => setBadge("users", users.length, false)).catch(() => {}); + api.get("/api/v1/jobs?state=running&limit=100").then((page) => setBadge("jobs", page.items.length)).catch(() => {}); + api.get("/api/v1/users").then((users) => setBadge("users", users.length)).catch(() => {}); } -function setBadge(page, count, accent) { +function setBadge(page, count) { + badgeCounts.set(page, count); + showBadge(page); +} + +/** The last known count on the page's nav link: a pill for the eye, a phrase for screen readers. */ +function showBadge(page) { const badge = document.getElementById(`badge-${page}`); - if (!badge) return; + const count = badgeCounts.get(page); + if (!badge || count === undefined) return; badge.hidden = count === 0; - badge.textContent = String(count); - badge.classList.toggle("quiet", !accent); + badge.textContent = formatNumber(count); + badge.classList.toggle("quiet", page !== "jobs"); + document.getElementById(`badge-text-${page}`).textContent = + count === 0 ? "" : plural(page === "jobs" ? "Admin.Jobs.RunningCount" : "Admin.Users.Accounts", count); +} + +function storedTheme() { + try { + return localStorage.getItem(THEME_KEY); + } catch { + return null; + } +} + +/** Light or dark as chosen in this browser; without a choice the operating system's setting applies (admin.css). */ +function applyTheme(theme) { + if (theme === "light" || theme === "dark") document.documentElement.dataset.theme = theme; +} + +function isDark() { + const chosen = document.documentElement.dataset.theme; + return chosen ? chosen === "dark" : matchMedia("(prefers-color-scheme: dark)").matches; } function cap(s) { diff --git a/src/Titano.Server/Admin/web/audit.js b/src/Titano.Server/Admin/web/audit.js new file mode 100644 index 00000000..6dab57fe --- /dev/null +++ b/src/Titano.Server/Admin/web/audit.js @@ -0,0 +1,59 @@ +// Audit entries as the dashboard and the Logs page show them: server codes (actions, job kinds, roles, changed +// fields) in words; names, titles and templates stay as recorded. +import { t, has, plural } from "./i18n.js"; +import { formatBytes } from "./ui.js"; +import { kindLabel, pascal } from "./jobs.js"; + +export function actionLabel(action) { + const key = `Admin.Logs.Action.${pascal(action)}`; + return has(key) ? t(key) : action; +} + +/** One sentence per entry, e.g. "alberto signed in · Titano 0.1.0" (unknown actions show their code). */ +export function activityText(entry) { + const key = `Admin.Activity.${pascal(entry.action)}`; + return has(key) ? t(key, entry.username ?? "—", detailText(entry)) : `${entry.username ?? ""} ${entry.action}`; +} + +/** The details of an entry: "verify" → "Verify", "lucia · editor" → "lucia · Editor", "role=viewer, quota=0" → "role Viewer, no quota". */ +export function detailText(entry) { + const details = entry.details ?? ""; + if (!details) return ""; + switch (entry.action) { + case "job_created": { + const [kind, ...label] = details.split(" · "); + return [kindLabel(kind), ...label].join(" · "); + } + case "user_created": { + const [name, role] = splitLast(details); + return role === undefined ? details : `${name} · ${roleLabel(role)}`; + } + case "user_deleted": { + const [name, count] = splitLast(details); + return /^\d+$/.test(count ?? "") ? `${name} · ${plural("Admin.Logs.Reassigned", Number(count))}` : details; + } + case "user_updated": + case "sequence_updated": + return details.split(", ").map(changeLabel).join(", "); + default: + return details; + } +} + +export function roleLabel(role) { + const key = `Admin.Role.${pascal(role)}`; + return has(key) ? t(key) : role; +} + +function changeLabel(change) { + const [field, value] = change.split("="); + if (field === "role") return t("Admin.Logs.Field.Role", roleLabel(value ?? "")); + if (field === "quota") return Number(value) > 0 ? t("Admin.Logs.Field.Quota", formatBytes(Number(value))) : t("Admin.Logs.Field.NoQuota"); + const key = `Admin.Logs.Field.${pascal(field)}`; + return has(key) ? t(key) : change; +} + +function splitLast(details) { + const at = details.lastIndexOf(" · "); + return at < 0 ? [details] : [details.slice(0, at), details.slice(at + 3)]; +} diff --git a/src/Titano.Server/Admin/web/i18n.js b/src/Titano.Server/Admin/web/i18n.js index 5014e5ef..823fcd16 100644 --- a/src/Titano.Server/Admin/web/i18n.js +++ b/src/Titano.Server/Admin/web/i18n.js @@ -42,8 +42,16 @@ export function languages() { /** Localized string for key with {0}, {1}… placeholders filled from args. */ export function t(key, ...args) { const s = strings[key]; - if (s === undefined) return `⟦${key}⟧`; - return s.replace(/\{(\d+)(?:[,:][^}]*)?\}/g, (_, i) => String(args[Number(i)] ?? "")); + return s === undefined ? `⟦${key}⟧` : fill(s, args); +} + +/** + * Plural-aware t(): the key.one / .few / .many / .other form for count n (CLDR rules of the current language), + * with the formatted count as {0} and args as {1}… + */ +export function plural(key, n, ...args) { + const s = strings[`${key}.${pluralCategory(n)}`] ?? strings[`${key}.other`]; + return s === undefined ? `⟦${key}⟧` : fill(s, [new Intl.NumberFormat(culture()).format(n), ...args]); } /** True when the catalog has the key (for keys built from data, e.g. audit actions). */ @@ -64,3 +72,18 @@ export function applyStrings(root) { el.placeholder = t(el.dataset.i18nPlaceholder); }); } + +function fill(s, args) { + return s.replace(/\{(\d+)(?:[,:][^}]*)?\}/g, (_, i) => String(args[Number(i)] ?? "")); +} + +/** + * Plural category as Titano.Core PluralRules folds CLDR for the catalog: "two" is written as few, and "zero" as + * many in Latvian and as other elsewhere (Arabic). + */ +function pluralCategory(n) { + const category = new Intl.PluralRules(culture()).select(n); + if (category === "two") return "few"; + if (category === "zero") return culture().startsWith("lv") ? "many" : "other"; + return category; +} diff --git a/src/Titano.Server/Admin/web/index.html b/src/Titano.Server/Admin/web/index.html index 12113418..8170f42a 100644 --- a/src/Titano.Server/Admin/web/index.html +++ b/src/Titano.Server/Admin/web/index.html @@ -3,13 +3,13 @@ - + Titano Server - +