diff --git a/static/js/app.js b/static/js/app.js index 784971f..76208a7 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -862,9 +862,26 @@ async function refreshStates() { else if (action === 'unlinked') { badgeColor = 'var(--text-muted)'; badgeBorder = 'var(--border-light)'; suffix = ' [UNL]'; } else { badgeColor = gw.color; badgeBorder = gw.color; } + const chipBase = "display:inline-flex; align-items:center; gap:5px; font-size:0.75rem; font-family:'JetBrains Mono',monospace; padding:2px 6px; margin:2px 4px 2px 0; border-radius:3px; background:rgba(0,0,0,0.5); border:1px solid "; + if (gw.proto === 'DMR' && gwData['DMR_NETS'] && gwData['DMR_NETS'].length > 0) { - gwData['DMR_NETS'].forEach(netName => { let netSuffix = (action === 'linking') ? ' [LNK]' : (action === 'failed' ? ' [ERR]' : (dest && action !== 'status' ? `:${dest}` : '')); gwHtml += `DMR:${esc(netName)}${esc(netSuffix)}`; }); - } else { gwHtml += `${gw.label}${esc(suffix)}`; } + gwData['DMR_NETS'].forEach(netName => { + let tagStatus = (action === 'linking') ? 'LNK' : (action === 'failed' ? 'ERR' : (dest && action !== 'status' ? `${esc(dest)}` : '')); + gwHtml += `DMR${esc(netName)}${tagStatus ? '·' + tagStatus : ''}`; + }); + } else { + let destText = dest ? `${esc(dest)}` : ''; + let statusPill = ''; + if (action === 'linking') statusPill = 'LNK'; + else if (action === 'failed') statusPill = 'ERR'; + else if (action === 'unlinked') statusPill = 'UNL'; + + let content = `${gw.label}`; + if (destText) content += `·${destText}`; + if (statusPill) content += `·${statusPill}`; + + gwHtml += `${content}`; + } } }); }