From e2a44cc154a651a053d7cc301aaad59f79e44e23 Mon Sep 17 00:00:00 2001 From: kzolotarev95 Date: Thu, 30 Jul 2026 19:17:35 +0400 Subject: [PATCH] Polish router card placeholders and metric typography --- vps/owrt-remote-hub.py | 51 +++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index 8082ead..1d9dbce 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -2034,7 +2034,7 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding .cardTop{{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}} .status{{display:inline-flex;align-items:center;gap:7px;border-radius:999px;border:1px solid rgba(34,197,94,.36);background:rgba(34,197,94,.14);padding:7px 10px;font-weight:900;font-size:12px;color:#bbf7d0}}.status i{{width:8px;height:8px;border-radius:50%;background:var(--green);box-shadow:0 0 13px var(--green);animation:statusPulse 1.6s ease-in-out infinite}}.status.off{{border-color:rgba(251,113,133,.36);background:rgba(251,113,133,.12);color:#fecdd3}}.status.off i{{background:var(--red);box-shadow:0 0 13px var(--red);animation:offlinePulse 1.9s ease-in-out infinite}}.status.warn i{{background:var(--amber);box-shadow:0 0 13px var(--amber)}}@keyframes statusPulse{{0%,100%{{transform:scale(1);opacity:.75}}50%{{transform:scale(1.45);opacity:1}}}}@keyframes offlinePulse{{0%,100%{{transform:scale(1);opacity:.5}}50%{{transform:scale(1.42);opacity:1}}}}.nameRow{{display:inline-flex;align-items:center;justify-content:center;gap:8px;max-width:100%;margin-top:12px;vertical-align:top}}.nameRow::before{{content:"";display:block;flex:0 0 28px;width:28px;height:28px}}.name{{margin:0;font-size:19px;font-weight:900;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:220px}}.nameEditBtn{{position:static;display:inline-flex;align-items:center;justify-content:center;flex:0 0 28px;width:28px;height:28px;padding:0;border:1px solid rgba(251,191,36,.38);border-radius:999px;background:rgba(251,191,36,.12);color:#fde68a;box-shadow:inset 0 1px 0 rgba(255,255,255,.08);cursor:pointer;opacity:.5;transition:background .15s ease,border-color .15s ease,color .15s ease,transform .15s ease,opacity .15s ease}}.nameEditBtn:hover,.nameEditBtn:focus-visible{{opacity:1;border-color:rgba(34,211,238,.55);background:rgba(34,211,238,.14);color:#cffafe}}.nameEditBtn:active{{transform:scale(.96)}}.nameEditBtn svg{{width:13px;height:13px;display:block}}.mobilePanelToggle,.routerFormToggle{{display:none;width:100%;margin:14px 0 10px;border-radius:999px}}.routerFormWrap{{display:block}}[hidden],.headerActions[hidden],.routerStats[hidden],.routerFormWrap[hidden]{{display:none!important}}.metaLine{{margin-top:3px;color:var(--muted)}}.tagRow{{display:flex;gap:8px;flex-wrap:wrap;margin-top:12px}}.tag{{border:1px solid var(--line);border-radius:999px;padding:5px 9px;background:rgba(255,255,255,.06);color:#ddd6fe;font-size:12px;font-weight:750}} .metrics{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;margin-top:14px}}.metric{{display:flex;flex-direction:column;align-items:center;justify-content:center;text-align:center;border:1px solid var(--line);border-radius:8px;background:rgba(255,255,255,.055);padding:9px}}.metric.span2{{grid-column:span 2}}.metric.temp-ok strong,.metric.flash-ok strong,.metric.memory-ok strong{{color:#bbf7d0}}.metric.temp-warn strong,.metric.flash-warn strong,.metric.memory-warn strong{{color:#fde68a}}.metric.temp-bad strong,.metric.flash-bad strong,.metric.memory-bad strong{{color:#fecdd3}}.metric>span{{display:block;width:100%;color:var(--muted);font-size:11px;text-align:center}}.metric strong{{display:block;width:100%;margin-top:2px;font-size:14px;word-break:break-word;text-align:center}}.metric.metric-compact strong{{font-size:14px;line-height:1.3;white-space:pre-line;word-break:normal}}.metric-note{{display:block;margin-top:4px;color:#b9adc9;font-size:11px;line-height:1.25;white-space:normal}}.metric.temp-unavailable strong{{font-size:13px;line-height:1.25;white-space:normal;word-break:normal;color:#ddd6fe}}.actionToggle{{display:none}}.actions{{display:flex;gap:8px;flex-wrap:wrap;margin-top:14px}}.empty{{grid-column:1/-1;border:1px dashed var(--line);border-radius:8px;padding:30px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);text-align:center;color:var(--muted)}}.hint{{margin-top:16px;padding:13px;border:1px solid var(--line);border-radius:8px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);color:var(--muted)}}.diagnosticPanel{{margin:16px 0 4px;padding:14px;border:1px solid rgba(34,211,238,.22);border-radius:8px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),var(--panel);box-shadow:0 18px 46px rgba(0,0,0,.20);text-align:center}}.diagnosticPanel[hidden]{{display:none!important}}.diagnosticTop{{display:grid;grid-template-columns:1fr auto 1fr;gap:12px;align-items:flex-start}}.diagnosticTop>div{{grid-column:2;text-align:center}}.diagnosticTop .btn{{grid-column:3;justify-self:end;align-self:start;width:auto;min-width:118px;max-width:none;padding-left:18px;padding-right:18px}}.diagnosticTop h2{{margin:0;font-size:18px}}.diagnosticLead{{margin:4px 0 0;color:var(--muted);font-size:12px;line-height:1.4}}.diagnosticGrid{{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px;margin-top:12px}}.diagnosticGrid label{{display:grid;gap:6px;color:#ddd6fe;font-size:12px;font-weight:850;text-align:center}}.diagnosticGrid textarea{{min-height:92px;resize:vertical;border:1px solid rgba(167,139,250,.24);border-radius:10px;padding:12px 13px;background:linear-gradient(180deg,rgba(52,38,74,.96),rgba(34,26,52,.96));color:#f5f3ff;box-shadow:inset 0 1px 0 rgba(255,255,255,.04);outline:none;text-align:left}}.diagnosticGrid textarea::placeholder{{color:rgba(221,214,254,.42)}}.diagnosticGrid textarea:focus{{border-color:rgba(34,211,238,.62);box-shadow:0 0 0 3px rgba(34,211,238,.12),inset 0 1px 0 rgba(255,255,255,.05)}}.diagnosticActions{{display:flex;gap:8px;flex-wrap:wrap;margin-top:10px;justify-content:center}}.diagSummary{{margin-top:12px;padding:10px 12px;border-radius:8px;font-weight:850}}.diagSummary.good{{border:1px solid rgba(34,197,94,.35);background:rgba(34,197,94,.12);color:#bbf7d0}}.diagSummary.warn{{border:1px solid rgba(245,158,11,.34);background:rgba(245,158,11,.10);color:#fde68a}}.diagSummary.bad{{border:1px solid rgba(251,113,133,.38);background:rgba(251,113,133,.10);color:#fecdd3}}.diagList{{margin:0;padding-left:18px;color:#ddd6fe}}.diagList li{{margin:2px 0}}.diagBlocks{{display:grid;gap:8px;margin-top:10px;text-align:left}}.diagBlock{{border:1px solid rgba(167,139,250,.16);border-radius:8px;padding:10px;background:linear-gradient(180deg,rgba(57,43,82,.55),rgba(33,26,48,.74));box-shadow:inset 0 1px 0 rgba(255,255,255,.03)}}.diagBlock strong{{display:block;margin-bottom:4px}}.diagBody{{display:grid;gap:8px}}.diagTextLine{{white-space:pre-line;line-height:1.45}}.diagCmdLine{{display:grid;gap:5px}}.diagCmdLabel{{line-height:1.4}}.diagCmdRow{{display:flex;align-items:center;gap:8px;min-width:0}}.diagCode{{flex:1;min-width:0;margin:0;padding:7px 11px;border:1px solid rgba(255,255,255,.08);border-radius:8px;background:rgba(0,0,0,.20);color:#c4b5fd;font:12px/1.35 ui-monospace,SFMono-Regular,Consolas,monospace;white-space:nowrap;overflow:auto;scrollbar-width:thin}}.diagCopyBtn{{flex:0 0 36px;width:36px;height:36px;padding:0;border:1px solid rgba(255,255,255,.12);border-radius:8px;background:rgba(255,255,255,.08);color:#f3e8ff;display:inline-flex;align-items:center;justify-content:center;cursor:pointer;transition:transform .15s ease,background .15s ease,border-color .15s ease}}.diagCopyBtn:hover{{border-color:rgba(34,211,238,.52);background:rgba(34,211,238,.12)}}.diagCopyBtn:active{{transform:scale(.96)}}.diagCopyBtn.copied{{border-color:rgba(34,197,94,.42);background:rgba(34,197,94,.16);color:#bbf7d0}}.diagCopyBtn svg{{width:16px;height:16px;display:block}}.diagCopyBtn span{{position:absolute;left:-9999px}}.diagBlock.good strong{{color:#bbf7d0}}.diagBlock.warn strong{{color:#fde68a}}.diagBlock.bad strong{{color:#fecdd3}}code{{background:rgba(255,255,255,.10);border-radius:6px;padding:2px 5px;color:#f3e8ff}} -.metric.memory-ok strong,.metric.flash-ok strong,.metric.memory-warn strong,.metric.flash-warn strong,.metric.memory-bad strong,.metric.flash-bad strong{{color:#f3e8ff}}.metric.memory-ok .metric-accent,.metric.flash-ok .metric-accent{{color:#bbf7d0}}.metric.memory-warn .metric-accent,.metric.flash-warn .metric-accent{{color:#fde68a}}.metric.memory-bad .metric-accent,.metric.flash-bad .metric-accent{{color:#fecdd3}}.metric-line{{display:block}}.metric-accent{{font-weight:900}} +.metric.memory-ok strong,.metric.flash-ok strong,.metric.memory-warn strong,.metric.flash-warn strong,.metric.memory-bad strong,.metric.flash-bad strong{{color:#f3e8ff}}.metric.memory-ok .metric-accent,.metric.flash-ok .metric-accent{{color:#bbf7d0}}.metric.memory-warn .metric-accent,.metric.flash-warn .metric-accent{{color:#fde68a}}.metric.memory-bad .metric-accent,.metric.flash-bad .metric-accent{{color:#fecdd3}}.metric-line{{display:block}}.metric-accent{{font-weight:inherit}} .brandPanel{{display:grid;grid-template-columns:repeat(2,minmax(0,132px));gap:8px}}.brandPanel .appBanner{{grid-column:1/-1;width:100%;min-width:0}}.brandPanel .links{{grid-column:1/-1;display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;margin-top:0}}.brandPanel .links a{{width:100%;min-width:0}}.card{{text-align:center}}.cardTop{{align-items:center;justify-content:center;flex-direction:column}}.tagRow,.actions{{justify-content:center}}.name{{display:inline-flex;align-items:center;justify-content:center;max-width:220px;min-height:34px;margin:0;padding:7px 10px;border:1px solid rgba(251,191,36,.48);border-radius:999px;background:linear-gradient(135deg,rgba(251,191,36,.32),rgba(245,158,11,.22),rgba(255,255,255,.07));white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#fff;font-size:13px;line-height:1;font-weight:900;text-shadow:0 0 16px rgba(251,191,36,.42);box-shadow:0 10px 24px rgba(245,158,11,.10),inset 0 1px 0 rgba(255,255,255,.12)}}.metric{{text-align:center}}.metric.span2{{grid-column:1/-1}} @media(max-width:980px){{.cards{{grid-template-columns:repeat(2,minmax(0,1fr))}}.toolbar,.authGrid{{grid-template-columns:1fr 1fr}}.card.main{{grid-column:span 1}}.top{{flex-direction:column}}.headerActions{{align-self:flex-start;flex-wrap:wrap;padding-top:0;justify-content:flex-start}}}} @media(max-width:680px){{body{{font-size:13px;background-attachment:scroll}}.wrap{{padding:10px}}.top{{gap:12px;padding:14px 0;align-items:flex-start;flex-direction:column}}.brand,.brand>div{{width:100%}}h1{{font-size:22px;line-height:1.18}}.appBanner{{width:auto;max-width:100%;justify-content:center;min-height:36px;padding:8px 12px}}.links,.headerActions,.summary{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px;max-width:none}}.links{{margin-top:10px}}.links a,.badge,.headerActions .btn,.miniStat{{width:100%;min-width:0;padding:9px 10px;font-size:12px}}.authMenu{{position:fixed;left:10px;right:10px;top:74px;width:auto;max-height:calc(100svh - 90px);overflow:auto}}.cards,.toolbar,.authGrid{{grid-template-columns:1fr}}.routerStats{{grid-template-columns:repeat(3,minmax(0,1fr));gap:5px;margin-bottom:7px}}.statCard{{min-height:52px;padding:7px 6px}}.statCard span{{font-size:8px;letter-spacing:.015em}}.statCard strong{{font-size:20px}}.statCard em{{display:none}}.statCardHead{{min-height:16px}}.statValueRow,.offlineStatRow{{min-height:20px;margin-top:4px}}.offlineMoreBtn{{right:2px;min-height:16px;padding:0 5px;font-size:7px}}.offlinePopover{{right:3px;width:min(230px,calc(100vw - 20px));padding:8px}}.offlineItem{{padding:6px 7px}}.offlineName{{font-size:10px}}.toolbar{{padding:10px;margin:12px 0}}.card.main{{grid-column:span 1}}.card{{padding:12px;min-height:0}}.card>.metaLine,.card>.tagRow{{display:none}}.nameRow{{gap:6px;margin-top:10px}}.nameRow::before{{flex-basis:26px;width:26px;height:26px}}.name{{font-size:12px;max-width:190px}}.nameEditBtn{{flex-basis:26px;width:26px;height:26px}}.mobilePanelToggle,.routerFormToggle{{display:inline-flex}}.metrics{{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px}}.metric{{padding:8px}}.diagnosticPanel{{padding:12px}}.diagnosticTop{{gap:8px}}.diagnosticTop h2{{font-size:17px}}.diagnosticLead{{font-size:11px}}.diagnosticGrid{{grid-template-columns:1fr;gap:10px}}.diagnosticGrid label{{font-size:13px}}.diagnosticGrid textarea{{min-height:118px;padding:12px 13px;font-size:15px;line-height:1.35}}.diagBlock{{padding:11px}}.actions{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}}.actions .btn,.actions button{{width:100%;min-width:0;padding:9px 8px;font-size:12px}}}} @@ -2811,32 +2811,41 @@ diagnosticBlocks.addEventListener('click', (event) => {{ }}); function ago(iso) {{ - if (!iso) return 'never'; + if (!iso) return 'Никогда'; const diff = Math.max(0, Math.floor((Date.now() - Date.parse(iso)) / 1000)); - if (diff < 60) return diff + ' sec ago'; - if (diff < 3600) return Math.floor(diff / 60) + ' min ago'; - return Math.floor(diff / 3600) + ' h ago'; + if (diff < 60) return diff + ' сек назад'; + if (diff < 3600) return Math.floor(diff / 60) + ' мин назад'; + return Math.floor(diff / 3600) + ' ч назад'; }} function duration(seconds) {{ let value = Number(seconds || 0); - if (!value) return 'unknown'; + if (!value) return 'Неизвестно'; const days = Math.floor(value / 86400); value %= 86400; const hours = Math.floor(value / 3600); value %= 3600; const mins = Math.floor(value / 60); - if (days) return days + 'd ' + hours + 'h'; - if (hours) return hours + 'h ' + mins + 'm'; - return mins + 'm'; + if (days) return days + ' д ' + hours + ' ч'; + if (hours) return hours + ' ч ' + mins + ' мин'; + return mins + ' мин'; +}} + +function metricPlaceholder(value) {{ + const raw = String(value || '').trim(); + const text = raw.toLowerCase(); + if (!raw || text === 'unknown') return 'Неизвестно'; + if (text === 'never') return 'Никогда'; + if (text === 'waiting heartbeat') return 'Ожидаем первый отклик'; + return raw; }} function metric(label, value, cls = '') {{ - return `
${{escapeHtml(label)}}${{escapeHtml(value || 'unknown')}}
`; + return `
${{escapeHtml(label)}}${{escapeHtml(metricPlaceholder(value))}}
`; }} function metricHtml(label, valueHtml, cls = '') {{ - return `
${{escapeHtml(label)}}${{valueHtml || escapeHtml('unknown')}}
`; + return `
${{escapeHtml(label)}}${{valueHtml || escapeHtml('Неизвестно')}}
`; }} function formatTemperatureHtml(value) {{ @@ -2888,7 +2897,7 @@ function statusRu(value) {{ function formatMemory(value) {{ const text = String(value || ''); const match = text.match(/(\\d+)\\s*\\/\\s*(\\d+)\\s*kB/i); - if (!match) return value || 'unknown'; + if (!match) return metricPlaceholder(value); const freeKb = Number(match[1]); const totalKb = Number(match[2]); const free = Math.max(0, Math.round(freeKb / 1024)); @@ -2900,12 +2909,12 @@ function formatMemory(value) {{ function formatFlash(value) {{ const text = String(value || ''); const match = text.match(/(\\d+(?:\\.\\d+)?)\\s*([KMGTP]?B)\\s*free\\s*\\/\\s*(\\d+(?:\\.\\d+)?)\\s*([KMGTP]?B)/i); - if (!match) return value || 'unknown'; + if (!match) return metricPlaceholder(value); const free = Number(match[1]); const freeUnit = String(match[2] || 'MB').toUpperCase(); const total = Number(match[3]); const totalUnit = String(match[4] || freeUnit).toUpperCase(); - if (!Number.isFinite(free) || !Number.isFinite(total) || total <= 0) return value || 'unknown'; + if (!Number.isFinite(free) || !Number.isFinite(total) || total <= 0) return metricPlaceholder(value); const used = Math.max(0, total - free); const ruUnit = (unit) => unit.replace('KB', 'КБ').replace('MB', 'МБ').replace('GB', 'ГБ').replace('TB', 'ТБ').replace('PB', 'ПБ'); const show = (num) => Math.abs(num - Math.round(num)) < 0.05 ? String(Math.round(num)) : num.toFixed(1); @@ -2923,7 +2932,7 @@ function formatMetricBreakdownHtml(freeLabel, freeValue, usedText, totalText) {{ function formatMemoryHtml(value) {{ const text = String(value || ''); const match = text.match(/(\\d+)\\s*\\/\\s*(\\d+)\\s*kB/i); - if (!match) return escapeHtml(value || 'unknown'); + if (!match) return escapeHtml(metricPlaceholder(value)); const freeKb = Number(match[1]); const totalKb = Number(match[2]); const free = Math.max(0, Math.round(freeKb / 1024)); @@ -2940,12 +2949,12 @@ function formatMemoryHtml(value) {{ function formatFlashHtml(value) {{ const text = String(value || ''); const match = text.match(/(\\d+(?:\\.\\d+)?)\\s*([KMGTP]?B)\\s*free\\s*\\/\\s*(\\d+(?:\\.\\d+)?)\\s*([KMGTP]?B)/i); - if (!match) return escapeHtml(value || 'unknown'); + if (!match) return escapeHtml(metricPlaceholder(value)); const free = Number(match[1]); const freeUnit = String(match[2] || 'MB').toUpperCase(); const total = Number(match[3]); const totalUnit = String(match[4] || freeUnit).toUpperCase(); - if (!Number.isFinite(free) || !Number.isFinite(total) || total <= 0) return escapeHtml(value || 'unknown'); + if (!Number.isFinite(free) || !Number.isFinite(total) || total <= 0) return escapeHtml(metricPlaceholder(value)); const used = Math.max(0, total - free); const ruUnit = (unit) => unit.replace('KB', 'КБ').replace('MB', 'МБ').replace('GB', 'ГБ').replace('TB', 'ТБ').replace('PB', 'ПБ'); const show = (num) => Math.abs(num - Math.round(num)) < 0.05 ? String(Math.round(num)) : num.toFixed(1); @@ -2978,11 +2987,11 @@ function render(list) {{ const stateClass = online ? 'on' : 'off'; const stateText = online ? 'Онлайн' : 'Оффлайн'; const model = (r.status && (r.status.model || r.status.board)) || 'OpenWrt'; - const release = (r.status && r.status.release) || 'waiting heartbeat'; + const release = metricPlaceholder((r.status && r.status.release) || 'waiting heartbeat'); const xray = (r.status && r.status.xray) || 'unknown'; const ssh = (r.status && r.status.ssh) || 'unknown'; const uptime = r.status && r.status.uptime ? duration(r.status.uptime) : 'unknown'; - const load = formatLoad((r.status && r.status.load) || 'unknown'); + const load = formatLoad(metricPlaceholder((r.status && r.status.load) || 'unknown')); const memory = formatMemory((r.status && r.status.memory) || 'unknown'); const flash = (r.status && r.status.flash) || 'unknown'; const flashDisplay = formatFlash(flash); @@ -3096,11 +3105,11 @@ render = function(list) {{ const stateClass = online ? 'on' : 'off'; const stateText = online ? 'Онлайн' : 'Оффлайн'; const model = (r.status && (r.status.model || r.status.board)) || 'OpenWrt'; - const release = (r.status && r.status.release) || 'waiting heartbeat'; + const release = metricPlaceholder((r.status && r.status.release) || 'waiting heartbeat'); const xray = (r.status && r.status.xray) || 'unknown'; const ssh = (r.status && r.status.ssh) || 'unknown'; const uptime = r.status && r.status.uptime ? duration(r.status.uptime) : 'unknown'; - const load = formatLoad((r.status && r.status.load) || 'unknown'); + const load = formatLoad(metricPlaceholder((r.status && r.status.load) || 'unknown')); const memory = formatMemory((r.status && r.status.memory) || 'unknown'); const flash = (r.status && r.status.flash) || 'unknown'; const flashDisplay = formatFlash(flash);