fix(admin-web): layout, accessibility, right-to-left, plurals and dark theme

Tables become ARIA tables laid out as subgrids that drop secondary columns
in narrow panels; stat tiles stay on one row; charts are named and keep
their axis labels inside; paths, templates and logs stay left to right;
counts use plural keys; the panel follows the system theme with a toggle.
Own account: Change password instead of Reset password.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
This commit is contained in:
Claude committed 2026-10-06 20:57:18 +00:00
1 parent 186e538a42
commit a2713ab08b
16 files changed
+1071 -430

No files matched your search

+65
View File
@@ -50,12 +50,16 @@
<data name="Admin.Archive.Scan.Tip" xml:space="preserve"><value>Look for new and changed sequences on disk</value></data>
<data name="Admin.Archive.Sequences" xml:space="preserve"><value>Sequences</value></data>
<data name="Admin.Archive.Unverified" xml:space="preserve"><value>unverified</value></data>
<data name="Admin.Archive.UnverifiedUnit.one" xml:space="preserve"><value>unverified</value></data>
<data name="Admin.Archive.UnverifiedUnit.other" xml:space="preserve"><value>unverified</value></data>
<data name="Admin.Archive.Verify" xml:space="preserve"><value>Verify</value></data>
<data name="Admin.Archive.Verify.Tip" xml:space="preserve"><value>Read every original again and compare its SHA-256</value></data>
<data name="Admin.Common.Actions" xml:space="preserve"><value>Actions</value></data>
<data name="Admin.Common.Cancel" xml:space="preserve"><value>Cancel</value></data>
<data name="Admin.Common.Cancel.Tip" xml:space="preserve"><value>Discard the changes</value></data>
<data name="Admin.Common.Close" xml:space="preserve"><value>Close</value></data>
<data name="Admin.Common.Close.Tip" xml:space="preserve"><value>Close this panel</value></data>
<data name="Admin.Common.Invalid" xml:space="preserve"><value>The value of {0} is not valid; correct it and save again.</value><comment>long</comment></data>
<data name="Admin.Common.Keep" xml:space="preserve"><value>Keep</value></data>
<data name="Admin.Common.Keep.Tip" xml:space="preserve"><value>Leave everything as it is</value></data>
<data name="Admin.Common.More" xml:space="preserve"><value>Load more</value></data>
@@ -64,13 +68,22 @@
<data name="Admin.Common.Save" xml:space="preserve"><value>Save</value></data>
<data name="Admin.Common.Save.Tip" xml:space="preserve"><value>Save the changes on the server</value></data>
<data name="Admin.Common.Saved" xml:space="preserve"><value>Saved.</value></data>
<data name="Admin.Common.TypeFirst.Tip" xml:space="preserve"><value>Type the name above first</value></data>
<data name="Admin.Common.TypeToConfirm" xml:space="preserve"><value>Type {0} to confirm</value><comment>long</comment></data>
<data name="Admin.Common.TypeToConfirm.Tip" xml:space="preserve"><value>Type the name exactly as shown to confirm</value></data>
<data name="Admin.Dashboard.Activity" xml:space="preserve"><value>Recent activity</value></data>
<data name="Admin.Dashboard.AllLogs" xml:space="preserve"><value>All logs</value></data>
<data name="Admin.Dashboard.AllLogs.Tip" xml:space="preserve"><value>Open the audit log</value></data>
<data name="Admin.Dashboard.Archive" xml:space="preserve"><value>Archive</value></data>
<data name="Admin.Dashboard.ByYear" xml:space="preserve"><value>Storage by year</value></data>
<data name="Admin.Dashboard.CameraCount.one" xml:space="preserve"><value>{0} camera</value></data>
<data name="Admin.Dashboard.CameraCount.other" xml:space="preserve"><value>{0} cameras</value></data>
<data name="Admin.Dashboard.DiscoveryOff" xml:space="preserve"><value>discovery off</value></data>
<data name="Admin.Dashboard.DiscoveryOn" xml:space="preserve"><value>discovery on</value></data>
<data name="Admin.Dashboard.DoneToday.one" xml:space="preserve"><value>{0} done today</value></data>
<data name="Admin.Dashboard.DoneToday.other" xml:space="preserve"><value>{0} done today</value></data>
<data name="Admin.Dashboard.FailedToday.one" xml:space="preserve"><value>{0} failed</value></data>
<data name="Admin.Dashboard.FailedToday.other" xml:space="preserve"><value>{0} failed</value></data>
<data name="Admin.Dashboard.Free" xml:space="preserve"><value>{0} free</value></data>
<data name="Admin.Dashboard.JobCounts" xml:space="preserve"><value>{0} queued · {1} done today · {2} failed</value><comment>long</comment></data>
<data name="Admin.Dashboard.Jobs" xml:space="preserve"><value>Jobs</value></data>
@@ -82,14 +95,25 @@
<data name="Admin.Dashboard.Of" xml:space="preserve"><value>of {0}</value></data>
<data name="Admin.Dashboard.Online" xml:space="preserve"><value>online</value></data>
<data name="Admin.Dashboard.Originals" xml:space="preserve"><value>originals {0}</value></data>
<data name="Admin.Dashboard.PhotoCount.one" xml:space="preserve"><value>{0} photo</value></data>
<data name="Admin.Dashboard.PhotoCount.other" xml:space="preserve"><value>{0} photos</value></data>
<data name="Admin.Dashboard.PhotosCameras" xml:space="preserve"><value>{0} photos · {1} cameras</value></data>
<data name="Admin.Dashboard.Queue" xml:space="preserve"><value>Queue and history</value></data>
<data name="Admin.Dashboard.Queue.Tip" xml:space="preserve"><value>Open the Jobs page</value></data>
<data name="Admin.Dashboard.QueuedCount.one" xml:space="preserve"><value>{0} queued</value></data>
<data name="Admin.Dashboard.QueuedCount.other" xml:space="preserve"><value>{0} queued</value></data>
<data name="Admin.Dashboard.Refresh.Tip" xml:space="preserve"><value>Read the dashboard again</value></data>
<data name="Admin.Dashboard.Running" xml:space="preserve"><value>running</value></data>
<data name="Admin.Dashboard.SequenceUnit.one" xml:space="preserve"><value>sequence</value></data>
<data name="Admin.Dashboard.SequenceUnit.other" xml:space="preserve"><value>sequences</value></data>
<data name="Admin.Dashboard.Sequences" xml:space="preserve"><value>sequences</value></data>
<data name="Admin.Dashboard.Storage" xml:space="preserve"><value>Storage</value></data>
<data name="Admin.Dashboard.UploadTotals" xml:space="preserve"><value>frames per day · {0} total · peak {1}</value><comment>long</comment></data>
<data name="Admin.Dashboard.Uploads" xml:space="preserve"><value>Uploads · last 30 days</value></data>
<data name="Admin.Dashboard.WithoutProxies.one" xml:space="preserve"><value>{0} sequence without proxies</value><comment>long</comment></data>
<data name="Admin.Dashboard.WithoutProxies.other" xml:space="preserve"><value>{0} sequences without proxies</value><comment>long</comment></data>
<data name="Admin.Dashboard.WorkerCount.one" xml:space="preserve"><value>{0} worker</value></data>
<data name="Admin.Dashboard.WorkerCount.other" xml:space="preserve"><value>{0} workers</value></data>
<data name="Admin.Dashboard.Workers" xml:space="preserve"><value>{0} workers</value></data>
<data name="Admin.Error.Unreachable" xml:space="preserve"><value>The server did not answer; try again.</value><comment>long</comment></data>
<data name="Admin.Job.Kind.Adopt" xml:space="preserve"><value>Adopt</value></data>
@@ -137,9 +161,12 @@
<data name="Admin.Jobs.Log.Tip" xml:space="preserve"><value>Show or hide the job log</value></data>
<data name="Admin.Jobs.Meta" xml:space="preserve"><value>{0} running · {1} nodes online</value><comment>long</comment></data>
<data name="Admin.Jobs.NoNodes" xml:space="preserve"><value>No render nodes</value></data>
<data name="Admin.Jobs.NoNodes.Tip" xml:space="preserve"><value>Give a user the render-node right; their Titano client can then offer the PC</value></data>
<data name="Admin.Jobs.Node" xml:space="preserve"><value>Node</value></data>
<data name="Admin.Jobs.NodeName" xml:space="preserve"><value>Node</value></data>
<data name="Admin.Jobs.Nodes" xml:space="preserve"><value>Render nodes</value></data>
<data name="Admin.Jobs.NodesOnline.one" xml:space="preserve"><value>{0} node online</value></data>
<data name="Admin.Jobs.NodesOnline.other" xml:space="preserve"><value>{0} nodes online</value></data>
<data name="Admin.Jobs.Owner" xml:space="preserve"><value>Owner</value></data>
<data name="Admin.Jobs.Pause" xml:space="preserve"><value>Pause</value></data>
<data name="Admin.Jobs.Pause.Tip" xml:space="preserve"><value>Stop at the next checkpoint and keep the progress</value></data>
@@ -154,7 +181,11 @@
<data name="Admin.Jobs.Resume.Tip" xml:space="preserve"><value>Put the job back in the queue from its checkpoint</value></data>
<data name="Admin.Jobs.Retry" xml:space="preserve"><value>Retry</value></data>
<data name="Admin.Jobs.Retry.Tip" xml:space="preserve"><value>Queue the job again from its last checkpoint</value></data>
<data name="Admin.Jobs.RunningCount.one" xml:space="preserve"><value>{0} running</value></data>
<data name="Admin.Jobs.RunningCount.other" xml:space="preserve"><value>{0} running</value></data>
<data name="Admin.Jobs.Server" xml:space="preserve"><value>server</value></data>
<data name="Admin.Jobs.ShowAll" xml:space="preserve"><value>Show all</value></data>
<data name="Admin.Jobs.ShowAll.Tip" xml:space="preserve"><value>Show jobs in every state</value></data>
<data name="Admin.Jobs.State" xml:space="preserve"><value>State</value></data>
<data name="Admin.Jobs.Target" xml:space="preserve"><value>Target</value></data>
<data name="Admin.Language.Tip" xml:space="preserve"><value>Language of this panel</value></data>
@@ -186,10 +217,26 @@
<data name="Admin.Logs.Download" xml:space="preserve"><value>Download</value></data>
<data name="Admin.Logs.Download.Tip" xml:space="preserve"><value>Save this log file</value></data>
<data name="Admin.Logs.Empty" xml:space="preserve"><value>Nothing recorded yet</value></data>
<data name="Admin.Logs.Field.Disabled" xml:space="preserve"><value>disabled</value></data>
<data name="Admin.Logs.Field.DisplayName" xml:space="preserve"><value>display name</value></data>
<data name="Admin.Logs.Field.Enabled" xml:space="preserve"><value>enabled</value></data>
<data name="Admin.Logs.Field.NoQuota" xml:space="preserve"><value>no quota</value></data>
<data name="Admin.Logs.Field.Notes" xml:space="preserve"><value>notes</value></data>
<data name="Admin.Logs.Field.Permissions" xml:space="preserve"><value>permissions</value></data>
<data name="Admin.Logs.Field.Quota" xml:space="preserve"><value>quota {0}</value></data>
<data name="Admin.Logs.Field.Rating" xml:space="preserve"><value>rating</value></data>
<data name="Admin.Logs.Field.Role" xml:space="preserve"><value>role {0}</value></data>
<data name="Admin.Logs.Field.Settings" xml:space="preserve"><value>edit settings</value></data>
<data name="Admin.Logs.Field.Tags" xml:space="preserve"><value>tags</value></data>
<data name="Admin.Logs.Field.Title" xml:space="preserve"><value>title</value></data>
<data name="Admin.Logs.Files" xml:space="preserve"><value>Log files</value></data>
<data name="Admin.Logs.From" xml:space="preserve"><value>From</value></data>
<data name="Admin.Logs.LastLines.one" xml:space="preserve"><value>{0} line</value></data>
<data name="Admin.Logs.LastLines.other" xml:space="preserve"><value>{0} lines</value></data>
<data name="Admin.Logs.LineCount" xml:space="preserve"><value>{0} lines</value></data>
<data name="Admin.Logs.Lines.Tip" xml:space="preserve"><value>How many of the latest lines to show</value></data>
<data name="Admin.Logs.Reassigned.one" xml:space="preserve"><value>{0} sequence reassigned</value><comment>long</comment></data>
<data name="Admin.Logs.Reassigned.other" xml:space="preserve"><value>{0} sequences reassigned</value><comment>long</comment></data>
<data name="Admin.Logs.Refresh.Tip" xml:space="preserve"><value>Read the log again</value></data>
<data name="Admin.Logs.View.Audit" xml:space="preserve"><value>Audit</value></data>
<data name="Admin.Logs.View.Audit.Tip" xml:space="preserve"><value>Changes to users, sequences, the archive and settings</value></data>
@@ -247,6 +294,8 @@
<data name="Admin.Settings.MaxUploadMb" xml:space="preserve"><value>Max file (MB)</value></data>
<data name="Admin.Settings.MaxUploadMb.Tip" xml:space="preserve"><value>Largest single upload accepted</value></data>
<data name="Admin.Settings.Network" xml:space="preserve"><value>Network and TLS</value></data>
<data name="Admin.Settings.PemMissing" xml:space="preserve"><value>The PEM file was not found; enter its full path on the server.</value><comment>long</comment></data>
<data name="Admin.Settings.PemOnly.Tip" xml:space="preserve"><value>Used only in Own certificate mode</value></data>
<data name="Admin.Settings.Restart" xml:space="preserve"><value>Restart required</value></data>
<data name="Admin.Settings.Restart.Tip" xml:space="preserve"><value>Saved ports, TLS, workers, chunk size or job history apply after a restart</value></data>
<data name="Admin.Settings.Server" xml:space="preserve"><value>Server</value></data>
@@ -269,7 +318,16 @@
<data name="Admin.Settings.Workers.Tip" xml:space="preserve"><value>Jobs this server runs at the same time</value></data>
<data name="Admin.SignOut" xml:space="preserve"><value>Sign out</value></data>
<data name="Admin.SignOut.Tip" xml:space="preserve"><value>Sign out of the admin panel</value></data>
<data name="Admin.Theme.Tip" xml:space="preserve"><value>Switch between light and dark</value></data>
<data name="Admin.Users.Accounts.one" xml:space="preserve"><value>{0} account</value></data>
<data name="Admin.Users.Accounts.other" xml:space="preserve"><value>{0} accounts</value></data>
<data name="Admin.Users.Active" xml:space="preserve"><value>Active</value></data>
<data name="Admin.Users.ActiveCount.one" xml:space="preserve"><value>{0} active</value></data>
<data name="Admin.Users.ActiveCount.other" xml:space="preserve"><value>{0} active</value></data>
<data name="Admin.Users.ChangePassword" xml:space="preserve"><value>Change password</value></data>
<data name="Admin.Users.ChangePassword.Tip" xml:space="preserve"><value>Choose a new password for your account; your other sessions end</value></data>
<data name="Admin.Users.ClearSearch" xml:space="preserve"><value>Clear search</value></data>
<data name="Admin.Users.ClearSearch.Tip" xml:space="preserve"><value>Show every account again</value></data>
<data name="Admin.Users.Copied" xml:space="preserve"><value>Password copied.</value></data>
<data name="Admin.Users.Copy.Tip" xml:space="preserve"><value>Copy the password</value></data>
<data name="Admin.Users.Create" xml:space="preserve"><value>Create</value></data>
@@ -298,6 +356,9 @@
<data name="Admin.Users.MustChangeFlag.Tip" xml:space="preserve"><value>Always required for accounts created here</value></data>
<data name="Admin.Users.New" xml:space="preserve"><value>New user</value></data>
<data name="Admin.Users.New.Tip" xml:space="preserve"><value>Create an account; the user must change the password at first sign-in</value></data>
<data name="Admin.Users.PasswordChanged" xml:space="preserve"><value>Password changed.</value></data>
<data name="Admin.Users.PasswordPolicy.one" xml:space="preserve"><value>Passwords: PBKDF2-SHA512, {0} character minimum</value><comment>long</comment></data>
<data name="Admin.Users.PasswordPolicy.other" xml:space="preserve"><value>Passwords: PBKDF2-SHA512, {0} characters minimum</value><comment>long</comment></data>
<data name="Admin.Users.Policy" xml:space="preserve"><value>Passwords: PBKDF2-SHA512, {0} characters minimum · tokens expire after {1} days idle</value><comment>long</comment></data>
<data name="Admin.Users.Quota" xml:space="preserve"><value>Quota</value></data>
<data name="Admin.Users.Quota.Tip" xml:space="preserve"><value>Originals uploaded by this user count against the quota; 0 = unlimited</value></data>
@@ -312,13 +373,17 @@
<data name="Admin.Users.Role.Editor.Tip" xml:space="preserve"><value>Import, edit, render, upload and download</value></data>
<data name="Admin.Users.Role.Uploader.Tip" xml:space="preserve"><value>Upload only; cannot edit sequences</value></data>
<data name="Admin.Users.Role.Viewer.Tip" xml:space="preserve"><value>Browse and download renders only</value></data>
<data name="Admin.Users.SavePassword.Tip" xml:space="preserve"><value>Replace your password; this session stays signed in</value></data>
<data name="Admin.Users.Search" xml:space="preserve"><value>Search</value></data>
<data name="Admin.Users.Search.Tip" xml:space="preserve"><value>Filter by user or display name</value></data>
<data name="Admin.Users.SignInLog" xml:space="preserve"><value>Sign-in log</value></data>
<data name="Admin.Users.SignInLog.Tip" xml:space="preserve"><value>Who signed in from where, and when</value></data>
<data name="Admin.Users.Status" xml:space="preserve"><value>Status</value></data>
<data name="Admin.Users.Taken" xml:space="preserve"><value>That user name is taken; choose another.</value><comment>long</comment></data>
<data name="Admin.Users.TempPassword" xml:space="preserve"><value>Temporary password</value></data>
<data name="Admin.Users.TempPassword.Tip" xml:space="preserve"><value>Give this to the user; they must replace it at first sign-in</value></data>
<data name="Admin.Users.TokenPolicy.one" xml:space="preserve"><value>tokens expire after {0} day idle</value><comment>long</comment></data>
<data name="Admin.Users.TokenPolicy.other" xml:space="preserve"><value>tokens expire after {0} days idle</value><comment>long</comment></data>
<data name="Admin.Users.Uploads" xml:space="preserve"><value>Uploads 30 d</value></data>
<data name="Admin.Users.User" xml:space="preserve"><value>User</value></data>
<data name="Admin.Users.Username" xml:space="preserve"><value>Username</value></data>
+65
View File
@@ -50,12 +50,16 @@
<data name="Admin.Archive.Scan.Tip" xml:space="preserve"><value>Cerca sequenze nuove e modificate sul disco</value></data>
<data name="Admin.Archive.Sequences" xml:space="preserve"><value>Sequenze</value></data>
<data name="Admin.Archive.Unverified" xml:space="preserve"><value>non verificate</value></data>
<data name="Admin.Archive.UnverifiedUnit.one" xml:space="preserve"><value>non verificata</value></data>
<data name="Admin.Archive.UnverifiedUnit.other" xml:space="preserve"><value>non verificate</value></data>
<data name="Admin.Archive.Verify" xml:space="preserve"><value>Verifica</value></data>
<data name="Admin.Archive.Verify.Tip" xml:space="preserve"><value>Rileggi ogni originale e confronta il suo SHA-256</value></data>
<data name="Admin.Common.Actions" xml:space="preserve"><value>Azioni</value></data>
<data name="Admin.Common.Cancel" xml:space="preserve"><value>Annulla</value></data>
<data name="Admin.Common.Cancel.Tip" xml:space="preserve"><value>Scarta le modifiche</value></data>
<data name="Admin.Common.Close" xml:space="preserve"><value>Chiudi</value></data>
<data name="Admin.Common.Close.Tip" xml:space="preserve"><value>Chiudi questo pannello</value></data>
<data name="Admin.Common.Invalid" xml:space="preserve"><value>Il valore di {0} non è valido; correggilo e salva di nuovo.</value></data>
<data name="Admin.Common.Keep" xml:space="preserve"><value>Mantieni</value></data>
<data name="Admin.Common.Keep.Tip" xml:space="preserve"><value>Lascia tutto com'è</value></data>
<data name="Admin.Common.More" xml:space="preserve"><value>Carica altri</value></data>
@@ -64,13 +68,22 @@
<data name="Admin.Common.Save" xml:space="preserve"><value>Salva</value></data>
<data name="Admin.Common.Save.Tip" xml:space="preserve"><value>Salva le modifiche sul server</value></data>
<data name="Admin.Common.Saved" xml:space="preserve"><value>Salvato.</value></data>
<data name="Admin.Common.TypeFirst.Tip" xml:space="preserve"><value>Prima digita il nome qui sopra</value></data>
<data name="Admin.Common.TypeToConfirm" xml:space="preserve"><value>Digita {0} per confermare</value></data>
<data name="Admin.Common.TypeToConfirm.Tip" xml:space="preserve"><value>Digita il nome esattamente come mostrato per confermare</value></data>
<data name="Admin.Dashboard.Activity" xml:space="preserve"><value>Attività recenti</value></data>
<data name="Admin.Dashboard.AllLogs" xml:space="preserve"><value>Tutti i log</value></data>
<data name="Admin.Dashboard.AllLogs.Tip" xml:space="preserve"><value>Apri il registro di controllo</value></data>
<data name="Admin.Dashboard.Archive" xml:space="preserve"><value>Archivio</value></data>
<data name="Admin.Dashboard.ByYear" xml:space="preserve"><value>Spazio per anno</value></data>
<data name="Admin.Dashboard.CameraCount.one" xml:space="preserve"><value>{0} fotocamera</value></data>
<data name="Admin.Dashboard.CameraCount.other" xml:space="preserve"><value>{0} fotocamere</value></data>
<data name="Admin.Dashboard.DiscoveryOff" xml:space="preserve"><value>rilevamento spento</value></data>
<data name="Admin.Dashboard.DiscoveryOn" xml:space="preserve"><value>rilevamento attivo</value></data>
<data name="Admin.Dashboard.DoneToday.one" xml:space="preserve"><value>{0} completato oggi</value></data>
<data name="Admin.Dashboard.DoneToday.other" xml:space="preserve"><value>{0} completati oggi</value></data>
<data name="Admin.Dashboard.FailedToday.one" xml:space="preserve"><value>{0} fallito</value></data>
<data name="Admin.Dashboard.FailedToday.other" xml:space="preserve"><value>{0} falliti</value></data>
<data name="Admin.Dashboard.Free" xml:space="preserve"><value>{0} liberi</value></data>
<data name="Admin.Dashboard.JobCounts" xml:space="preserve"><value>{0} in coda · {1} completati oggi · {2} falliti</value></data>
<data name="Admin.Dashboard.Jobs" xml:space="preserve"><value>Job</value></data>
@@ -82,14 +95,25 @@
<data name="Admin.Dashboard.Of" xml:space="preserve"><value>di {0}</value></data>
<data name="Admin.Dashboard.Online" xml:space="preserve"><value>online</value></data>
<data name="Admin.Dashboard.Originals" xml:space="preserve"><value>originali {0}</value></data>
<data name="Admin.Dashboard.PhotoCount.one" xml:space="preserve"><value>{0} foto</value></data>
<data name="Admin.Dashboard.PhotoCount.other" xml:space="preserve"><value>{0} foto</value></data>
<data name="Admin.Dashboard.PhotosCameras" xml:space="preserve"><value>{0} foto · {1} fotocamere</value></data>
<data name="Admin.Dashboard.Queue" xml:space="preserve"><value>Coda e cronologia</value></data>
<data name="Admin.Dashboard.Queue.Tip" xml:space="preserve"><value>Apri la pagina Job</value></data>
<data name="Admin.Dashboard.QueuedCount.one" xml:space="preserve"><value>{0} in coda</value></data>
<data name="Admin.Dashboard.QueuedCount.other" xml:space="preserve"><value>{0} in coda</value></data>
<data name="Admin.Dashboard.Refresh.Tip" xml:space="preserve"><value>Rileggi la panoramica</value></data>
<data name="Admin.Dashboard.Running" xml:space="preserve"><value>in corso</value></data>
<data name="Admin.Dashboard.SequenceUnit.one" xml:space="preserve"><value>sequenza</value></data>
<data name="Admin.Dashboard.SequenceUnit.other" xml:space="preserve"><value>sequenze</value></data>
<data name="Admin.Dashboard.Sequences" xml:space="preserve"><value>sequenze</value></data>
<data name="Admin.Dashboard.Storage" xml:space="preserve"><value>Spazio</value></data>
<data name="Admin.Dashboard.UploadTotals" xml:space="preserve"><value>foto al giorno · {0} totali · picco {1}</value></data>
<data name="Admin.Dashboard.Uploads" xml:space="preserve"><value>Caricamenti · ultimi 30 giorni</value></data>
<data name="Admin.Dashboard.WithoutProxies.one" xml:space="preserve"><value>{0} sequenza senza proxy</value></data>
<data name="Admin.Dashboard.WithoutProxies.other" xml:space="preserve"><value>{0} sequenze senza proxy</value></data>
<data name="Admin.Dashboard.WorkerCount.one" xml:space="preserve"><value>{0} worker</value></data>
<data name="Admin.Dashboard.WorkerCount.other" xml:space="preserve"><value>{0} worker</value></data>
<data name="Admin.Dashboard.Workers" xml:space="preserve"><value>{0} worker</value></data>
<data name="Admin.Error.Unreachable" xml:space="preserve"><value>Il server non ha risposto; riprova.</value></data>
<data name="Admin.Job.Kind.Adopt" xml:space="preserve"><value>Adozione</value></data>
@@ -137,9 +161,12 @@
<data name="Admin.Jobs.Log.Tip" xml:space="preserve"><value>Mostra o nascondi il log del job</value></data>
<data name="Admin.Jobs.Meta" xml:space="preserve"><value>{0} in corso · {1} nodi online</value></data>
<data name="Admin.Jobs.NoNodes" xml:space="preserve"><value>Nessun nodo di rendering</value></data>
<data name="Admin.Jobs.NoNodes.Tip" xml:space="preserve"><value>Concedi a un utente il permesso di nodo di rendering; il suo client Titano potrà offrire il PC</value></data>
<data name="Admin.Jobs.Node" xml:space="preserve"><value>Nodo</value></data>
<data name="Admin.Jobs.NodeName" xml:space="preserve"><value>Nodo</value></data>
<data name="Admin.Jobs.Nodes" xml:space="preserve"><value>Nodi di rendering</value></data>
<data name="Admin.Jobs.NodesOnline.one" xml:space="preserve"><value>{0} nodo online</value></data>
<data name="Admin.Jobs.NodesOnline.other" xml:space="preserve"><value>{0} nodi online</value></data>
<data name="Admin.Jobs.Owner" xml:space="preserve"><value>Proprietario</value></data>
<data name="Admin.Jobs.Pause" xml:space="preserve"><value>Pausa</value></data>
<data name="Admin.Jobs.Pause.Tip" xml:space="preserve"><value>Fermati al prossimo punto di controllo e mantieni l'avanzamento</value></data>
@@ -154,7 +181,11 @@
<data name="Admin.Jobs.Resume.Tip" xml:space="preserve"><value>Rimetti il job in coda dal suo punto di controllo</value></data>
<data name="Admin.Jobs.Retry" xml:space="preserve"><value>Riprova</value></data>
<data name="Admin.Jobs.Retry.Tip" xml:space="preserve"><value>Rimetti in coda il job dall'ultimo punto di controllo</value></data>
<data name="Admin.Jobs.RunningCount.one" xml:space="preserve"><value>{0} in corso</value></data>
<data name="Admin.Jobs.RunningCount.other" xml:space="preserve"><value>{0} in corso</value></data>
<data name="Admin.Jobs.Server" xml:space="preserve"><value>server</value></data>
<data name="Admin.Jobs.ShowAll" xml:space="preserve"><value>Mostra tutti</value></data>
<data name="Admin.Jobs.ShowAll.Tip" xml:space="preserve"><value>Mostra i job in ogni stato</value></data>
<data name="Admin.Jobs.State" xml:space="preserve"><value>Stato</value></data>
<data name="Admin.Jobs.Target" xml:space="preserve"><value>Oggetto</value></data>
<data name="Admin.Language.Tip" xml:space="preserve"><value>Lingua di questo pannello</value></data>
@@ -186,10 +217,26 @@
<data name="Admin.Logs.Download" xml:space="preserve"><value>Scarica</value></data>
<data name="Admin.Logs.Download.Tip" xml:space="preserve"><value>Salva questo file di log</value></data>
<data name="Admin.Logs.Empty" xml:space="preserve"><value>Ancora nessuna registrazione</value></data>
<data name="Admin.Logs.Field.Disabled" xml:space="preserve"><value>disattivato</value></data>
<data name="Admin.Logs.Field.DisplayName" xml:space="preserve"><value>nome visualizzato</value></data>
<data name="Admin.Logs.Field.Enabled" xml:space="preserve"><value>riattivato</value></data>
<data name="Admin.Logs.Field.NoQuota" xml:space="preserve"><value>nessuna quota</value></data>
<data name="Admin.Logs.Field.Notes" xml:space="preserve"><value>note</value></data>
<data name="Admin.Logs.Field.Permissions" xml:space="preserve"><value>permessi</value></data>
<data name="Admin.Logs.Field.Quota" xml:space="preserve"><value>quota {0}</value></data>
<data name="Admin.Logs.Field.Rating" xml:space="preserve"><value>valutazione</value></data>
<data name="Admin.Logs.Field.Role" xml:space="preserve"><value>ruolo {0}</value></data>
<data name="Admin.Logs.Field.Settings" xml:space="preserve"><value>impostazioni di modifica</value></data>
<data name="Admin.Logs.Field.Tags" xml:space="preserve"><value>tag</value></data>
<data name="Admin.Logs.Field.Title" xml:space="preserve"><value>titolo</value></data>
<data name="Admin.Logs.Files" xml:space="preserve"><value>File di log</value></data>
<data name="Admin.Logs.From" xml:space="preserve"><value>Da</value></data>
<data name="Admin.Logs.LastLines.one" xml:space="preserve"><value>{0} riga</value></data>
<data name="Admin.Logs.LastLines.other" xml:space="preserve"><value>{0} righe</value></data>
<data name="Admin.Logs.LineCount" xml:space="preserve"><value>{0} righe</value></data>
<data name="Admin.Logs.Lines.Tip" xml:space="preserve"><value>Quante delle ultime righe mostrare</value></data>
<data name="Admin.Logs.Reassigned.one" xml:space="preserve"><value>{0} sequenza riassegnata</value></data>
<data name="Admin.Logs.Reassigned.other" xml:space="preserve"><value>{0} sequenze riassegnate</value></data>
<data name="Admin.Logs.Refresh.Tip" xml:space="preserve"><value>Rileggi il log</value></data>
<data name="Admin.Logs.View.Audit" xml:space="preserve"><value>Controllo</value></data>
<data name="Admin.Logs.View.Audit.Tip" xml:space="preserve"><value>Modifiche a utenti, sequenze, archivio e impostazioni</value></data>
@@ -247,6 +294,8 @@
<data name="Admin.Settings.MaxUploadMb" xml:space="preserve"><value>File massimo (MB)</value></data>
<data name="Admin.Settings.MaxUploadMb.Tip" xml:space="preserve"><value>Caricamento singolo più grande accettato</value></data>
<data name="Admin.Settings.Network" xml:space="preserve"><value>Rete e TLS</value></data>
<data name="Admin.Settings.PemMissing" xml:space="preserve"><value>File PEM non trovato; inserisci il percorso completo sul server.</value></data>
<data name="Admin.Settings.PemOnly.Tip" xml:space="preserve"><value>Usato solo in modalità Certificato proprio</value></data>
<data name="Admin.Settings.Restart" xml:space="preserve"><value>Riavvio richiesto</value></data>
<data name="Admin.Settings.Restart.Tip" xml:space="preserve"><value>Porte, TLS, worker, dimensione blocchi o cronologia job salvati valgono dopo un riavvio</value></data>
<data name="Admin.Settings.Server" xml:space="preserve"><value>Server</value></data>
@@ -269,7 +318,16 @@
<data name="Admin.Settings.Workers.Tip" xml:space="preserve"><value>Job che questo server esegue contemporaneamente</value></data>
<data name="Admin.SignOut" xml:space="preserve"><value>Esci</value></data>
<data name="Admin.SignOut.Tip" xml:space="preserve"><value>Esci dal pannello di amministrazione</value></data>
<data name="Admin.Theme.Tip" xml:space="preserve"><value>Alterna tema chiaro e scuro</value></data>
<data name="Admin.Users.Accounts.one" xml:space="preserve"><value>{0} account</value></data>
<data name="Admin.Users.Accounts.other" xml:space="preserve"><value>{0} account</value></data>
<data name="Admin.Users.Active" xml:space="preserve"><value>Attivo</value></data>
<data name="Admin.Users.ActiveCount.one" xml:space="preserve"><value>{0} attivo</value></data>
<data name="Admin.Users.ActiveCount.other" xml:space="preserve"><value>{0} attivi</value></data>
<data name="Admin.Users.ChangePassword" xml:space="preserve"><value>Cambia password</value></data>
<data name="Admin.Users.ChangePassword.Tip" xml:space="preserve"><value>Scegli una nuova password per il tuo account; le altre sessioni terminano</value></data>
<data name="Admin.Users.ClearSearch" xml:space="preserve"><value>Cancella ricerca</value></data>
<data name="Admin.Users.ClearSearch.Tip" xml:space="preserve"><value>Mostra di nuovo tutti gli account</value></data>
<data name="Admin.Users.Copied" xml:space="preserve"><value>Password copiata.</value></data>
<data name="Admin.Users.Copy.Tip" xml:space="preserve"><value>Copia la password</value></data>
<data name="Admin.Users.Create" xml:space="preserve"><value>Crea</value></data>
@@ -298,6 +356,9 @@
<data name="Admin.Users.MustChangeFlag.Tip" xml:space="preserve"><value>Sempre richiesto per gli account creati qui</value></data>
<data name="Admin.Users.New" xml:space="preserve"><value>Nuovo utente</value></data>
<data name="Admin.Users.New.Tip" xml:space="preserve"><value>Crea un account; l'utente deve cambiare la password al primo accesso</value></data>
<data name="Admin.Users.PasswordChanged" xml:space="preserve"><value>Password cambiata.</value></data>
<data name="Admin.Users.PasswordPolicy.one" xml:space="preserve"><value>Password: PBKDF2-SHA512, almeno {0} carattere</value></data>
<data name="Admin.Users.PasswordPolicy.other" xml:space="preserve"><value>Password: PBKDF2-SHA512, almeno {0} caratteri</value></data>
<data name="Admin.Users.Policy" xml:space="preserve"><value>Password: PBKDF2-SHA512, almeno {0} caratteri · i token scadono dopo {1} giorni di inattività</value></data>
<data name="Admin.Users.Quota" xml:space="preserve"><value>Quota</value></data>
<data name="Admin.Users.Quota.Tip" xml:space="preserve"><value>Gli originali caricati da questo utente contano nella quota; 0 = illimitata</value></data>
@@ -312,13 +373,17 @@
<data name="Admin.Users.Role.Editor.Tip" xml:space="preserve"><value>Importa, modifica, esegue rendering, carica e scarica</value></data>
<data name="Admin.Users.Role.Uploader.Tip" xml:space="preserve"><value>Solo caricamento; non può modificare le sequenze</value></data>
<data name="Admin.Users.Role.Viewer.Tip" xml:space="preserve"><value>Solo consultazione e download dei rendering</value></data>
<data name="Admin.Users.SavePassword.Tip" xml:space="preserve"><value>Sostituisci la password; questa sessione resta collegata</value></data>
<data name="Admin.Users.Search" xml:space="preserve"><value>Cerca</value></data>
<data name="Admin.Users.Search.Tip" xml:space="preserve"><value>Filtra per nome utente o nome visualizzato</value></data>
<data name="Admin.Users.SignInLog" xml:space="preserve"><value>Registro accessi</value></data>
<data name="Admin.Users.SignInLog.Tip" xml:space="preserve"><value>Chi ha effettuato l'accesso, da dove e quando</value></data>
<data name="Admin.Users.Status" xml:space="preserve"><value>Stato</value></data>
<data name="Admin.Users.Taken" xml:space="preserve"><value>Questo nome utente è già in uso; scegline un altro.</value></data>
<data name="Admin.Users.TempPassword" xml:space="preserve"><value>Password temporanea</value></data>
<data name="Admin.Users.TempPassword.Tip" xml:space="preserve"><value>Comunicala all'utente; dovrà sostituirla al primo accesso</value></data>
<data name="Admin.Users.TokenPolicy.one" xml:space="preserve"><value>i token scadono dopo {0} giorno di inattività</value></data>
<data name="Admin.Users.TokenPolicy.other" xml:space="preserve"><value>i token scadono dopo {0} giorni di inattività</value></data>
<data name="Admin.Users.Uploads" xml:space="preserve"><value>Caricamenti 30 g</value></data>
<data name="Admin.Users.User" xml:space="preserve"><value>Utente</value></data>
<data name="Admin.Users.Username" xml:space="preserve"><value>Nome utente</value></data>
+160 -91
View File
@@ -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); }
}
+86 -22
View File
@@ -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 = `
<main class="login">
<form novalidate>
${brand()}
<label><span data-i18n="Admin.Login.User"></span><input class="input" name="username" autocomplete="username" required data-i18n-title="Admin.Login.User.Tip"></label>
<label><span data-i18n="Admin.Login.User"></span><input class="input" name="username" autocomplete="username" required dir="auto" data-i18n-title="Admin.Login.User.Tip"></label>
<label><span data-i18n="Admin.Login.Password"></span><input class="input" name="password" type="password" autocomplete="current-password" required data-i18n-title="Admin.Login.Password.Tip"></label>
<div class="error" role="alert">${escapeHtml(message)}</div>
<button class="btn primary" type="submit" data-i18n="Admin.Login.SignIn" data-i18n-title="Admin.Login.SignIn.Tip"></button>
@@ -74,6 +79,7 @@ function renderLogin(message = "") {
}
function renderPasswordChange() {
document.title = `${t("Admin.Password.Title")} · Titano Server`;
app.innerHTML = `
<main class="login">
<form novalidate>
@@ -114,9 +120,10 @@ function renderPasswordChange() {
form.querySelector("input").focus();
}
function renderShell(page) {
function renderShell(page, focus) {
const nav = pages.map((p) => `
<a href="#/${p}" ${p === page ? 'aria-current="page"' : ""} data-i18n-title="Admin.Nav.${cap(p)}.Tip">${icons[p]}<span data-i18n="Admin.Nav.${cap(p)}"></span><span class="badge" id="badge-${p}" hidden></span></a>`).join("");
<a href="#/${p}" ${p === page ? 'aria-current="page"' : ""} data-i18n-title="Admin.Nav.${cap(p)}.Tip">${icons[p]}<span data-i18n="Admin.Nav.${cap(p)}"></span>
<span class="sr-only" id="badge-text-${p}"></span><span class="badge" id="badge-${p}" aria-hidden="true" hidden></span></a>`).join("");
const user = api.user();
const options = languages().map((code) => `<option value="${attr(code)}" ${code === culture() ? "selected" : ""}>${escapeHtml(nativeName(code))}</option>`).join("");
app.innerHTML = `
@@ -125,23 +132,25 @@ function renderShell(page) {
${brand()}
<nav class="nav">${nav}</nav>
<div class="user">
<div class="avatar">${escapeHtml(user.username.slice(0, 1).toUpperCase())}</div>
<div class="who"><strong>${escapeHtml(user.username)}</strong><span data-i18n="Admin.Role.Admin"></span></div>
<div class="avatar" aria-hidden="true">${escapeHtml(user.username.slice(0, 1).toUpperCase())}</div>
<div class="who"><strong class="ellipsis" dir="auto" title="${attr(user.username)}">${escapeHtml(user.username)}</strong><span data-i18n="Admin.Role.Admin"></span></div>
<button class="btn icon" id="signout" data-i18n-title="Admin.SignOut.Tip">${icons.power}</button>
</div>
</aside>
<div class="main">
<header class="header">
<h1 data-i18n="Admin.Nav.${cap(page)}"></h1>
<h1 id="title" tabindex="-1" data-i18n="Admin.Nav.${cap(page)}"></h1>
<span class="meta" id="meta"></span>
<span class="spacer"></span>
<span class="actions" id="actions"></span>
<select class="input language" id="language" data-i18n-title="Admin.Language.Tip">${options}</select>
<button class="btn icon" id="theme" aria-pressed="${isDark()}" data-i18n-title="Admin.Theme.Tip">${icons.moon}</button>
</header>
<section class="content" id="content"></section>
<main class="content" id="content"></main>
</div>
</div>`;
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) {
+59
View File
@@ -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)];
}
+25 -2
View File
@@ -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;
}
+2 -2
View File
@@ -3,13 +3,13 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="color-scheme" content="light">
<meta name="color-scheme" content="light dark">
<title>Titano Server</title>
<link rel="icon" href="favicon.svg" type="image/svg+xml">
<link rel="stylesheet" href="admin.css">
<script type="module" src="app.js"></script>
</head>
<body>
<div id="app" aria-live="polite"></div>
<div id="app"></div>
</body>
</html>
+21 -4
View File
@@ -2,6 +2,10 @@
import { t, has } from "./i18n.js";
import { escapeHtml, attr, bar } from "./ui.js";
const CODECS = { h264: "H.264", hevc: "HEVC", av1: "AV1" };
/** Hardware encoder families as users know them, recognised in the Media Foundation encoder names. */
const VENDORS = [[/nvidia|nvenc/i, "NVENC"], [/intel|quick ?sync|qsv/i, "QSV"], [/amd|radeon|amf/i, "AMF"]];
export function pascal(text) {
return String(text).split(/[-_]/).map((p) => p.charAt(0).toUpperCase() + p.slice(1)).join("");
}
@@ -31,11 +35,24 @@ export function progressCell(job) {
export function stateCell(state) {
const glyph = { running: "◐", queued: "○", paused: "❚❚", done: "●", failed: "✕", cancelled: "○" }[state] ?? "";
return `<span class="state ${attr(state)}">${glyph} ${escapeHtml(stateLabel(state))}</span>`;
return `<span class="state ${attr(state)}"><span aria-hidden="true">${glyph}</span> ${escapeHtml(stateLabel(state))}</span>`;
}
/** Node encoders as "NVENC HEVC/H.264/AV1". */
/** The job log: the tail, then the error unless the tail already ends with it. */
export function logText(job) {
const tail = (job.logTail ?? "").trimEnd();
return job.error && !tail.endsWith(job.error.trim()) ? `${tail}\n${job.error}`.trim() : tail;
}
/** Node encoders by family, as "NVENC HEVC/H.264/AV1" (software encoders without a family name). */
export function encoders(node) {
const names = [...new Set(node.encoders.map((e) => e.codec.toUpperCase()))];
return names.join("/");
const families = new Map();
for (const e of node.encoders) {
const family = e.hardware ? VENDORS.find(([pattern]) => pattern.test(e.name))?.[1] ?? "" : "";
const codec = CODECS[e.codec] ?? e.codec.toUpperCase();
const codecs = families.get(family) ?? [];
if (!codecs.includes(codec)) codecs.push(codec);
families.set(family, codecs);
}
return [...families].map(([family, codecs]) => `${family} ${codecs.join("/")}`.trim()).join(", ");
}
+13 -12
View File
@@ -1,21 +1,22 @@
// About: version, API, database, uptime and the certificate fingerprint clients are asked to trust.
import { applyStrings } from "../i18n.js";
import { escapeHtml, formatDuration } from "../ui.js";
import { escapeHtml, formatDuration, fingerprint } from "../ui.js";
export async function render(root, { api, info }) {
export async function render(root, { api, info, setMeta }) {
setMeta("");
const dashboard = await api.get("/api/v1/server/dashboard").catch(() => null);
const rows = [
["Admin.About.Name", info?.name],
["Admin.About.Version", info?.version],
["Admin.About.Api", info?.apiVersion],
["Admin.About.Database", dashboard?.database],
["Admin.About.Uptime", dashboard ? formatDuration(dashboard.uptimeSeconds) : null],
["Admin.About.Fingerprint", info?.tlsFingerprint],
["Admin.About.Name", `<span dir="auto">${escapeHtml(info?.name ?? "—")}</span>`],
["Admin.About.Version", `<span class="num" dir="ltr">${escapeHtml(info?.version ?? "—")}</span>`],
["Admin.About.Api", `<span class="num">${escapeHtml(info?.apiVersion ?? "—")}</span>`],
["Admin.About.Database", `<span dir="ltr">${escapeHtml(dashboard?.database ?? "—")}</span>`],
["Admin.About.Uptime", escapeHtml(dashboard ? formatDuration(dashboard.uptimeSeconds) : "—")],
["Admin.About.Fingerprint", fingerprint(info?.tlsFingerprint)],
];
root.innerHTML = `
<div class="panel about">
<div class="brand large"><img src="favicon.svg" alt=""><strong data-i18n="Admin.About.Title"></strong></div>
<dl>${rows.map(([key, value]) => `<dt data-i18n="${key}"></dt><dd class="${key.endsWith("Fingerprint") ? "mono" : "num"}">${escapeHtml(value ?? "—")}</dd>`).join("")}</dl>
</div>`;
<section class="panel about" aria-labelledby="about-title">
<div class="brand large"><img src="favicon.svg" alt=""><h2 id="about-title" data-i18n="Admin.About.Title"></h2></div>
<dl>${rows.map(([key, value]) => `<dt data-i18n="${key}"></dt><dd>${value}</dd>`).join("")}</dl>
</section>`;
applyStrings(root);
}
+47 -37
View File
@@ -1,11 +1,11 @@
// Archive (BRIEF §14.8): naming templates, proxy policy, scan/rebuild/verify/maintenance, statistics.
import { t, applyStrings } from "../i18n.js";
import { escapeHtml, attr, formatBytes, formatNumber, bar, columns, toast, errorText } from "../ui.js";
import { t, plural, applyStrings } from "../i18n.js";
import { escapeHtml, attr, formatBytes, formatNumber, bar, columns, toast, errorText, emptyState, markInvalid, clearInvalid, invalidText, escapeReverts } from "../ui.js";
const PROXY_SIZES = [-1, 1280, 1920, 2560, 3840, 0];
const ACTIONS = ["scan", "rebuild", "verify", "maintenance"];
export async function render(root, { api, meta }) {
export async function render(root, { api, setMeta }) {
let settings;
let stats;
try {
@@ -14,57 +14,58 @@ export async function render(root, { api, meta }) {
root.innerHTML = `<div class="panel empty">${escapeHtml(errorText(err))}</div>`;
return;
}
meta.textContent = settings.rootPath;
setMeta(settings.rootPath, { ltr: true });
const used = stats.capacityBytes > 0 ? (stats.capacityBytes - stats.freeBytes) / stats.capacityBytes : 0;
const sizes = PROXY_SIZES.includes(settings.proxyLongEdge) ? PROXY_SIZES : [settings.proxyLongEdge, ...PROXY_SIZES];
const proxyOptions = sizes.map((size) => `<option value="${size}" ${size === settings.proxyLongEdge ? "selected" : ""}>${escapeHtml(proxyLabel(size))}</option>`).join("");
const statsTable = (rows, labelId) => rows.length === 0 ? "" : `<div class="table compact stats" role="table" aria-labelledby="${labelId}"><div role="rowgroup">${rows.map((r) =>
`<div class="row" role="row"><span class="ellipsis" role="cell" dir="auto">${escapeHtml(r.label)}</span><span class="num end" role="cell">${formatNumber(r.count)}</span><span class="num end" role="cell">${escapeHtml(formatBytes(r.bytes))}</span></div>`).join("")}</div></div>`;
const scanButton = `<button class="btn small" data-action="scan" data-i18n="Admin.Archive.Scan" data-i18n-title="Admin.Archive.Scan.Tip"></button>`;
root.innerHTML = `
<div class="tiles">
<div class="panel tile"><span class="label" data-i18n="Admin.Archive.Sequences"></span><span class="value num">${formatNumber(stats.sequences)}</span>
<span class="sub">${escapeHtml(t("Admin.Dashboard.PhotosCameras", formatNumber(stats.photos), formatNumber(stats.cameras)))}</span></div>
<div class="panel tile"><span class="label" data-i18n="Admin.Archive.Originals"></span><span class="value">${escapeHtml(formatBytes(stats.bytes))}</span>
<span class="sub">${escapeHtml(stats.firstYear ? `${stats.firstYear}–${stats.lastYear}` : "—")}</span></div>
<div class="panel tile"><span class="label" data-i18n="Admin.Dashboard.Storage"></span><span class="value">${escapeHtml(formatBytes(stats.freeBytes))}<small data-i18n="Admin.Archive.FreeShort"></small></span>
${bar(used)}<span class="sub">${escapeHtml(t("Admin.Dashboard.Of", formatBytes(stats.capacityBytes)))}</span></div>
<div class="panel tile"><span class="label" data-i18n="Admin.Archive.Health"></span><span class="value num">${formatNumber(stats.unverifiedSequences)}<small data-i18n="Admin.Archive.Unverified"></small></span>
<span class="sub">${escapeHtml(t("Admin.Dashboard.NoProxies", formatNumber(stats.sequencesWithoutProxies)))}</span></div>
<section class="panel tile" aria-labelledby="tile-sequences"><h2 class="label" id="tile-sequences" data-i18n="Admin.Archive.Sequences"></h2><span class="value num">${formatNumber(stats.sequences)}</span>
<span class="sub">${escapeHtml(`${plural("Admin.Dashboard.PhotoCount", stats.photos)} · ${plural("Admin.Dashboard.CameraCount", stats.cameras)}`)}</span></section>
<section class="panel tile" aria-labelledby="tile-originals"><h2 class="label" id="tile-originals" data-i18n="Admin.Archive.Originals"></h2><span class="value">${escapeHtml(formatBytes(stats.bytes))}</span>
<span class="sub num">${escapeHtml(stats.firstYear ? `${stats.firstYear}–${stats.lastYear}` : "—")}</span></section>
<section class="panel tile" aria-labelledby="tile-storage"><h2 class="label" id="tile-storage" data-i18n="Admin.Dashboard.Storage"></h2><span class="value">${escapeHtml(formatBytes(stats.freeBytes))}<small data-i18n="Admin.Archive.FreeShort"></small></span>
${bar(used)}<span class="sub">${escapeHtml(t("Admin.Dashboard.Of", formatBytes(stats.capacityBytes)))}</span></section>
<section class="panel tile" aria-labelledby="tile-health"><h2 class="label" id="tile-health" data-i18n="Admin.Archive.Health"></h2><span class="value num">${formatNumber(stats.unverifiedSequences)}<small>${escapeHtml(plural("Admin.Archive.UnverifiedUnit", stats.unverifiedSequences))}</small></span>
<span class="sub">${escapeHtml(plural("Admin.Dashboard.WithoutProxies", stats.sequencesWithoutProxies))}</span></section>
</div>
<div class="grid two">
<form class="panel form settings-form" novalidate>
<h2 data-i18n="Admin.Archive.Layout"></h2>
<label class="field"><span data-i18n="Admin.Archive.Name"></span><input class="input" name="name" value="${attr(settings.name)}" data-i18n-title="Admin.Archive.Name.Tip"></label>
<label class="field"><span data-i18n="Admin.Archive.FolderTemplate"></span><input class="input mono" name="folderTemplate" value="${attr(settings.folderTemplate)}" data-i18n-title="Admin.Archive.FolderTemplate.Tip"></label>
<label class="field"><span data-i18n="Admin.Archive.FileTemplate"></span><input class="input mono" name="fileTemplate" value="${attr(settings.fileTemplate)}" data-i18n-title="Admin.Archive.FileTemplate.Tip"></label>
<form class="panel form settings-form" novalidate aria-labelledby="layout-title">
<h2 id="layout-title" data-i18n="Admin.Archive.Layout"></h2>
<label class="field"><span data-i18n="Admin.Archive.Name"></span><input class="input" name="name" dir="auto" value="${attr(settings.name)}" data-i18n-title="Admin.Archive.Name.Tip"></label>
<label class="field"><span data-i18n="Admin.Archive.FolderTemplate"></span><input class="input mono" name="folderTemplate" dir="ltr" spellcheck="false" value="${attr(settings.folderTemplate)}" data-i18n-title="Admin.Archive.FolderTemplate.Tip"></label>
<label class="field"><span data-i18n="Admin.Archive.FileTemplate"></span><input class="input mono" name="fileTemplate" dir="ltr" spellcheck="false" value="${attr(settings.fileTemplate)}" data-i18n-title="Admin.Archive.FileTemplate.Tip"></label>
<label class="field"><span data-i18n="Admin.Archive.Proxies"></span><select class="input" name="proxyLongEdge" data-i18n-title="Admin.Archive.Proxies.Tip">${proxyOptions}</select></label>
<div class="buttons"><button class="btn primary" type="submit" data-i18n="Admin.Common.Save" data-i18n-title="Admin.Common.Save.Tip"></button></div>
</form>
<div class="panel">
<h2 data-i18n="Admin.Archive.Maintenance"></h2>
<section class="panel" aria-labelledby="maintenance-title">
<h2 id="maintenance-title" data-i18n="Admin.Archive.Maintenance"></h2>
<div class="button-row">${ACTIONS.map((a) => `<button class="btn" data-action="${a}" data-i18n="Admin.Archive.${cap(a)}" data-i18n-title="Admin.Archive.${cap(a)}.Tip"></button>`).join("")}</div>
<h2 data-i18n="Admin.Archive.ByCamera"></h2>
<div class="table compact">
${stats.byCamera.slice(0, 8).map((c) => `<div class="row"><span>${escapeHtml(c.key || "—")}</span><span class="num right">${formatNumber(c.count)}</span><span class="num right">${escapeHtml(formatBytes(c.bytes))}</span></div>`).join("")
|| `<p class="muted" data-i18n="Admin.Dashboard.NoData"></p>`}
</div>
</div>
<h2 id="cameras-title" data-i18n="Admin.Archive.ByCamera"></h2>
${statsTable(stats.byCamera.slice(0, 8).map((c) => ({ label: c.key || "—", count: c.count, bytes: c.bytes })), "cameras-title")
|| `<p class="muted" data-i18n="Admin.Dashboard.NoData"></p>`}
</section>
</div>
<div class="grid two charts">
<div class="panel"><h2 data-i18n="Admin.Dashboard.ByYear"></h2>
${stats.byYear.length === 0 ? `<p class="muted" data-i18n="Admin.Dashboard.NoData"></p>`
: columns(stats.byYear.map((y) => ({ label: y.key, value: y.bytes, title: `${y.key} · ${formatBytes(y.bytes)}` })), { valueLabel: (i) => formatBytes(i.value) })}</div>
<div class="panel"><h2 data-i18n="Admin.Archive.ByFormat"></h2>
<div class="table compact">
${stats.byFormat.map((f) => `<div class="row"><span>${escapeHtml(f.key.toUpperCase())}</span><span class="num right">${formatNumber(f.count)}</span><span class="num right">${escapeHtml(formatBytes(f.bytes))}</span></div>`).join("")
|| `<p class="muted" data-i18n="Admin.Dashboard.NoData"></p>`}
</div></div>
<section class="panel" aria-labelledby="years-title"><h2 id="years-title" data-i18n="Admin.Dashboard.ByYear"></h2>
${stats.byYear.length === 0 ? emptyState("Admin.Dashboard.NoData", scanButton)
: columns(stats.byYear.map((y) => ({ label: y.key, value: y.bytes, title: `${y.key} · ${formatBytes(y.bytes)}` })),
{ label: t("Admin.Dashboard.ByYear"), valueLabel: (i) => formatBytes(i.value) })}</section>
<section class="panel" aria-labelledby="formats-title"><h2 id="formats-title" data-i18n="Admin.Archive.ByFormat"></h2>
${statsTable(stats.byFormat.map((f) => ({ label: f.key.toUpperCase(), count: f.count, bytes: f.bytes })), "formats-title")
|| emptyState("Admin.Dashboard.NoData", scanButton)}</section>
</div>`;
applyStrings(root);
const form = root.querySelector("form");
escapeReverts(form);
form.addEventListener("submit", async (e) => {
e.preventDefault();
form.querySelectorAll("[aria-invalid]").forEach((el) => el.removeAttribute("aria-invalid"));
form.querySelectorAll("[aria-invalid]").forEach(clearInvalid);
const data = new FormData(form);
try {
settings = await api.put("/api/v1/archive/settings", {
@@ -74,15 +75,23 @@ export async function render(root, { api, meta }) {
fileTemplate: String(data.get("fileTemplate")),
proxyLongEdge: Number(data.get("proxyLongEdge")),
});
// Esc now reverts to what was saved.
form.querySelectorAll("input").forEach((input) => {
input.defaultValue = input.value;
});
form.querySelectorAll("option").forEach((option) => {
option.defaultSelected = option.selected;
});
toast(t("Admin.Common.Saved"));
} catch (err) {
// Errors name the field in details; the field gets the error border and the message as its tooltip.
const field = err.details && form.elements[err.details];
const message = field ? invalidText(field) : errorText(err);
if (field) {
field.setAttribute("aria-invalid", "true");
field.title = errorText(err);
markInvalid(field, message);
field.focus();
}
toast(errorText(err), true);
toast(message, true);
}
});
root.querySelectorAll("[data-action]").forEach((button) => button.addEventListener("click", async () => {
@@ -94,6 +103,7 @@ export async function render(root, { api, meta }) {
toast(errorText(err), true);
} finally {
button.disabled = false;
button.focus();
}
}));
}
+77 -59
View File
@@ -1,9 +1,12 @@
// Dashboard (mockup Admin.html, BRIEF §14.8): storage, archive, jobs, render nodes, charts, activity, active jobs.
import { t, has, applyStrings } from "../i18n.js";
import { escapeHtml, attr, formatBytes, formatNumber, formatTime, formatDuration, bar, columns, toast, errorText } from "../ui.js";
import { kindLabel, nodeLabel, progressCell, stateCell, stateLabel, encoders, pascal } from "../jobs.js";
import { t, plural, applyStrings, culture } from "../i18n.js";
import { escapeHtml, attr, formatBytes, formatNumber, formatTime, formatDuration, bar, columns, toast, errorText, emptyState, redraw } from "../ui.js";
import { kindLabel, nodeLabel, progressCell, stateCell, stateLabel, encoders } from "../jobs.js";
import { activityText } from "../audit.js";
export async function render(root, { api, meta, onEvent }) {
const SCAN_BUTTON = `<button class="btn small" data-scan data-i18n="Admin.Archive.Scan" data-i18n-title="Admin.Archive.Scan.Tip"></button>`;
export async function render(root, { api, setMeta, onEvent }) {
let timer = null;
const refresh = () => {
clearTimeout(timer);
@@ -18,8 +21,13 @@ export async function render(root, { api, meta, onEvent }) {
root.innerHTML = `<div class="panel empty">${escapeHtml(errorText(err))}</div>`;
return;
}
meta.textContent = t("Admin.Dashboard.Meta", formatDuration(d.uptimeSeconds), d.database, d.tlsMode,
t(d.discovery ? "Admin.Dashboard.DiscoveryOn" : "Admin.Dashboard.DiscoveryOff"));
redraw(root, () => draw(d));
}
function draw(d) {
const tls = `Admin.Settings.Tls.${d.tlsMode.charAt(0).toUpperCase()}${d.tlsMode.slice(1)}`;
setMeta(t("Admin.Dashboard.Meta", formatDuration(d.uptimeSeconds), d.database, t(tls),
t(d.discovery ? "Admin.Dashboard.DiscoveryOn" : "Admin.Dashboard.DiscoveryOff")));
const a = d.archive;
const used = a.capacityBytes > 0 ? (a.capacityBytes - a.freeBytes) / a.capacityBytes : 0;
const online = d.nodes.filter((n) => n.state !== "offline");
@@ -29,61 +37,68 @@ export async function render(root, { api, meta, onEvent }) {
root.innerHTML = `
<div class="tiles">
<div class="panel tile">
<span class="label" data-i18n="Admin.Dashboard.Storage"></span>
<section class="panel tile" aria-labelledby="tile-storage">
<h2 class="label" id="tile-storage" data-i18n="Admin.Dashboard.Storage"></h2>
<span class="value">${escapeHtml(formatBytes(a.capacityBytes - a.freeBytes))}<small>${escapeHtml(t("Admin.Dashboard.Of", formatBytes(a.capacityBytes)))}</small></span>
${bar(used)}
<span class="sub">${escapeHtml(t("Admin.Dashboard.Free", formatBytes(a.freeBytes)))} · ${escapeHtml(t("Admin.Dashboard.Originals", formatBytes(a.bytes)))}</span>
</div>
<div class="panel tile">
<span class="label" data-i18n="Admin.Dashboard.Archive"></span>
<span class="value num">${formatNumber(a.sequences)}<small data-i18n="Admin.Dashboard.Sequences"></small></span>
<span class="sub">${escapeHtml(t("Admin.Dashboard.PhotosCameras", formatNumber(a.photos), formatNumber(a.cameras)))}</span>
<span class="sub">${escapeHtml(t("Admin.Dashboard.NoProxies", formatNumber(a.sequencesWithoutProxies)))}</span>
</div>
<div class="panel tile">
<span class="label" data-i18n="Admin.Dashboard.Jobs"></span>
</section>
<section class="panel tile" aria-labelledby="tile-archive">
<h2 class="label" id="tile-archive" data-i18n="Admin.Dashboard.Archive"></h2>
<span class="value num">${formatNumber(a.sequences)}<small>${escapeHtml(plural("Admin.Dashboard.SequenceUnit", a.sequences))}</small></span>
<span class="sub">${escapeHtml(`${plural("Admin.Dashboard.PhotoCount", a.photos)} · ${plural("Admin.Dashboard.CameraCount", a.cameras)}`)}</span>
<span class="sub">${escapeHtml(plural("Admin.Dashboard.WithoutProxies", a.sequencesWithoutProxies))}</span>
</section>
<section class="panel tile" aria-labelledby="tile-jobs">
<h2 class="label" id="tile-jobs" data-i18n="Admin.Dashboard.Jobs"></h2>
<span class="value num">${formatNumber(d.jobs.running)}<small data-i18n="Admin.Dashboard.Running"></small></span>
<span class="sub">${escapeHtml(t("Admin.Dashboard.JobCounts", formatNumber(d.jobs.queued), formatNumber(d.jobs.doneToday), formatNumber(d.jobs.failedToday)))}</span>
<span class="sub">${escapeHtml(t("Admin.Dashboard.Workers", formatNumber(d.workers)))}</span>
</div>
<div class="panel tile">
<span class="label" data-i18n="Admin.Dashboard.Nodes"></span>
<span class="sub">${escapeHtml([plural("Admin.Dashboard.QueuedCount", d.jobs.queued), plural("Admin.Dashboard.DoneToday", d.jobs.doneToday),
plural("Admin.Dashboard.FailedToday", d.jobs.failedToday)].join(" · "))}</span>
<span class="sub">${escapeHtml(plural("Admin.Dashboard.WorkerCount", d.workers))}</span>
</section>
<section class="panel tile" aria-labelledby="tile-nodes">
<h2 class="label" id="tile-nodes" data-i18n="Admin.Dashboard.Nodes"></h2>
<span class="value num">${formatNumber(online.length)}<small data-i18n="Admin.Dashboard.Online"></small></span>
${online.slice(0, 2).map((n) => `<span class="sub">${escapeHtml(n.clientName)} · ${escapeHtml(encoders(n))} · ${escapeHtml(stateLabel(n.state))}</span>`).join("")}
</div>
${online.slice(0, 2).map((n) => `<span class="sub"><bdi>${escapeHtml(n.clientName)}</bdi> · ${escapeHtml(encoders(n))} · ${escapeHtml(stateLabel(n.state))}</span>`).join("")}
</section>
</div>
<div class="grid two charts">
<div class="panel">
<section class="panel">
<div class="panel-head"><h2 data-i18n="Admin.Dashboard.ByYear"></h2></div>
${a.byYear.length === 0 ? `<p class="muted" data-i18n="Admin.Dashboard.NoData"></p>`
: columns(a.byYear.map((y) => ({ label: y.key, value: y.bytes, title: `${y.key} · ${formatBytes(y.bytes)} · ${formatNumber(y.count)}` })), { valueLabel: (i) => formatBytes(i.value) })}
</div>
<div class="panel">
${a.byYear.length === 0 ? emptyState("Admin.Dashboard.NoData", SCAN_BUTTON)
: columns(a.byYear.map((y) => ({ label: y.key, value: y.bytes, title: `${y.key} · ${formatBytes(y.bytes)} · ${formatNumber(y.count)}` })),
{ label: t("Admin.Dashboard.ByYear"), valueLabel: (i) => formatBytes(i.value) })}
</section>
<section class="panel">
<div class="panel-head"><h2 data-i18n="Admin.Dashboard.Uploads"></h2>
<span class="muted">${escapeHtml(t("Admin.Dashboard.UploadTotals", formatNumber(totalUploads), formatNumber(peak)))}</span></div>
${columns(uploads, { sun: true })}
</div>
<span class="muted ellipsis">${escapeHtml(t("Admin.Dashboard.UploadTotals", formatNumber(totalUploads), formatNumber(peak)))}</span></div>
${columns(uploads, { label: t("Admin.Dashboard.Uploads"), sun: true, edgeLabels: true })}
</section>
</div>
<div class="grid wide-right">
<div class="panel">
<section class="panel">
<div class="panel-head"><h2 data-i18n="Admin.Dashboard.Activity"></h2><a href="#/logs?view=audit" data-i18n="Admin.Dashboard.AllLogs" data-i18n-title="Admin.Dashboard.AllLogs.Tip"></a></div>
<div class="activity">${d.activity.map((e) => `<span class="muted num">${escapeHtml(formatTime(e.at))}</span><span>${escapeHtml(activityText(e))}</span>`).join("")}</div>
${d.activity.length === 0 ? `<p class="muted" data-i18n="Admin.Dashboard.NoActivity"></p>` : ""}
</div>
<div class="panel">
${d.activity.length === 0 ? emptyState("Admin.Dashboard.NoActivity", `<button class="btn small" id="reload" data-i18n="Admin.Common.Refresh" data-i18n-title="Admin.Dashboard.Refresh.Tip"></button>`)
: `<ul class="activity">${d.activity.map((e) => `<li><time class="muted num" datetime="${attr(e.at)}">${escapeHtml(formatTime(e.at))}</time><span dir="auto">${escapeHtml(activityText(e))}</span></li>`).join("")}</ul>`}
</section>
<section class="panel">
<div class="panel-head"><h2 data-i18n="Admin.Dashboard.Jobs"></h2><a href="#/jobs" data-i18n="Admin.Dashboard.Queue" data-i18n-title="Admin.Dashboard.Queue.Tip"></a></div>
${d.activeJobs.length === 0 ? `<p class="muted" data-i18n="Admin.Jobs.Empty"></p>` : `
<div class="table jobs-mini">
<div class="thead"><span data-i18n="Admin.Jobs.Kind"></span><span data-i18n="Admin.Jobs.Target"></span><span data-i18n="Admin.Jobs.Node"></span><span data-i18n="Admin.Jobs.Progress"></span><span data-i18n="Admin.Jobs.State"></span><span></span></div>
${d.activeJobs.map((j) => `
<div class="row" data-job="${attr(j.id)}">
<span>${escapeHtml(kindLabel(j.kind))}</span><span class="ellipsis">${escapeHtml(j.targetLabel ?? "")}</span><span>${escapeHtml(nodeLabel(j, d.nodes))}</span>
<span class="progress">${progressCell(j)}</span><span>${stateCell(j.state)}</span>
<button class="btn small" data-cancel="${attr(j.id)}" data-i18n="${j.state === "queued" ? "Admin.Jobs.Remove" : "Admin.Jobs.Cancel"}" data-i18n-title="${j.state === "queued" ? "Admin.Jobs.Remove.Tip" : "Admin.Jobs.Cancel.Tip"}"></button>
</div>`).join("")}
${d.activeJobs.length === 0 ? emptyState("Admin.Jobs.Empty", SCAN_BUTTON) : `
<div class="table jobs-mini" role="table" aria-label="${attr(t("Admin.Dashboard.Jobs"))}">
<div class="thead" role="row"><span role="columnheader" data-i18n="Admin.Jobs.Kind"></span><span role="columnheader" data-i18n="Admin.Jobs.Target"></span>
<span role="columnheader" class="col-node" data-i18n="Admin.Jobs.Node"></span><span role="columnheader" data-i18n="Admin.Jobs.Progress"></span>
<span role="columnheader" data-i18n="Admin.Jobs.State"></span><span role="columnheader"><span class="sr-only" data-i18n="Admin.Common.Actions"></span></span></div>
<div role="rowgroup">${d.activeJobs.map((j) => `
<div class="row" role="row" data-key="${attr(j.id)}">
<span class="ellipsis" role="cell">${escapeHtml(kindLabel(j.kind))}</span>
<span class="ellipsis" role="cell" dir="auto" title="${attr(j.targetLabel ?? "")}">${escapeHtml(j.targetLabel ?? "")}</span>
<span class="col-node ellipsis" role="cell" dir="auto">${escapeHtml(nodeLabel(j, d.nodes))}</span>
<span class="progress" role="cell">${progressCell(j)}</span><span role="cell">${stateCell(j.state)}</span>
<span class="row-actions" role="cell"><button class="btn small" data-cancel="${attr(j.id)}" data-i18n="${j.state === "queued" ? "Admin.Jobs.Remove" : "Admin.Jobs.Cancel"}"
data-i18n-title="${j.state === "queued" ? "Admin.Jobs.Remove.Tip" : "Admin.Jobs.Cancel.Tip"}"></button></span>
</div>`).join("")}</div>
</div>`}
</div>
</section>
</div>`;
applyStrings(root);
root.querySelectorAll("[data-cancel]").forEach((button) => button.addEventListener("click", async () => {
@@ -96,11 +111,20 @@ export async function render(root, { api, meta, onEvent }) {
button.disabled = false;
}
}));
root.querySelectorAll("[data-scan]").forEach((button) => button.addEventListener("click", async () => {
try {
await api.post("/api/v1/archive/scan");
toast(t("Admin.Archive.Queued"));
} catch (err) {
toast(errorText(err), true);
}
}));
root.querySelector("#reload")?.addEventListener("click", load);
}
onEvent((e) => {
if (e.type === "jobProgress") {
const cell = root.querySelector(`[data-job="${CSS.escape(e.jobId)}"] .progress`);
const cell = root.querySelector(`[data-key="${CSS.escape(e.jobId)}"] .progress`);
if (cell) cell.innerHTML = progressCell({ progressDone: e.done, progressTotal: e.total });
} else {
refresh();
@@ -109,23 +133,17 @@ export async function render(root, { api, meta, onEvent }) {
await load();
}
/** One sentence per audit entry, e.g. "alberto signed in" (unknown actions show their code). */
function activityText(entry) {
const key = `Admin.Activity.${pascal(entry.action)}`;
return has(key) ? t(key, entry.username ?? "—", entry.details ?? "") : `${entry.username ?? ""} ${entry.action}`;
}
/** Frames per UTC day for the last 30 days, zero-filled. */
/** Frames per UTC day for the last 30 days, zero-filled; the first and last days are labelled (in UTC, like the keys). */
function lastThirtyDays(days) {
const byDay = new Map(days.map((d) => [d.day, d.frames]));
const short = new Intl.DateTimeFormat(culture(), { day: "numeric", month: "short", timeZone: "UTC" });
const long = new Intl.DateTimeFormat(culture(), { dateStyle: "medium", timeZone: "UTC" });
const items = [];
const today = new Date();
for (let i = 29; i >= 0; i--) {
const day = new Date(Date.UTC(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate() - i));
const key = day.toISOString().slice(0, 10);
const value = byDay.get(key) ?? 0;
const label = i === 29 || i === 0 ? new Intl.DateTimeFormat(document.documentElement.lang, { day: "numeric", month: "short" }).format(day) : "";
items.push({ value, label, title: `${key} · ${formatNumber(value)}` });
const value = byDay.get(day.toISOString().slice(0, 10)) ?? 0;
items.push({ value, label: i === 29 || i === 0 ? short.format(day) : "", title: `${long.format(day)} · ${formatNumber(value)}` });
}
return items;
}
+82 -51
View File
@@ -1,95 +1,117 @@
// Jobs (BRIEF §14.8): queue and history with cancel/pause/resume/retry/priority, log tails, render nodes.
import { t, applyStrings } from "../i18n.js";
import { escapeHtml, attr, formatTime, formatDateTime, toast, errorText, confirmDialog } from "../ui.js";
import { kindLabel, nodeLabel, progressCell, stateCell, stateLabel, encoders } from "../jobs.js";
import { t, plural, applyStrings } from "../i18n.js";
import { escapeHtml, attr, formatTime, formatDateTime, toast, errorText, confirmDialog, emptyState, redraw } from "../ui.js";
import { kindLabel, nodeLabel, progressCell, stateCell, stateLabel, encoders, logText } from "../jobs.js";
const FILTERS = ["all", "running", "queued", "paused", "failed", "done", "cancelled"];
const PRIORITIES = ["background", "normal", "user"];
export async function render(root, { api, meta, onEvent }) {
export async function render(root, { api, setMeta, onEvent }) {
let filter = "all";
let jobs = [];
let nodes = [];
let running = 0;
let cursor = null;
const expanded = new Set();
let timer = null;
root.innerHTML = `
<div class="chips" role="group">${FILTERS.map((f) => `<button class="chip" data-filter="${f}" aria-pressed="${f === filter}" data-i18n="Admin.Jobs.Filter.${cap(f)}" data-i18n-title="Admin.Jobs.Filter.Tip"></button>`).join("")}</div>
<div class="panel flush">
<div class="table jobs">
<div class="thead"><span data-i18n="Admin.Jobs.Kind"></span><span data-i18n="Admin.Jobs.Target"></span><span data-i18n="Admin.Jobs.Node"></span>
<span data-i18n="Admin.Jobs.Progress"></span><span data-i18n="Admin.Jobs.State"></span><span data-i18n="Admin.Jobs.Created"></span><span></span></div>
<div id="rows"></div>
<div class="chips" role="group" aria-label="${attr(t("Admin.Jobs.State"))}">${FILTERS.map((f) => `<button class="chip" data-filter="${f}" aria-pressed="${f === filter}" data-i18n="Admin.Jobs.Filter.${cap(f)}" data-i18n-title="Admin.Jobs.Filter.Tip"></button>`).join("")}</div>
<section class="panel flush">
<div class="table jobs" role="table" aria-label="${attr(t("Admin.Nav.Jobs"))}">
<div class="thead" role="row"><span role="columnheader" data-i18n="Admin.Jobs.Kind"></span><span role="columnheader" data-i18n="Admin.Jobs.Target"></span>
<span role="columnheader" class="col-node" data-i18n="Admin.Jobs.Node"></span><span role="columnheader" data-i18n="Admin.Jobs.Progress"></span>
<span role="columnheader" data-i18n="Admin.Jobs.State"></span><span role="columnheader" class="col-created" data-i18n="Admin.Jobs.Created"></span>
<span role="columnheader"><span class="sr-only" data-i18n="Admin.Common.Actions"></span></span></div>
<div id="rows" role="rowgroup"></div>
</div>
<div class="table-foot" id="foot" hidden><span class="spacer"></span><button class="btn small" id="more" data-i18n="Admin.Common.More" data-i18n-title="Admin.Common.More.Tip"></button></div>
</div>
<div class="panel flush">
<div class="panel-head padded"><h2 data-i18n="Admin.Jobs.Nodes"></h2></div>
<div class="table nodes">
<div class="thead"><span data-i18n="Admin.Jobs.NodeName"></span><span data-i18n="Admin.Jobs.Owner"></span><span data-i18n="Admin.Jobs.Encoders"></span>
<span data-i18n="Admin.Jobs.Heartbeat"></span><span data-i18n="Admin.Jobs.State"></span><span></span></div>
<div id="nodes"></div>
</section>
<section class="panel flush" aria-labelledby="nodes-title">
<div class="panel-head padded"><h2 id="nodes-title" data-i18n="Admin.Jobs.Nodes"></h2></div>
<div class="table nodes" role="table" aria-labelledby="nodes-title">
<div class="thead" role="row"><span role="columnheader" data-i18n="Admin.Jobs.NodeName"></span><span role="columnheader" class="col-owner" data-i18n="Admin.Jobs.Owner"></span>
<span role="columnheader" data-i18n="Admin.Jobs.Encoders"></span><span role="columnheader" class="col-heartbeat" data-i18n="Admin.Jobs.Heartbeat"></span>
<span role="columnheader" data-i18n="Admin.Jobs.State"></span><span role="columnheader"><span class="sr-only" data-i18n="Admin.Common.Actions"></span></span></div>
<div id="nodes" role="rowgroup"></div>
</div>
</div>`;
</section>`;
applyStrings(root);
root.querySelectorAll("[data-filter]").forEach((chip) => chip.addEventListener("click", () => {
filter = chip.dataset.filter;
root.querySelectorAll("[data-filter]").forEach((c) => c.setAttribute("aria-pressed", String(c === chip)));
load();
}));
root.querySelectorAll("[data-filter]").forEach((chip) => chip.addEventListener("click", () => setFilter(chip.dataset.filter)));
root.querySelector("#more").addEventListener("click", () => load(true));
function setFilter(value) {
filter = value;
root.querySelectorAll("[data-filter]").forEach((c) => c.setAttribute("aria-pressed", String(c.dataset.filter === value)));
load();
}
async function load(more = false) {
try {
const state = filter === "all" ? "" : `&state=${filter}`;
const page = await api.get(`/api/v1/jobs?limit=50${state}${more && cursor ? `&cursor=${encodeURIComponent(cursor)}` : ""}`);
const [page, list, active] = await Promise.all([
api.get(`/api/v1/jobs?limit=50${state}${more && cursor ? `&cursor=${encodeURIComponent(cursor)}` : ""}`),
api.get("/api/v1/nodes"),
// The header counts running jobs whatever the filter shows.
api.get("/api/v1/jobs?state=running&limit=100"),
]);
jobs = more ? jobs.concat(page.items) : page.items;
cursor = page.nextCursor;
nodes = await api.get("/api/v1/nodes");
nodes = list;
running = active.items.length;
} catch (err) {
toast(errorText(err), true);
return;
}
const running = jobs.filter((j) => j.state === "running").length;
meta.textContent = t("Admin.Jobs.Meta", running, nodes.filter((n) => n.state !== "offline").length);
setMeta(`${plural("Admin.Jobs.RunningCount", running)} · ${plural("Admin.Jobs.NodesOnline", nodes.filter((n) => n.state !== "offline").length)}`);
draw();
}
function draw() {
const host = root.querySelector("#rows");
host.innerHTML = jobs.map((j) => `
<div class="row" data-job="${attr(j.id)}">
<button class="link" data-toggle="${attr(j.id)}" aria-expanded="${expanded.has(j.id)}" data-i18n-title="Admin.Jobs.Log.Tip">${escapeHtml(kindLabel(j.kind))}</button>
<span class="ellipsis">${escapeHtml(j.targetLabel ?? "")}</span>
<span>${escapeHtml(nodeLabel(j, nodes))}</span>
<span class="progress">${progressCell(j)}</span>
<span>${stateCell(j.state)}</span>
<span class="muted">${escapeHtml(formatTime(j.created))}</span>
<span class="row-actions">${buttons(j)}</span>
</div>
${expanded.has(j.id) ? `<pre class="log">${escapeHtml(j.error ? `${j.logTail ?? ""}\n${j.error}`.trim() : j.logTail ?? "")}</pre>` : ""}`).join("")
|| `<div class="empty" data-i18n="Admin.Jobs.Empty"></div>`;
applyStrings(host);
redraw(host, () => {
host.innerHTML = jobs.map((j) => `
<div class="row" role="row" data-key="${attr(j.id)}">
<span role="cell"><button class="link ellipsis" data-toggle="${attr(j.id)}" aria-expanded="${expanded.has(j.id)}" aria-controls="log-${attr(j.id)}" data-i18n-title="Admin.Jobs.Log.Tip">${escapeHtml(kindLabel(j.kind))}</button></span>
<span class="ellipsis" role="cell" dir="auto" title="${attr(j.targetLabel ?? "")}">${escapeHtml(j.targetLabel ?? "")}</span>
<span class="col-node ellipsis" role="cell" dir="auto">${escapeHtml(nodeLabel(j, nodes))}</span>
<span class="progress" role="cell">${progressCell(j)}</span>
<span role="cell">${stateCell(j.state)}</span>
<span class="col-created muted nowrap" role="cell">${escapeHtml(formatTime(j.created))}</span>
<span class="row-actions" role="cell">${buttons(j)}</span>
</div>
${expanded.has(j.id) ? `<div class="row log-row" role="row"><pre class="log wide" role="cell" id="log-${attr(j.id)}" dir="ltr">${escapeHtml(logText(j))}</pre></div>` : ""}`).join("")
|| `<div class="row" role="row"><div class="wide" role="cell">${filter === "all"
? emptyState("Admin.Jobs.Empty", `<button class="btn small" id="scan" data-i18n="Admin.Archive.Scan" data-i18n-title="Admin.Archive.Scan.Tip"></button>`)
: emptyState("Admin.Jobs.Empty", `<button class="btn small" id="show-all" data-i18n="Admin.Jobs.ShowAll" data-i18n-title="Admin.Jobs.ShowAll.Tip"></button>`)}</div></div>`;
applyStrings(host);
});
host.querySelectorAll("[data-toggle]").forEach((b) => b.addEventListener("click", () => {
const id = b.dataset.toggle;
if (!expanded.delete(id)) expanded.add(id);
draw();
}));
host.querySelectorAll("[data-act]").forEach((b) => b.addEventListener("click", () => act(b.closest(".row").dataset.job, b.dataset.act)));
host.querySelectorAll("[data-act]").forEach((b) => b.addEventListener("click", () => act(b.closest("[data-key]").dataset.key, b.dataset.act)));
host.querySelectorAll("select[data-priority]").forEach((s) => s.addEventListener("change", () => setPriority(s.dataset.priority, s.value)));
host.querySelector("#show-all")?.addEventListener("click", () => setFilter("all"));
host.querySelector("#scan")?.addEventListener("click", scan);
root.querySelector("#foot").hidden = !cursor;
const nodeHost = root.querySelector("#nodes");
nodeHost.innerHTML = nodes.map((n) => `
<div class="row" data-node="${attr(n.id)}">
<span><strong>${escapeHtml(n.clientName)}</strong></span><span>${escapeHtml(n.username)}</span>
<span class="ellipsis" title="${attr(n.encoders.map((e) => e.name).join(", "))}">${escapeHtml(encoders(n))}</span>
<span class="muted">${escapeHtml(formatDateTime(n.lastHeartbeat))}</span>
<span class="state ${n.state === "offline" ? "cancelled" : n.state === "busy" ? "running" : "done"}">${n.state === "offline" ? "○" : "●"} ${escapeHtml(stateLabel(n.state))}</span>
<span class="row-actions"><button class="btn small destructive" data-forget="${attr(n.id)}" data-i18n="Admin.Jobs.Forget" data-i18n-title="Admin.Jobs.Forget.Tip"></button></span>
</div>`).join("") || `<div class="empty" data-i18n="Admin.Jobs.NoNodes"></div>`;
applyStrings(nodeHost);
redraw(nodeHost, () => {
nodeHost.innerHTML = nodes.map((n) => `
<div class="row" role="row" data-key="${attr(n.id)}">
<span class="ellipsis" role="cell" dir="auto" title="${attr(n.clientName)}"><strong>${escapeHtml(n.clientName)}</strong></span>
<span class="col-owner ellipsis" role="cell" dir="auto">${escapeHtml(n.username)}</span>
<span class="ellipsis" role="cell" title="${attr(n.encoders.map((e) => e.name).join(", "))}">${escapeHtml(encoders(n))}</span>
<span class="col-heartbeat muted nowrap" role="cell">${escapeHtml(formatDateTime(n.lastHeartbeat))}</span>
<span class="state ${n.state === "offline" ? "cancelled" : n.state === "busy" ? "running" : "done"}" role="cell"><span aria-hidden="true">${n.state === "offline" ? "○" : "●"}</span> ${escapeHtml(stateLabel(n.state))}</span>
<span class="row-actions" role="cell"><button class="btn small destructive" data-forget="${attr(n.id)}" data-i18n="Admin.Jobs.Forget" data-i18n-title="Admin.Jobs.Forget.Tip"></button></span>
</div>`).join("")
|| `<div class="row" role="row"><div class="wide" role="cell">${emptyState("Admin.Jobs.NoNodes",
`<a class="btn small" href="#/users" data-i18n="Admin.Nav.Users" data-i18n-title="Admin.Jobs.NoNodes.Tip"></a>`)}</div></div>`;
applyStrings(nodeHost);
});
nodeHost.querySelectorAll("[data-forget]").forEach((b) => b.addEventListener("click", () => forget(nodes.find((n) => n.id === b.dataset.forget))));
}
@@ -124,6 +146,15 @@ export async function render(root, { api, meta, onEvent }) {
}
}
async function scan() {
try {
await api.post("/api/v1/archive/scan");
toast(t("Admin.Archive.Queued"));
} catch (err) {
toast(errorText(err), true);
}
}
async function forget(node) {
const confirmed = await confirmDialog({
title: t("Admin.Jobs.ForgetTitle", node.clientName),
@@ -147,7 +178,7 @@ export async function render(root, { api, meta, onEvent }) {
if (job) {
job.progressDone = e.done;
job.progressTotal = e.total;
const cell = root.querySelector(`[data-job="${CSS.escape(e.jobId)}"] .progress`);
const cell = root.querySelector(`[data-key="${CSS.escape(e.jobId)}"] .progress`);
if (cell) cell.innerHTML = progressCell(job);
}
} else if (e.type === "jobState" || e.type === "nodeState") {
+49 -39
View File
@@ -1,18 +1,18 @@
// Logs (BRIEF §14.8): server log tail and downloads, diagnostics bundle, sign-in log, audit log.
import { t, has, applyStrings } from "../i18n.js";
import { escapeHtml, attr, formatBytes, formatDateTime, toast, errorText, routeParams } from "../ui.js";
import { pascal } from "../jobs.js";
// Logs (BRIEF §14.8): server log tail and downloads, diagnostics bundle, sign-in log (with failed attempts), audit log.
import { t, plural, applyStrings } from "../i18n.js";
import { escapeHtml, attr, formatBytes, formatDateTime, toast, errorText, routeParams, emptyState } from "../ui.js";
import { actionLabel, detailText } from "../audit.js";
const VIEWS = ["server", "signins", "audit"];
const LINES = [100, 300, 1000];
export async function render(root, { api, meta, actions }) {
export async function render(root, { api, setMeta, actions }) {
let view = VIEWS.includes(routeParams().get("view")) ? routeParams().get("view") : "server";
let lines = 300;
let audit = [];
let cursor = null;
actions.innerHTML = `<div class="segmented" role="group">${VIEWS.map((v) =>
actions.innerHTML = `<div class="segmented" role="group" aria-label="${attr(t("Admin.Nav.Logs"))}">${VIEWS.map((v) =>
`<button class="btn" data-view="${v}" aria-pressed="${v === view}" data-i18n="Admin.Logs.View.${cap(v)}" data-i18n-title="Admin.Logs.View.${cap(v)}.Tip"></button>`).join("")}</div>`;
applyStrings(actions);
actions.querySelectorAll("[data-view]").forEach((b) => b.addEventListener("click", () => {
@@ -23,7 +23,7 @@ export async function render(root, { api, meta, actions }) {
}));
async function show() {
meta.textContent = "";
setMeta("");
if (view === "server") await showServerLog();
else await showAudit(false);
}
@@ -37,37 +37,41 @@ export async function render(root, { api, meta, actions }) {
toast(errorText(err), true);
return;
}
meta.textContent = tail.file;
setMeta(tail.file, { ltr: true });
root.innerHTML = `
<div class="panel flush">
<section class="panel flush">
<div class="panel-head padded">
<select class="input small" id="lines" data-i18n-title="Admin.Logs.Lines.Tip">${LINES.map((n) => `<option value="${n}" ${n === lines ? "selected" : ""}>${escapeHtml(t("Admin.Logs.LineCount", n))}</option>`).join("")}</select>
<select class="input small" id="lines" data-i18n-title="Admin.Logs.Lines.Tip">${LINES.map((n) => `<option value="${n}" ${n === lines ? "selected" : ""}>${escapeHtml(plural("Admin.Logs.LastLines", n))}</option>`).join("")}</select>
<span class="spacer"></span>
<button class="btn small" id="refresh" data-i18n="Admin.Common.Refresh" data-i18n-title="Admin.Logs.Refresh.Tip"></button>
<a class="btn small" href="/api/v1/server/diagnostics" download data-i18n="Admin.Logs.Diagnostics" data-i18n-title="Admin.Logs.Diagnostics.Tip"></a>
</div>
<pre class="log tall">${escapeHtml(tail.lines.join("\n"))}</pre>
</div>
<div class="panel">
<h2 data-i18n="Admin.Logs.Files"></h2>
<div class="table compact">${files.map((f) => `
<div class="row"><span class="mono">${escapeHtml(f.name)}</span><span class="num right">${escapeHtml(formatBytes(f.size))}</span>
<span class="muted">${escapeHtml(formatDateTime(f.modified))}</span>
<a class="btn small" href="/api/v1/logs/files/${encodeURIComponent(f.name)}" download="${attr(f.name)}" data-i18n="Admin.Logs.Download" data-i18n-title="Admin.Logs.Download.Tip"></a></div>`).join("")}
</div>
</div>`;
<pre class="log tall" dir="ltr" tabindex="0" aria-label="${attr(t("Admin.Logs.View.Server"))}">${escapeHtml(tail.lines.join("\n"))}</pre>
</section>
<section class="panel" aria-labelledby="files-title">
<h2 id="files-title" data-i18n="Admin.Logs.Files"></h2>
<div class="table compact files" role="table" aria-labelledby="files-title"><div role="rowgroup">${files.map((f) => `
<div class="row" role="row" data-key="${attr(f.name)}"><span class="mono ellipsis" role="cell" dir="ltr">${escapeHtml(f.name)}</span><span class="num end" role="cell">${escapeHtml(formatBytes(f.size))}</span>
<span class="muted nowrap" role="cell">${escapeHtml(formatDateTime(f.modified))}</span>
<span role="cell"><a class="btn small" href="/api/v1/logs/files/${encodeURIComponent(f.name)}" download="${attr(f.name)}" data-i18n="Admin.Logs.Download" data-i18n-title="Admin.Logs.Download.Tip"></a></span></div>`).join("")}
</div></div>
</section>`;
applyStrings(root);
const pre = root.querySelector("pre");
pre.scrollTop = pre.scrollHeight;
root.querySelector("#lines").addEventListener("change", (e) => {
root.querySelector("#lines").addEventListener("change", async (e) => {
lines = Number(e.target.value);
showServerLog();
await showServerLog();
root.querySelector("#lines").focus();
});
root.querySelector("#refresh").addEventListener("click", async () => {
await showServerLog();
root.querySelector("#refresh").focus();
});
root.querySelector("#refresh").addEventListener("click", showServerLog);
}
async function showAudit(more) {
const action = view === "signins" ? "&action=login" : "";
const action = view === "signins" ? "&action=login,login_failed" : "";
try {
const page = await api.get(`/api/v1/audit?limit=100${action}${more && cursor ? `&cursor=${encodeURIComponent(cursor)}` : ""}`);
audit = more ? audit.concat(page.items) : page.items;
@@ -77,29 +81,35 @@ export async function render(root, { api, meta, actions }) {
return;
}
root.innerHTML = `
<div class="panel flush">
<div class="table audit">
<div class="thead"><span data-i18n="Admin.Logs.When"></span><span data-i18n="Admin.Logs.Who"></span><span data-i18n="Admin.Logs.What"></span>
<span data-i18n="Admin.Logs.Details"></span><span data-i18n="Admin.Logs.From"></span></div>
${audit.map((e) => `
<div class="row"><span class="num">${escapeHtml(formatDateTime(e.at))}</span><span>${escapeHtml(e.username ?? "—")}</span>
<span>${escapeHtml(actionLabel(e.action))}</span><span class="ellipsis" title="${attr(e.details ?? "")}">${escapeHtml(e.details ?? "")}</span>
<span class="mono">${escapeHtml(e.remoteAddress ?? "")}</span></div>`).join("") || `<div class="empty" data-i18n="Admin.Logs.Empty"></div>`}
<section class="panel flush">
<div class="table audit" role="table" aria-label="${attr(t(view === "signins" ? "Admin.Logs.View.Signins" : "Admin.Logs.View.Audit"))}">
<div class="thead" role="row"><span role="columnheader" data-i18n="Admin.Logs.When"></span><span role="columnheader" data-i18n="Admin.Logs.Who"></span>
<span role="columnheader" data-i18n="Admin.Logs.What"></span><span role="columnheader" data-i18n="Admin.Logs.Details"></span>
<span role="columnheader" class="col-from" data-i18n="Admin.Logs.From"></span></div>
<div role="rowgroup">${audit.map((e) => {
const details = detailText(e);
return `
<div class="row" role="row" data-key="${attr(e.id)}"><span class="num nowrap" role="cell">${escapeHtml(formatDateTime(e.at))}</span>
<span class="ellipsis" role="cell" dir="auto" title="${attr(e.username ?? "")}">${escapeHtml(e.username ?? "—")}</span>
<span class="ellipsis" role="cell">${e.action === "login_failed" ? `<span class="state failed"><span aria-hidden="true">✕</span> ${escapeHtml(actionLabel(e.action))}</span>` : escapeHtml(actionLabel(e.action))}</span>
<span class="ellipsis" role="cell" dir="auto" title="${attr(details)}">${escapeHtml(details)}</span>
<span class="col-from mono ellipsis" role="cell" dir="ltr">${escapeHtml(e.remoteAddress ?? "")}</span></div>`;
}).join("") || `<div class="row" role="row"><div class="wide" role="cell">${emptyState("Admin.Logs.Empty",
`<button class="btn small" id="reload" data-i18n="Admin.Common.Refresh" data-i18n-title="Admin.Logs.Refresh.Tip"></button>`)}</div></div>`}</div>
</div>
${cursor ? `<div class="table-foot"><span class="spacer"></span><button class="btn small" id="more" data-i18n="Admin.Common.More" data-i18n-title="Admin.Common.More.Tip"></button></div>` : ""}
</div>`;
</section>`;
applyStrings(root);
root.querySelector("#more")?.addEventListener("click", () => showAudit(true));
root.querySelector("#more")?.addEventListener("click", async () => {
await showAudit(true);
root.querySelector("#more")?.focus();
});
root.querySelector("#reload")?.addEventListener("click", () => showAudit(false));
}
await show();
}
function actionLabel(action) {
const key = `Admin.Logs.Action.${pascal(action)}`;
return has(key) ? t(key) : action;
}
function cap(s) {
return s.charAt(0).toUpperCase() + s.slice(1);
}
+46 -23
View File
@@ -1,17 +1,20 @@
// Settings (BRIEF §14.8): server name, ports, TLS, discovery, limits, language, retention. Values fixed by environment
// variables are read-only here; ports, TLS, workers, chunk size and job history apply at the next restart.
import { t, applyStrings, languages } from "../i18n.js";
import { escapeHtml, attr, toast, errorText, nativeName } from "../ui.js";
import { escapeHtml, attr, toast, errorText, nativeName, fingerprint, markInvalid, clearInvalid, invalidText, escapeReverts } from "../ui.js";
/** Setting → environment variable that can fix it (BRIEF §14.9). */
const VARIABLES = {
serverName: "TITANO_SERVER_NAME", httpPort: "TITANO_HTTP_PORT", httpsPort: "TITANO_HTTPS_PORT", tlsMode: "TITANO_TLS_MODE",
tlsCert: "TITANO_TLS_CERT", tlsKey: "TITANO_TLS_KEY", language: "TITANO_LANG", workers: "TITANO_WORKERS", discovery: "TITANO_DISCOVERY",
};
/** Settings the server names in error details whose field here has another name. */
const FIELDS = { maxuploadbytes: "maxUploadMb", chunksizebytes: "chunkSizeMib" };
const PEM_FILES = ["tlsCert", "tlsKey"];
const MB = 1e6;
const MIB = 1024 * 1024;
export async function render(root, { api, info, meta }) {
export async function render(root, { api, info, setMeta, actions }) {
let settings;
try {
settings = await api.get("/api/v1/server/settings");
@@ -19,19 +22,22 @@ export async function render(root, { api, info, meta }) {
root.innerHTML = `<div class="panel empty">${escapeHtml(errorText(err))}</div>`;
return;
}
setMeta("");
// In the header, like the other pages' main action, so toasts never cover it.
actions.innerHTML = `<button class="btn primary" type="submit" form="settings-form" data-i18n="Admin.Common.Save" data-i18n-title="Admin.Common.Save.Tip"></button>`;
applyStrings(actions);
const locked = (name) => settings.locked.some((l) => l.toLowerCase() === name.toLowerCase());
const lock = (name) => locked(name) ? `disabled title="${attr(t("Admin.Settings.Locked.Tip", VARIABLES[name] ?? name))}"` : `data-i18n-title="Admin.Settings.${cap(name)}.Tip"`;
const field = (name, input) => `<label class="field"><span data-i18n="Admin.Settings.${cap(name)}"></span>${input}</label>`;
const number = (name, value, attrs = "") => field(name, `<input class="input narrow" type="number" name="${name}" value="${attr(value)}" ${attrs} ${lock(name)}>`);
const text = (name, value) => field(name, `<input class="input" name="${name}" value="${attr(value ?? "")}" ${lock(name)}>`);
const number = (name, value, attrs = "") => field(name, `<input class="input narrow num" type="number" name="${name}" value="${attr(value)}" ${attrs} ${lock(name)}>`);
const text = (name, value, attrs = "dir=\"auto\"") => field(name, `<input class="input" name="${name}" value="${attr(value ?? "")}" ${attrs} ${lock(name)}>`);
function draw() {
meta.textContent = "";
root.innerHTML = `
<form class="settings" novalidate>
<section class="panel">
<div class="panel-head"><h2 data-i18n="Admin.Settings.Server"></h2>
<form class="settings" id="settings-form" novalidate>
<section class="panel" aria-labelledby="server-title">
<div class="panel-head"><h2 id="server-title" data-i18n="Admin.Settings.Server"></h2>
${settings.restartRequired ? `<span class="chip warn" data-i18n="Admin.Settings.Restart" data-i18n-title="Admin.Settings.Restart.Tip"></span>` : ""}</div>
${text("serverName", settings.serverName)}
${field("language", `<select class="input" name="language" ${lock("language")}>${languages().concat(languages().includes(settings.language) ? [] : [settings.language])
@@ -39,33 +45,48 @@ export async function render(root, { api, info, meta }) {
${number("workers", settings.workers, 'min="1" max="64"')}
${field("discovery", `<span class="inline"><input type="checkbox" name="discovery" ${settings.discovery ? "checked" : ""} ${lock("discovery")}></span>`)}
</section>
<section class="panel">
<h2 data-i18n="Admin.Settings.Network"></h2>
<section class="panel" aria-labelledby="network-title">
<h2 id="network-title" data-i18n="Admin.Settings.Network"></h2>
${number("httpPort", settings.httpPort, 'min="1" max="65535"')}
${number("httpsPort", settings.httpsPort, 'min="1" max="65535"')}
${field("tlsMode", `<select class="input" name="tlsMode" ${lock("tlsMode")}>${["auto", "pem", "proxy"].map((m) =>
`<option value="${m}" ${m === settings.tlsMode ? "selected" : ""}>${escapeHtml(t(`Admin.Settings.Tls.${cap(m)}`))}</option>`).join("")}</select>`)}
${text("tlsCert", settings.tlsCert)}
${text("tlsKey", settings.tlsKey)}
${field("fingerprint", `<code class="fingerprint" data-i18n-title="Admin.Settings.Fingerprint.Tip">${escapeHtml(info?.tlsFingerprint ?? "—")}</code>`)}
${text("tlsCert", settings.tlsCert, 'dir="ltr" spellcheck="false"')}
${text("tlsKey", settings.tlsKey, 'dir="ltr" spellcheck="false"')}
<div class="field"><span data-i18n="Admin.Settings.Fingerprint"></span><code data-i18n-title="Admin.Settings.Fingerprint.Tip">${fingerprint(info?.tlsFingerprint)}</code></div>
</section>
<section class="panel">
<h2 data-i18n="Admin.Settings.Limits"></h2>
<section class="panel" aria-labelledby="limits-title">
<h2 id="limits-title" data-i18n="Admin.Settings.Limits"></h2>
${number("maxUploadMb", Math.round(settings.maxUploadBytes / MB), 'min="1"')}
${number("chunkSizeMib", settings.chunkSizeBytes / MIB, 'min="0.0625" max="64" step="0.0625"')}
${number("tokenLifetimeDays", settings.tokenLifetimeDays, 'min="1" max="365"')}
${number("uploadRetentionHours", settings.uploadRetentionHours, 'min="1" max="8760"')}
${number("jobHistoryDays", settings.jobHistoryDays, 'min="1" max="3650"')}
</section>
<div class="buttons"><button class="btn primary" type="submit" data-i18n="Admin.Common.Save" data-i18n-title="Admin.Common.Save.Tip"></button></div>
</form>`;
applyStrings(root);
root.querySelector("form").addEventListener("submit", save);
const form = root.querySelector("form");
escapeReverts(form);
form.addEventListener("submit", save);
form.elements.tlsMode.addEventListener("change", () => pemFiles(form));
pemFiles(form);
}
/** The certificate and key files are used only in Own certificate mode; elsewhere they are off and say so. */
function pemFiles(form) {
const pem = form.elements.tlsMode.value === "pem";
for (const name of PEM_FILES.filter((n) => !locked(n))) {
const input = form.elements[name];
clearInvalid(input);
input.disabled = !pem;
input.title = t(pem ? `Admin.Settings.${cap(name)}.Tip` : "Admin.Settings.PemOnly.Tip");
}
}
async function save(e) {
e.preventDefault();
const form = e.target;
form.querySelectorAll("[aria-invalid]").forEach(clearInvalid);
const data = new FormData(form);
const value = (name, fallback) => (form.elements[name]?.disabled ? fallback : data.get(name));
const request = {
@@ -90,13 +111,15 @@ export async function render(root, { api, info, meta }) {
draw();
toast(t("Admin.Common.Saved"));
} catch (err) {
toast(errorText(err), true);
const name = err.details && Object.keys(form.elements).find((k) => k.toLowerCase() === String(err.details).toLowerCase());
const input = name ? form.elements[name] : null;
if (input) {
input.setAttribute("aria-invalid", "true");
input.title = errorText(err);
const key = String(err.details ?? "").toLowerCase();
const input = (FIELDS[key] && form.elements[FIELDS[key]]) || [...form.elements].find((el) => el.name && el.name.toLowerCase() === key);
let message = errorText(err);
if (input && err.code === "invalid_setting") message = PEM_FILES.includes(input.name) ? t("Admin.Settings.PemMissing") : invalidText(input);
if (input && !input.disabled) {
markInvalid(input, message);
input.focus();
}
toast(message, true);
}
}
+156 -75
View File
@@ -1,24 +1,29 @@
// Users (mockup AdminUsers.html, BRIEF §14.8): accounts table and a side panel to create, edit and reset.
import { t, applyStrings } from "../i18n.js";
import { escapeHtml, attr, formatBytes, formatNumber, formatTime, bar, toast, confirmDialog, errorText } from "../ui.js";
// Users (mockup AdminUsers.html, BRIEF §14.8): accounts table and a side panel to create, edit and reset accounts, or to
// change one's own password (a reset of one's own account would end this session and lose the temporary password).
import { t, plural, applyStrings } from "../i18n.js";
import { escapeHtml, attr, formatBytes, formatNumber, formatTime, bar, toast, confirmDialog, errorText, emptyState, markInvalid, clearInvalid, redraw, focusPlace, restoreFocus } from "../ui.js";
import { icons } from "../icons.js";
const ROLES = ["viewer", "uploader", "editor", "admin"];
const TB = 1e12;
const RENDER_NODE = 32;
/** API error codes that belong to one field of the side forms. */
const FIELD_ERRORS = { invalid_username: "username", username_taken: "username", weak_password: "password", wrong_password: "current", same_password: "next" };
export async function render(root, { api, info, meta, actions }) {
export async function render(root, { api, info, setMeta, actions }) {
let users = [];
let filter = "";
let freeBytes = 0;
let tokenDays = 30;
let opener = null;
actions.innerHTML = `
<input class="input search" type="search" id="search" data-i18n-placeholder="Admin.Users.Search" data-i18n-title="Admin.Users.Search.Tip" aria-label="${attr(t("Admin.Users.Search"))}">
<input class="input search" type="search" id="search" dir="auto" data-i18n-placeholder="Admin.Users.Search" data-i18n-title="Admin.Users.Search.Tip" aria-label="${attr(t("Admin.Users.Search"))}">
<button class="btn primary" id="new" data-i18n="Admin.Users.New" data-i18n-title="Admin.Users.New.Tip"></button>`;
applyStrings(actions);
actions.querySelector("#search").addEventListener("input", (e) => {
filter = e.target.value.trim().toLowerCase();
const search = actions.querySelector("#search");
search.addEventListener("input", () => {
filter = search.value.trim().toLowerCase();
drawTable();
});
actions.querySelector("#new").addEventListener("click", () => openForm(null));
@@ -26,10 +31,13 @@ export async function render(root, { api, info, meta, actions }) {
root.innerHTML = `
<div class="split">
<div class="panel flush">
<div class="table users">
<div class="thead"><span data-i18n="Admin.Users.User"></span><span data-i18n="Admin.Users.Role"></span><span data-i18n="Admin.Users.Quota"></span>
<span data-i18n="Admin.Users.LastSeen"></span><span class="right" data-i18n="Admin.Users.Uploads"></span><span data-i18n="Admin.Users.Status"></span><span></span></div>
<div id="rows"></div>
<div class="table users" role="table" aria-label="${attr(t("Admin.Nav.Users"))}">
<div class="thead" role="row">
<span role="columnheader" data-i18n="Admin.Users.User"></span><span role="columnheader" data-i18n="Admin.Users.Role"></span>
<span role="columnheader" class="col-quota" data-i18n="Admin.Users.Quota"></span><span role="columnheader" class="col-seen" data-i18n="Admin.Users.LastSeen"></span>
<span role="columnheader" class="col-uploads end" data-i18n="Admin.Users.Uploads"></span><span role="columnheader" class="col-status" data-i18n="Admin.Users.Status"></span>
<span role="columnheader"><span class="sr-only" data-i18n="Admin.Common.Actions"></span></span></div>
<div id="rows" role="rowgroup"></div>
</div>
<div class="table-foot"><span id="policy" class="muted"></span><span class="spacer"></span>
<a href="#/logs?view=signins" data-i18n="Admin.Users.SignInLog" data-i18n-title="Admin.Users.SignInLog.Tip"></a></div>
@@ -37,6 +45,13 @@ export async function render(root, { api, info, meta, actions }) {
<aside class="panel side" id="side" hidden></aside>
</div>`;
applyStrings(root);
const side = root.querySelector("#side");
side.addEventListener("keydown", (e) => {
if (e.key === "Escape") {
e.preventDefault();
closeSide();
}
});
async function load() {
try {
@@ -53,53 +68,67 @@ export async function render(root, { api, info, meta, actions }) {
return;
}
const active = users.filter((u) => !u.user.disabled).length;
meta.textContent = t("Admin.Users.Meta", formatNumber(users.length), formatNumber(active));
root.querySelector("#policy").textContent = t("Admin.Users.Policy", info?.limits?.passwordMinLength ?? 10, tokenDays);
setMeta(`${plural("Admin.Users.Accounts", users.length)} · ${plural("Admin.Users.ActiveCount", active)}`);
root.querySelector("#policy").textContent =
`${plural("Admin.Users.PasswordPolicy", info?.limits?.passwordMinLength ?? 10)} · ${plural("Admin.Users.TokenPolicy", tokenDays)}`;
drawTable();
}
function drawTable() {
const rows = users.filter((u) => !filter || u.user.username.toLowerCase().includes(filter) || (u.user.displayName ?? "").toLowerCase().includes(filter));
const host = root.querySelector("#rows");
host.innerHTML = rows.map((row) => {
const u = row.user;
const subtitle = [u.displayName, u.mustChangePassword ? t("Admin.Users.MustChange") : null, u.disabled ? t("Admin.Users.Disabled") : null]
.filter(Boolean).join(" · ");
const quota = u.quotaBytes > 0
? `<div class="progress-cell">${bar(u.usedBytes / u.quotaBytes, u.disabled)}<span class="num nowrap">${escapeHtml(t("Admin.Users.QuotaOf", formatBytes(u.usedBytes), formatBytes(u.quotaBytes)))}</span></div>`
: `<span class="muted">${escapeHtml(u.usedBytes > 0 ? formatBytes(u.usedBytes) : "—")}</span>`;
const seen = row.lastSeen ? `${formatTime(row.lastSeen)}${row.lastClient ? " · " + row.lastClient : ""}` : "—";
const buttons = u.disabled
? `<button class="btn small" data-act="enable" data-i18n="Admin.Users.Enable" data-i18n-title="Admin.Users.Enable.Tip"></button>
<button class="btn small destructive" data-act="delete" data-i18n="Admin.Users.Delete" data-i18n-title="Admin.Users.Delete.Tip"></button>`
: `<button class="btn small" data-act="edit" data-i18n="Admin.Users.Edit" data-i18n-title="Admin.Users.Edit.Tip"></button>
<button class="btn small" data-act="reset" data-i18n="Admin.Users.Reset" data-i18n-title="Admin.Users.Reset.Tip"></button>
${u.id === api.user().id ? "" : `<button class="btn small" data-act="disable" data-i18n="Admin.Users.Disable" data-i18n-title="Admin.Users.Disable.Tip"></button>`}`;
return `
<div class="row${u.disabled ? " dim" : ""}" data-id="${attr(u.id)}">
<span class="person"><span class="avatar ${attr(u.role)}">${escapeHtml(u.username.slice(0, 1).toUpperCase())}</span>
<span class="stack"><strong>${escapeHtml(u.username)}</strong><small>${escapeHtml(subtitle)}</small></span></span>
<span data-i18n="Admin.Role.${cap(u.role)}"></span>
<span>${quota}</span>
<span class="ellipsis">${escapeHtml(seen)}</span>
<span class="num right">${formatNumber(row.uploadsLast30Days)}</span>
<span class="${u.disabled ? "muted" : "state done"}">${u.disabled ? "○" : "●"} <span data-i18n="${u.disabled ? "Admin.Users.Disabled" : "Admin.Users.Active"}"></span></span>
<span class="row-actions">${buttons}</span>
</div>`;
}).join("") || `<div class="empty" data-i18n="Admin.Users.Empty"></div>`;
applyStrings(host);
redraw(host, () => {
const rows = users.filter((u) => !filter || u.user.username.toLowerCase().includes(filter) || (u.user.displayName ?? "").toLowerCase().includes(filter));
host.innerHTML = rows.map(rowHtml).join("") || `<div class="row" role="row"><div class="wide" role="cell">${emptyState("Admin.Users.Empty",
`<button class="btn small" id="clear" data-i18n="Admin.Users.ClearSearch" data-i18n-title="Admin.Users.ClearSearch.Tip"></button>`)}</div></div>`;
applyStrings(host);
});
host.querySelectorAll("[data-act]").forEach((button) => button.addEventListener("click", () => {
const row = users.find((u) => u.user.id === button.closest(".row").dataset.id);
const row = users.find((u) => u.user.id === button.closest("[data-key]").dataset.key);
act(button.dataset.act, row.user);
}));
host.querySelector("#clear")?.addEventListener("click", () => {
search.value = "";
filter = "";
drawTable();
search.focus();
});
}
function rowHtml(row) {
const u = row.user;
const own = u.id === api.user().id;
const subtitle = [u.displayName, u.mustChangePassword ? t("Admin.Users.MustChange") : null, u.disabled ? t("Admin.Users.Disabled") : null]
.filter(Boolean).join(" · ");
const quotaText = t("Admin.Users.QuotaOf", formatBytes(u.usedBytes), formatBytes(u.quotaBytes));
const quota = u.quotaBytes > 0
? `<div class="progress-cell">${bar(u.usedBytes / u.quotaBytes, u.disabled)}<span class="num ellipsis" title="${attr(quotaText)}">${escapeHtml(quotaText)}</span></div>`
: `<span class="muted num">${escapeHtml(u.usedBytes > 0 ? formatBytes(u.usedBytes) : "—")}</span>`;
const seen = row.lastSeen ? `${formatTime(row.lastSeen)}${row.lastClient ? " · " + row.lastClient : ""}` : "—";
const button = (act, key, extra = "") => `<button class="btn small${extra}" data-act="${act}" data-i18n="Admin.Users.${key}" data-i18n-title="Admin.Users.${key}.Tip"></button>`;
const buttons = u.disabled
? button("enable", "Enable") + button("delete", "Delete", " destructive")
: button("edit", "Edit") + (own ? button("password", "ChangePassword") : button("reset", "Reset") + button("disable", "Disable"));
return `
<div class="row${u.disabled ? " dim" : ""}" role="row" data-key="${attr(u.id)}">
<span class="person" role="cell"><span class="avatar ${attr(u.role)}" aria-hidden="true">${escapeHtml(u.username.slice(0, 1).toUpperCase())}</span>
<span class="stack"><strong class="ellipsis" dir="auto" title="${attr(u.username)}">${escapeHtml(u.username)}</strong>
<small dir="auto" title="${attr(subtitle)}">${escapeHtml(subtitle)}</small></span></span>
<span class="ellipsis" role="cell" data-i18n="Admin.Role.${cap(u.role)}"></span>
<span class="col-quota" role="cell">${quota}</span>
<span class="col-seen ellipsis" role="cell" dir="auto" title="${attr(seen)}">${escapeHtml(seen)}</span>
<span class="col-uploads num end" role="cell">${formatNumber(row.uploadsLast30Days)}</span>
<span class="col-status state ${u.disabled ? "cancelled" : "done"}" role="cell"><span aria-hidden="true">${u.disabled ? "○" : "●"}</span>
<span data-i18n="${u.disabled ? "Admin.Users.Disabled" : "Admin.Users.Active"}"></span></span>
<span class="row-actions" role="cell">${buttons}</span>
</div>`;
}
async function act(action, user) {
try {
if (action === "edit") return openForm(user);
if (action === "password") return openPasswordForm();
if (action === "reset") {
const r = await api.post(`/api/v1/users/${user.id}/reset-password`, {});
showPassword(r);
showPassword(await api.post(`/api/v1/users/${user.id}/reset-password`, {}));
} else if (action === "disable" || action === "enable") {
await api.patch(`/api/v1/users/${user.id}`, { disabled: action === "disable" });
} else if (action === "delete") {
@@ -121,49 +150,61 @@ export async function render(root, { api, info, meta, actions }) {
}
}
/** Shows the side panel, remembering which control opened it so closing returns the keyboard there. */
function openSide(html) {
if (side.hidden) {
const scope = actions.contains(document.activeElement) ? actions : root;
opener = { scope, place: focusPlace(scope) };
}
side.hidden = false;
side.innerHTML = html;
applyStrings(side);
side.querySelector("#close").addEventListener("click", closeSide);
}
function closeSide() {
side.hidden = true;
side.innerHTML = "";
if (opener) restoreFocus(opener.scope, opener.place);
opener = null;
}
function openForm(user) {
const side = root.querySelector("#side");
const editing = user !== null;
const quotaTb = editing && user.quotaBytes > 0 ? +(user.quotaBytes / TB).toFixed(3) : 0;
const renderNode = editing ? (user.permissions & RENDER_NODE) !== 0 : false;
side.hidden = false;
side.innerHTML = `
openSide(`
<form class="form" novalidate>
<h2 data-i18n="${editing ? "Admin.Users.EditTitle" : "Admin.Users.New"}"></h2>
<label><span data-i18n="Admin.Users.Username"></span>
<input class="input" name="username" required autocomplete="off" value="${attr(user?.username ?? "")}" ${editing ? "disabled" : ""} data-i18n-title="Admin.Users.Username.Tip"></label>
<input class="input" name="username" required autocomplete="off" dir="auto" value="${attr(user?.username ?? "")}" ${editing ? "disabled" : ""} data-i18n-title="Admin.Users.Username.Tip"></label>
<label><span data-i18n="Admin.Users.DisplayName"></span>
<input class="input" name="displayName" autocomplete="off" value="${attr(user?.displayName ?? "")}" data-i18n-title="Admin.Users.DisplayName.Tip"></label>
<input class="input" name="displayName" autocomplete="off" dir="auto" value="${attr(user?.displayName ?? "")}" data-i18n-title="Admin.Users.DisplayName.Tip"></label>
<fieldset><legend data-i18n="Admin.Users.Role"></legend>
${ROLES.map((r) => `<label class="check"><input type="radio" name="role" value="${r}" ${(user?.role ?? "editor") === r ? "checked" : ""} data-i18n-title="Admin.Users.Role.${cap(r)}.Tip"><span data-i18n="Admin.Role.${cap(r)}"></span></label>`).join("")}
</fieldset>
<label><span data-i18n="Admin.Users.Quota"></span>
<span class="inline"><input class="input narrow" name="quota" type="number" min="0" step="0.1" value="${quotaTb}" data-i18n-title="Admin.Users.Quota.Tip"><span>TB</span>
<span class="inline"><input class="input narrow num" name="quota" type="number" min="0" step="0.1" value="${quotaTb}" data-i18n-title="Admin.Users.Quota.Tip"><span>TB</span>
<small class="muted">${escapeHtml(t("Admin.Users.FreeOnServer", formatBytes(freeBytes)))}</small></span></label>
${editing ? "" : `
<label><span data-i18n="Admin.Users.TempPassword"></span>
<span class="inline"><input class="input mono" name="password" autocomplete="off" value="${attr(generatePassword())}" data-i18n-title="Admin.Users.TempPassword.Tip">
<span class="inline"><input class="input mono" name="password" autocomplete="off" spellcheck="false" dir="ltr" value="${attr(generatePassword())}" data-i18n-title="Admin.Users.TempPassword.Tip">
<button class="btn icon" type="button" id="regenerate" data-i18n-title="Admin.Users.Regenerate.Tip">${icons.refresh}</button></span></label>
<label class="check"><input type="checkbox" checked disabled data-i18n-title="Admin.Users.MustChangeFlag.Tip"><span data-i18n="Admin.Users.MustChangeFlag"></span></label>`}
<label class="check"><input type="checkbox" name="renderNode" ${renderNode ? "checked" : ""} data-i18n-title="Admin.Users.RenderNode.Tip"><span data-i18n="Admin.Users.RenderNode"></span></label>
<div class="error" role="alert"></div>
<div class="buttons">
<button class="btn" type="button" id="close" data-i18n="Admin.Common.Cancel" data-i18n-title="Admin.Common.Cancel.Tip"></button>
<button class="btn primary" type="submit" data-i18n="${editing ? "Admin.Common.Save" : "Admin.Users.Create"}" data-i18n-title="${editing ? "Admin.Common.Save.Tip" : "Admin.Users.Create.Tip"}"></button>
</div>
</form>`;
applyStrings(side);
</form>`);
const form = side.querySelector("form");
side.querySelector("#close").addEventListener("click", () => {
side.hidden = true;
});
side.querySelector("#regenerate")?.addEventListener("click", () => {
form.elements.password.value = generatePassword();
clearInvalid(form.elements.password);
});
form.addEventListener("submit", async (e) => {
e.preventDefault();
const error = form.querySelector(".error");
error.textContent = "";
form.querySelectorAll("[aria-invalid]").forEach(clearInvalid);
const data = new FormData(form);
const quotaBytes = Math.round(Number(data.get("quota") || 0) * TB);
try {
@@ -171,51 +212,91 @@ export async function render(root, { api, info, meta, actions }) {
await api.patch(`/api/v1/users/${user.id}`, {
displayName: String(data.get("displayName")), role: data.get("role"), quotaBytes, allowRenderNode: data.get("renderNode") === "on",
});
side.hidden = true;
closeSide();
} else {
const r = await api.post("/api/v1/users", {
showPassword(await api.post("/api/v1/users", {
username: String(data.get("username")).trim(), displayName: String(data.get("displayName")), role: data.get("role"), quotaBytes,
password: String(data.get("password")), allowRenderNode: data.get("renderNode") === "on",
});
showPassword(r);
}));
}
await load();
} catch (err) {
error.textContent = errorText(err);
fieldError(form, err, err.details === "quotaBytes" ? "quota" : FIELD_ERRORS[err.code]);
}
});
form.querySelector("input:not([disabled])").focus();
}
/** The caller's own password, changed with the current one; this session stays signed in. */
function openPasswordForm() {
const field = (name, key, complete) => `<label><span data-i18n="Admin.Password.${key}"></span>
<input class="input" name="${name}" type="password" autocomplete="${complete}" required data-i18n-title="Admin.Password.${key}.Tip"></label>`;
openSide(`
<form class="form" novalidate>
<h2 data-i18n="Admin.Password.Title"></h2>
${field("current", "Current", "current-password")}${field("next", "New", "new-password")}${field("repeat", "Repeat", "new-password")}
<div class="buttons">
<button class="btn" type="button" id="close" data-i18n="Admin.Common.Cancel" data-i18n-title="Admin.Common.Cancel.Tip"></button>
<button class="btn primary" type="submit" data-i18n="Admin.Password.Save" data-i18n-title="Admin.Users.SavePassword.Tip"></button>
</div>
</form>`);
const form = side.querySelector("form");
form.addEventListener("submit", async (e) => {
e.preventDefault();
form.querySelectorAll("[aria-invalid]").forEach(clearInvalid);
const data = new FormData(form);
if (data.get("next") !== data.get("repeat")) {
fieldError(form, { message: t("Admin.Password.Mismatch"), status: 400 }, "repeat");
return;
}
try {
await api.changePassword(String(data.get("current")), String(data.get("next")));
closeSide();
toast(t("Admin.Users.PasswordChanged"));
} catch (err) {
fieldError(form, err, FIELD_ERRORS[err.code]);
}
});
form.querySelector("input").focus();
}
/** The one-time password of a new or reset account, shown once in the side panel. */
function showPassword(result) {
const side = root.querySelector("#side");
side.hidden = false;
side.innerHTML = `
openSide(`
<div class="form">
<h2>${escapeHtml(result.user.username)}</h2>
<h2 dir="auto">${escapeHtml(result.user.username)}</h2>
<label><span data-i18n="Admin.Users.TempPassword"></span>
<span class="inline"><input class="input mono" readonly value="${attr(result.temporaryPassword)}" data-i18n-title="Admin.Users.TempPassword.Tip">
<span class="inline"><input class="input mono" readonly dir="ltr" value="${attr(result.temporaryPassword)}" data-i18n-title="Admin.Users.TempPassword.Tip">
<button class="btn icon" type="button" id="copy" data-i18n-title="Admin.Users.Copy.Tip">${icons.copy}</button></span></label>
<div class="buttons"><button class="btn" type="button" id="close" data-i18n="Admin.Common.Close" data-i18n-title="Admin.Common.Close.Tip"></button></div>
</div>`;
applyStrings(side);
</div>`);
const input = side.querySelector("input");
side.querySelector("#copy").addEventListener("click", async () => {
try {
await navigator.clipboard.writeText(result.temporaryPassword);
toast(t("Admin.Users.Copied"));
} catch {
side.querySelector("input").select();
input.select();
}
});
side.querySelector("#close").addEventListener("click", () => {
side.hidden = true;
});
input.focus();
input.select();
}
await load();
}
/** An API failure on a side form: the field it concerns gets the error border, the message and the focus; a toast announces it. */
function fieldError(form, err, name) {
const message = err.code === "username_taken" ? t("Admin.Users.Taken") : errorText(err);
const field = name ? form.elements[name] : null;
if (field) {
markInvalid(field, message);
field.focus();
}
toast(message, true);
}
/** Three groups of four unambiguous characters, like the server's own temporary passwords. */
function generatePassword() {
const alphabet = "abcdefghjkmnpqrstuvwxyz23456789";
+118 -13
View File
@@ -44,6 +44,11 @@ export function formatDuration(seconds) {
return t("Common.Duration.Seconds", s);
}
/** A certificate fingerprint that wraps only between its byte pairs, always left to right. */
export function fingerprint(value) {
return value ? `<span class="fingerprint" dir="ltr">${String(value).split(":").map(escapeHtml).join(":<wbr>")}</span>` : "—";
}
/** 6 px progress bar drawn as SVG (attributes, not inline styles). */
export function bar(fraction, muted = false) {
const width = Math.max(0, Math.min(100, Math.round((fraction ?? 0) * 100)));
@@ -52,28 +57,38 @@ export function bar(fraction, muted = false) {
}
/**
* Column chart: values with labels under each bar and, when given, the value above it.
* Bars use the accent colour, or the sun colour for upload activity.
* Column chart named by label: values with labels under the bars and, when given, the value above each bar. Bars use
* the accent colour, or the sun colour for upload activity. With edgeLabels the first and last labels align with the
* chart edges (a time axis labelled only at its ends). Charts keep their left-to-right axis in right-to-left pages.
*/
export function columns(items, { sun = false, valueLabel = null, height = 190 } = {}) {
export function columns(items, { label, sun = false, valueLabel = null, edgeLabels = false, height = 190 } = {}) {
const width = 400;
const base = height - 30;
const max = Math.max(1, ...items.map((i) => i.value));
const step = width / Math.max(1, items.length);
const barWidth = Math.max(2, Math.min(32, step * 0.65));
let svg = `<svg class="chart${sun ? " sun" : ""}" viewBox="0 0 ${width} ${height}" role="img">`;
let svg = `<svg class="chart${sun ? " sun" : ""}" viewBox="0 0 ${width} ${height}" role="img" aria-label="${attr(label)}" dir="ltr">`;
svg += `<line class="axis" x1="0" y1="${base}" x2="${width}" y2="${base}"/>`;
items.forEach((item, i) => {
const h = item.value > 0 ? Math.max(2, (item.value / max) * (base - 18)) : 0;
const x = i * step + (step - barWidth) / 2;
const middle = (x + barWidth / 2).toFixed(1);
svg += `<rect class="column" x="${x.toFixed(1)}" y="${(base - h).toFixed(1)}" width="${barWidth.toFixed(1)}" height="${h.toFixed(1)}" rx="2"><title>${escapeHtml(item.title ?? "")}</title></rect>`;
if (valueLabel) svg += `<text class="value" x="${(x + barWidth / 2).toFixed(1)}" y="${(base - h - 5).toFixed(1)}">${escapeHtml(valueLabel(item))}</text>`;
if (item.label) svg += `<text class="label" x="${(x + barWidth / 2).toFixed(1)}" y="${base + 16}">${escapeHtml(item.label)}</text>`;
if (valueLabel) svg += `<text class="value" x="${middle}" y="${(base - h - 5).toFixed(1)}">${escapeHtml(valueLabel(item))}</text>`;
if (!item.label) return;
const edge = !edgeLabels ? "" : i === 0 ? "start" : i === items.length - 1 ? "end" : "";
const at = edge === "start" ? 0 : edge === "end" ? width : middle;
svg += `<text class="label${edge ? " " + edge : ""}" x="${at}" y="${base + 16}">${escapeHtml(item.label)}</text>`;
});
return svg + "</svg>";
}
/** Shows a toast at the bottom right for 8 s (hover pauses). */
/** An empty state: one sentence and one button (BRIEF §0.2). */
export function emptyState(sentenceKey, button = "") {
return `<div class="empty"><span data-i18n="${attr(sentenceKey)}"></span>${button}</div>`;
}
/** Shows a toast at the bottom (inline end) for 8 s (hover pauses). */
export function toast(message, isError = false) {
const host = document.getElementById("toasts") ?? document.body.appendChild(Object.assign(document.createElement("div"), { id: "toasts" }));
const item = document.createElement("div");
@@ -94,28 +109,35 @@ export function toast(message, isError = false) {
});
}
let dialogs = 0;
/**
* Two-button confirmation dialog (safe action left and default). Resolves true when the destructive action is chosen;
* with `typed`, that button stays disabled until the text is typed.
* Two-button confirmation dialog (safe action left and default, Esc keeps). Resolves true when the destructive action
* is chosen; with `typed`, that button stays disabled until the text is typed into the labelled field.
*/
export function confirmDialog({ title, body, confirm, confirmTip, cancel, cancelTip, typed }) {
return new Promise((resolve) => {
const id = `dialog-${++dialogs}`;
const dialog = document.createElement("dialog");
dialog.className = "dialog";
dialog.setAttribute("aria-labelledby", `${id}-title`);
if (body) dialog.setAttribute("aria-describedby", `${id}-body`);
dialog.innerHTML = `
<form method="dialog">
<h2>${escapeHtml(title)}</h2>
${body ? `<p>${escapeHtml(body)}</p>` : ""}
${typed ? `<input class="input" name="typed" autocomplete="off" title="${attr(typed)}" aria-label="${attr(typed)}" placeholder="${attr(typed)}">` : ""}
<h2 id="${id}-title" dir="auto">${escapeHtml(title)}</h2>
${body ? `<p id="${id}-body">${escapeHtml(body)}</p>` : ""}
${typed ? `<label class="field-label"><span>${escapeHtml(t("Admin.Common.TypeToConfirm", typed))}</span>
<input class="input" name="typed" autocomplete="off" spellcheck="false" dir="auto" title="${attr(t("Admin.Common.TypeToConfirm.Tip"))}"></label>` : ""}
<div class="buttons">
<button class="btn" value="cancel" title="${attr(cancelTip)}" autofocus>${escapeHtml(cancel)}</button>
<button class="btn destructive" value="ok" title="${attr(confirmTip)}" ${typed ? "disabled" : ""}>${escapeHtml(confirm)}</button>
<button class="btn destructive" value="ok" title="${attr(typed ? t("Admin.Common.TypeFirst.Tip") : confirmTip)}" ${typed ? "disabled" : ""}>${escapeHtml(confirm)}</button>
</div>
</form>`;
document.body.appendChild(dialog);
const ok = dialog.querySelector('button[value="ok"]');
dialog.querySelector('input[name="typed"]')?.addEventListener("input", (e) => {
ok.disabled = e.target.value !== typed;
ok.title = ok.disabled ? t("Admin.Common.TypeFirst.Tip") : confirmTip;
});
dialog.addEventListener("close", () => {
resolve(dialog.returnValue === "ok");
@@ -130,6 +152,89 @@ export function errorText(err) {
return err?.message && err.status ? err.message : t("Admin.Error.Unreachable");
}
/**
* Marks a form field invalid (DESIGN §4): error border and the message as its tooltip, until the value changes and
* the field's own tooltip comes back.
*/
export function markInvalid(field, message) {
if (field.getAttribute("aria-invalid") !== "true") field.dataset.tip = field.title;
field.setAttribute("aria-invalid", "true");
field.title = message;
field.addEventListener("input", () => clearInvalid(field), { once: true });
}
/** "The value of Folder template is not valid; …": a field the server refused, named by its label. */
export function invalidText(field) {
return t("Admin.Common.Invalid", field.closest("label")?.querySelector("span")?.textContent ?? field.name);
}
export function clearInvalid(field) {
if (field.getAttribute("aria-invalid") !== "true") return;
field.removeAttribute("aria-invalid");
field.title = field.dataset.tip ?? "";
}
/** Esc in a field of the form puts back the value the page was drawn with (DESIGN §4: Esc reverts). */
export function escapeReverts(form) {
form.addEventListener("keydown", (e) => {
const field = e.target;
if (e.key !== "Escape" || !(field instanceof HTMLInputElement || field instanceof HTMLSelectElement) || field.type === "search") return;
if (field instanceof HTMLSelectElement) {
[...field.options].forEach((o) => {
o.selected = o.defaultSelected;
});
} else if (field.type === "checkbox" || field.type === "radio") {
field.checked = field.defaultChecked;
} else {
field.value = field.defaultValue;
}
clearInvalid(field);
});
}
const FOCUSABLE = "a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex='-1'])";
/**
* Where the keyboard focus is inside root, in terms that survive a re-render: the row (data-key), the control
* (data-act, data-toggle, id or name) and positions as fallbacks.
*/
export function focusPlace(root) {
const el = document.activeElement;
if (!el || el === document.body || !root.contains(el)) return null;
const row = el.closest("[data-key]");
const rows = [...root.querySelectorAll("[data-key]")];
return { row: row?.dataset.key ?? null, rowIndex: rows.indexOf(row), control: controlKey(el), index: [...(row ?? root).querySelectorAll(FOCUSABLE)].indexOf(el) };
}
/**
* Focuses the same control after a re-render, else the control at the same place in the same (or same-position) row,
* else the first control left (an empty state's button).
*/
export function restoreFocus(root, place) {
if (!place) return;
let scope = root;
let index = place.index;
if (place.row !== null) {
const rows = [...root.querySelectorAll("[data-key]")];
const row = rows.find((r) => r.dataset.key === place.row) ?? rows[Math.min(place.rowIndex, rows.length - 1)];
if (row) scope = row;
else index = 0;
}
const controls = [...scope.querySelectorAll(FOCUSABLE)];
(controls.find((c) => controlKey(c) === place.control) ?? controls[Math.min(Math.max(index, 0), controls.length - 1)])?.focus();
}
/** Redraws with draw() and puts the keyboard focus back where it was. */
export function redraw(root, draw) {
const place = focusPlace(root);
draw();
restoreFocus(root, place);
}
function controlKey(el) {
return el.dataset.act ?? el.dataset.toggle ?? el.dataset.cancel ?? el.dataset.forget ?? (el.id || el.name || "");
}
/** Query parameters of the hash route (#/logs?view=signins). */
export function routeParams() {
return new URLSearchParams(location.hash.split("?")[1] ?? "");