From 28aa2710fddd62da0fd579b4ef494d2423ba4af4 Mon Sep 17 00:00:00 2001 From: si458 Date: Thu, 19 Jun 2025 19:40:57 +0100 Subject: [PATCH] few ipv6 fixes in web ui Signed-off-by: si458 --- translate/translate.json | 48 +++++++++++++++++++-------------------- views/default.handlebars | 6 ++--- views/default3.handlebars | 6 ++--- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/translate/translate.json b/translate/translate.json index 23f6720a..c9b5e971 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -5382,10 +5382,10 @@ "xloc": [ "default-mobile.handlebars->11->518", "default.handlebars->47->2249", - "default.handlebars->47->448", + "default.handlebars->47->447", "default.handlebars->47->931", "default3.handlebars->35->2245", - "default3.handlebars->35->445", + "default3.handlebars->35->444", "default3.handlebars->35->928" ] }, @@ -14779,9 +14779,9 @@ "zh-cht": "CCM", "xloc": [ "default-mobile.handlebars->11->517", - "default.handlebars->47->446", + "default.handlebars->47->445", "default.handlebars->47->929", - "default3.handlebars->35->443", + "default3.handlebars->35->442", "default3.handlebars->35->926" ] }, @@ -20002,9 +20002,9 @@ "xloc": [ "default-mobile.handlebars->11->4", "default.handlebars->47->11", - "default.handlebars->47->440", + "default.handlebars->47->448", "default3.handlebars->35->11", - "default3.handlebars->35->437", + "default3.handlebars->35->445", "sharing-mobile.handlebars->11->4", "sharing.handlebars->11->4", "ssh.handlebars->3->4", @@ -40462,8 +40462,8 @@ "pl": "W", "uk": "Вх", "xloc": [ - "default.handlebars->47->444", - "default3.handlebars->35->441" + "default.handlebars->47->443", + "default3.handlebars->35->440" ] }, { @@ -42284,8 +42284,8 @@ "pl": "Nazwa hosta Intel® AMT", "uk": "Ім'я хоста Intel® AMT", "xloc": [ - "default.handlebars->47->365", - "default3.handlebars->35->362" + "default.handlebars->47->364", + "default3.handlebars->35->361" ] }, { @@ -42314,9 +42314,9 @@ "zh-chs": "在Intel® AMT尔AMT", "zh-cht": "在管理控制模式下啟動了Intel® AMT", "xloc": [ - "default.handlebars->47->447", + "default.handlebars->47->446", "default.handlebars->47->930", - "default3.handlebars->35->444", + "default3.handlebars->35->443", "default3.handlebars->35->927" ] }, @@ -42346,9 +42346,9 @@ "zh-chs": "英特尔AMT在客户端控制模式下被激活", "zh-cht": "Intel® AMT在客户端控制模式下被启动", "xloc": [ - "default.handlebars->47->445", + "default.handlebars->47->444", "default.handlebars->47->928", - "default3.handlebars->35->442", + "default3.handlebars->35->441", "default3.handlebars->35->925" ] }, @@ -42359,8 +42359,8 @@ "pl": "Intel® AMT jest w trybie aktywacji", "uk": "Intel® AMT знаходиться в режимі активації", "xloc": [ - "default.handlebars->47->443", - "default3.handlebars->35->440" + "default.handlebars->47->442", + "default3.handlebars->35->439" ] }, { @@ -42370,8 +42370,8 @@ "pl": "Intel® AMT nie jest aktywowane", "uk": "Intel® AMT не активовано", "xloc": [ - "default.handlebars->47->441", - "default3.handlebars->35->438" + "default.handlebars->47->440", + "default3.handlebars->35->437" ] }, { @@ -42591,8 +42591,8 @@ "nl": "Intel® AMT status", "uk": "Стан Intel® AMT", "xloc": [ - "default.handlebars->47->366", - "default3.handlebars->35->363" + "default.handlebars->47->365", + "default3.handlebars->35->362" ] }, { @@ -46302,10 +46302,10 @@ "zh-chs": "最后一次露面", "zh-cht": "最後一次露面", "xloc": [ - "default.handlebars->47->364", + "default.handlebars->47->366", "default.handlebars->47->398", "default.handlebars->container->column_l->p1->devListToolbarSpan->1->0->9->devListToolbarSort->sortselect->11", - "default3.handlebars->35->361", + "default3.handlebars->35->363", "default3.handlebars->35->395", "default3.handlebars->container->column_l->p1->devListToolbarSpan->7->devListToolbarSort->sortselect->11" ] @@ -63337,8 +63337,8 @@ "nl": "Pre", "pl": "Przed", "xloc": [ - "default.handlebars->47->442", - "default3.handlebars->35->439" + "default.handlebars->47->441", + "default3.handlebars->35->438" ] }, { diff --git a/views/default.handlebars b/views/default.handlebars index faf55a63..9066b712 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -4651,7 +4651,7 @@ } // This height of 1 div at the end to fix a problem in Linux firefox browsers - r = '
' + colums + r + '
'; + r = '
' + colums + r + '
'; } } else { r += ''; @@ -4958,7 +4958,7 @@ } if (deviceViewSettings.devsCols.indexOf('links') >= 0) { r += '' + getShortRouterLinks(node); } // Links if (deviceViewSettings.devsCols.indexOf('user') >= 0) { r += '' + getUserShortStr(node); } // User - if (deviceViewSettings.devsCols.indexOf('ip') >= 0) { var ip = ''; if (node.mtype == 3) { ip = node.host; } else if (node.ip) { ip = node.ip; } r += '' + ip; } // IP address + if (deviceViewSettings.devsCols.indexOf('ip') >= 0) { var ip = ''; if (node.mtype == 3) { ip = node.host; } else if (node.ip) { ip = node.ip; } r += '' + EscapeHtml(ip); } // IP address if (deviceViewSettings.devsCols.indexOf('conn') >= 0) { r += '' + states.join(' + '); } // Connectivity if (deviceViewSettings.devsCols.indexOf('amthost') >= 0) { r += '' + (((node.intelamt == null) || (node.intelamt.host == null)) ? '' : EscapeHtml(node.intelamt.host)); } if (deviceViewSettings.devsCols.indexOf('amtstate') >= 0) { @@ -12216,7 +12216,7 @@ var splitip = node.lastaddr.split(':'); if (splitip.length > 2) { // IPv6 - x += addDetailItem("Last agent address", node.lastaddr); + x += addDetailItem("Last agent address", '' + splitip.slice(0, -1).join(':') + ''); } else { // IPv4 if (isPrivateIP(node.lastaddr)) { diff --git a/views/default3.handlebars b/views/default3.handlebars index 12b6022f..08bec01b 100644 --- a/views/default3.handlebars +++ b/views/default3.handlebars @@ -5138,7 +5138,7 @@ if (requestedLastConnects == false) { requestedLastConnects = true; meshserver.send({ action: 'lastconnects' }); } } // This height of 1 div at the end to fix a problem in Linux firefox browsers - r = '
' + colums + r + '
'; + r = '
' + colums + r + '
'; } } else { r += ''; @@ -5445,7 +5445,7 @@ } if (deviceViewSettings.devsCols.indexOf('links') >= 0) { r += '' + getShortRouterLinks(node); } // Links if (deviceViewSettings.devsCols.indexOf('user') >= 0) { r += '' + getUserShortStr(node); } // User - if (deviceViewSettings.devsCols.indexOf('ip') >= 0) { var ip = ''; if (node.mtype == 3) { ip = node.host; } else if (node.ip) { ip = node.ip; } r += '' + ip; } // IP address + if (deviceViewSettings.devsCols.indexOf('ip') >= 0) { var ip = ''; if (node.mtype == 3) { ip = node.host; } else if (node.ip) { ip = node.ip; } r += '' + EscapeHtml(ip); } // IP address if (deviceViewSettings.devsCols.indexOf('conn') >= 0) { r += '' + states.join(' + '); } // Connectivity if (deviceViewSettings.devsCols.indexOf('amthost') >= 0) { r += '' + (((node.intelamt == null) || (node.intelamt.host == null)) ? '' : EscapeHtml(node.intelamt.host)); } if (deviceViewSettings.devsCols.indexOf('amtstate') >= 0) { @@ -13053,7 +13053,7 @@ var splitip = node.lastaddr.split(':'); if (splitip.length > 2) { // IPv6 - x += addDetailItem("Last agent address", node.lastaddr); + x += addDetailItem("Last agent address", '' + splitip.slice(0, -1).join(':') + ''); } else { // IPv4 if (isPrivateIP(node.lastaddr)) {