Details tab improvement when displaying network information.
Ylian Saint-Hilaire committed
Jun 28, 2022 at 17:51 UTC
edcc64548eba67cb2c41c16dfc5fa679f8a4b966
2 files changed
+14
-28
views/default-mobile.handlebars
+7
-14
@@ -5772,20 +5772,13 @@
5772
}
5773
}
5774
for (var j = 0; j < m.length; j++) {
5775
- var iplayer = m[j];
5776
- if (iplayer.family == 'IPv4') {
5777
- if (iplayer.gateway && iplayer.netmask) {
5778
- x += addDetailItem("IPv4 Layer", format("{0}, Mask: {1}, Gateway: {2}", EscapeHtml(iplayer.address), EscapeHtml(iplayer.netmask), EscapeHtml(iplayer.gateway)));
5779
- } else {
5780
- if (iplayer.address) { x += addDetailItem("IPv4 Layer", format("{0}", EscapeHtml(iplayer.address))); }
5781
- }
5782
- }
5783
- if (iplayer.family == 'IPv6') {
5784
- if (iplayer.gateway && iplayer.netmask) {
5785
- x += addDetailItem("IPv6 Layer", format("{0}, Mask: {1}, Gateway: {2}", EscapeHtml(iplayer.address), EscapeHtml(iplayer.netmask), EscapeHtml(iplayer.gateway)));
5786
- } else {
5787
- if (iplayer.address) { x += addDetailItem("IPv6 Layer", format("{0}", EscapeHtml(iplayer.address))); }
5788
- }
5775
+ var iplayer = m[j], items = [];
5776
+ if (iplayer.address) { items.push(format("IP: {0}", EscapeHtml(iplayer.address))); }
5777
+ if (iplayer.netmask) { items.push(format("Mask: {0}", EscapeHtml(iplayer.netmask))); }
5778
+ if (iplayer.gateway) { items.push(format("Gateway: {0}", EscapeHtml(iplayer.gateway))); }
5779
+ if (items.length > 0) {
5780
+ if (iplayer.family == 'IPv4') { x += addDetailItem("IPv4 Layer", items.join(", ")); }
5781
+ if (iplayer.family == 'IPv6') { x += addDetailItem("IPv6 Layer", items.join(", ")); }
5782
}
5783
}
5784
x += '</div>';
views/default.handlebars
+7
-14
@@ -11190,20 +11190,13 @@
11190
}
11191
}
11192
for (var j = 0; j < m.length; j++) {
11193
- var iplayer = m[j];
11194
- if (iplayer.family == 'IPv4') {
11195
- if (iplayer.gateway && iplayer.netmask) {
11196
- x += addDetailItem("IPv4 Layer", format("IP: {0}, Mask: {1}, Gateway: {2}", EscapeHtml(iplayer.address), EscapeHtml(iplayer.netmask), EscapeHtml(iplayer.gateway)));
11197
- } else {
11198
- if (iplayer.address) { x += addDetailItem("IPv4 Layer", format("IP: {0}", EscapeHtml(iplayer.address))); }
11199
- }
11200
- }
11201
- if (iplayer.family == 'IPv6') {
11202
- if (iplayer.gateway && iplayer.netmask) {
11203
- x += addDetailItem("IPv6 Layer", format("IP: {0}, Mask: {1}, Gateway: {2}", EscapeHtml(iplayer.address), EscapeHtml(iplayer.netmask), EscapeHtml(iplayer.gateway)));
11204
- } else {
11205
- if (iplayer.address) { x += addDetailItem("IPv6 Layer", format("IP: {0}", EscapeHtml(iplayer.address))); }
11206
- }
11193
+ var iplayer = m[j], items = [];
11194
+ if (iplayer.address) { items.push(format("IP: {0}", EscapeHtml(iplayer.address))); }
11195
+ if (iplayer.netmask) { items.push(format("Mask: {0}", EscapeHtml(iplayer.netmask))); }
11196
+ if (iplayer.gateway) { items.push(format("Gateway: {0}", EscapeHtml(iplayer.gateway))); }
11197
+ if (items.length > 0) {
11198
+ if (iplayer.family == 'IPv4') { x += addDetailItem("IPv4 Layer", items.join(", ")); }
11199
+ if (iplayer.family == 'IPv6') { x += addDetailItem("IPv6 Layer", items.join(", ")); }
11200
}
11201
}
11202
x += '</div>';