From fee38c1c328f436edb27180b6e4184ddcc77255e Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Fri, 4 Mar 2022 05:36:18 -0500
Subject: [PATCH] Console: Add SSU version column to /peers
---
.../i2p/router/web/helpers/PeerHelper.java | 7 ++++-
.../jsp/themes/console/dark/console.css | 30 +++++++++----------
.../jsp/themes/console/light/console.css | 26 ++++++++--------
3 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java
index 8a33c0824b..dcd0b72671 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/PeerHelper.java
@@ -479,6 +479,7 @@ public class PeerHelper extends HelperBase {
buf.append("</th><th nowrap><a href=\"#def.dir\" title=\"")
.append(_t("Direction/Introduction")).append("\">").append(_t("Dir"))
.append("</a></th><th nowrap>").append(_t("IPv6"))
+ .append("</th><th nowrap>").append(_t("Version"))
.append("</th><th nowrap><a href=\"#def.idle\">").append(_t("Idle")).append("</a><br>");
appendSortLinks(buf, urlBase, sortFlags, _t("Sort by idle inbound"), FLAG_IDLE_IN);
buf.append(" / ");
@@ -575,6 +576,10 @@ public class PeerHelper extends HelperBase {
buf.append("");
buf.append("</td>");
+ buf.append("<td class=\"cells peeripv6\" align=\"center\">");
+ buf.append(peer.getVersion());
+ buf.append("</td>");
+
long idleIn = Math.max(now-peer.getLastReceiveTime(), 0);
long idleOut = Math.max(now-peer.getLastSendTime(), 0);
@@ -706,7 +711,7 @@ public class PeerHelper extends HelperBase {
if (numPeers > 0) {
// buf.append("<tr><td colspan=\"16\"><hr></td></tr>\n");
- buf.append("<tr class=\"tablefooter\"><td colspan=\"4\" align=\"left\"><b>")
+ buf.append("<tr class=\"tablefooter\"><td colspan=\"5\" align=\"left\"><b>")
.append(ngettext("{0} peer", "{0} peers", peers.size()))
.append("</b></td>" +
"<td align=\"center\" nowrap><span class=\"right\"><b>");
diff --git a/apps/routerconsole/jsp/themes/console/dark/console.css b/apps/routerconsole/jsp/themes/console/dark/console.css
index 1f5c1a07c0..4308bd4830 100644
--- a/apps/routerconsole/jsp/themes/console/dark/console.css
+++ b/apps/routerconsole/jsp/themes/console/dark/console.css
@@ -1605,7 +1605,7 @@ td img {
padding: 0 1px 0 2px;
}
-#udpconnections td:nth-child(2) img,
+#udpconnections td:nth-child(3) img,
#ntcpconnections td:nth-child(2) img {
padding: 0;
}
@@ -7076,15 +7076,15 @@ img+tt {
#ntcpconnections td:nth-child(8),
#ntcpconnections td:nth-child(9),
#ntcpconnections td:nth-child(10),
-#udpconnections td:nth-child(6),
#udpconnections td:nth-child(7),
-#udpconnections td:nth-child(9),
+#udpconnections td:nth-child(8),
#udpconnections td:nth-child(10),
#udpconnections td:nth-child(11),
-#udpconnections td:nth-child(13),
+#udpconnections td:nth-child(12),
#udpconnections td:nth-child(14),
#udpconnections td:nth-child(15),
-#udpconnections td:nth-child(16) {
+#udpconnections td:nth-child(16),
+#udpconnections td:nth-child(17) {
text-align: right;
white-space: nowrap;
}
@@ -7110,10 +7110,10 @@ img+tt {
#ntcpconnections td:nth-child(4),
#ntcpconnections td:nth-child(5),
-#udpconnections td:nth-child(4),
#udpconnections td:nth-child(5),
-#udpconnections td:nth-child(8),
-#udpconnections td:nth-child(12) {
+#udpconnections td:nth-child(6),
+#udpconnections td:nth-child(9),
+#udpconnections td:nth-child(13) {
white-space: nowrap;
}
@@ -7131,13 +7131,13 @@ img+tt {
text-align: right;
}
-#udpconnections th:nth-child(6),
#udpconnections th:nth-child(7),
-#udpconnections th:nth-child(n+9) {
+#udpconnections th:nth-child(8),
+#udpconnections th:nth-child(n+10) {
text-align: right;
}
-#udpconnections th:nth-child(12) {
+#udpconnections th:nth-child(13) {
text-align: center;
}
@@ -7170,9 +7170,9 @@ img+tt {
width: auto;
}
-#udpconnections th:nth-child(n+13),
+#udpconnections th:nth-child(n+14),
#udpconnections .tablefooter th:nth-child(n+10),
-#udpconnections td:nth-child(n+13),
+#udpconnections td:nth-child(n+14),
#udpconnections .tablefooter td:nth-child(n+10) {
padding-right: 1% !important;
}
@@ -7856,7 +7856,7 @@ b.netdb_transport {
}
@media screen and (max-width: 1220px) {
- #udpconnections tr:nth-last-child(n+3):hover td:nth-child(n+2) {
+ #udpconnections tr:nth-last-child(n+4):hover td:nth-child(n+3) {
transform: scale(1.05);
text-align: center !important;
}
@@ -8491,4 +8491,4 @@ table#externali2cp th {
text-transform: none !important;
letter-spacing: 0 !important;
word-spacing: 0 !important;
-}
\ No newline at end of file
+}
diff --git a/apps/routerconsole/jsp/themes/console/light/console.css b/apps/routerconsole/jsp/themes/console/light/console.css
index d94bb03f4b..46985db8e7 100644
--- a/apps/routerconsole/jsp/themes/console/light/console.css
+++ b/apps/routerconsole/jsp/themes/console/light/console.css
@@ -5628,15 +5628,15 @@ img+tt {
#ntcpconnections td:nth-child(8),
#ntcpconnections td:nth-child(9),
#ntcpconnections td:nth-child(10),
-#udpconnections td:nth-child(6),
#udpconnections td:nth-child(7),
-#udpconnections td:nth-child(9),
+#udpconnections td:nth-child(8),
#udpconnections td:nth-child(10),
#udpconnections td:nth-child(11),
-#udpconnections td:nth-child(13),
+#udpconnections td:nth-child(12),
#udpconnections td:nth-child(14),
#udpconnections td:nth-child(15),
-#udpconnections td:nth-child(16) {
+#udpconnections td:nth-child(16),
+#udpconnections td:nth-child(17) {
text-align: right !important;
white-space: nowrap;
}
@@ -5662,10 +5662,10 @@ img+tt {
#ntcpconnections td:nth-child(4),
#ntcpconnections td:nth-child(5),
-#udpconnections td:nth-child(4),
#udpconnections td:nth-child(5),
-#udpconnections td:nth-child(8),
-#udpconnections td:nth-child(12) {
+#udpconnections td:nth-child(6),
+#udpconnections td:nth-child(9),
+#udpconnections td:nth-child(13) {
white-space: nowrap;
}
@@ -5682,13 +5682,13 @@ img+tt {
text-align: right !important;
}
-#udpconnections th:nth-child(6),
#udpconnections th:nth-child(7),
-#udpconnections th:nth-child(n+9) {
+#udpconnections th:nth-child(8),
+#udpconnections th:nth-child(n+10) {
text-align: right !important;
}
-#udpconnections th:nth-child(12) {
+#udpconnections th:nth-child(13) {
text-align: center !important;
}
@@ -5721,7 +5721,7 @@ img+tt {
width: auto;
}
-#udpconnections td:nth-child(n+13),
+#udpconnections td:nth-child(n+14),
#udpconnections .tablefooter td:nth-child(n+10) {
padding-right: 1%;
}
@@ -6596,7 +6596,7 @@ ul#banlist {
#profilelist tr:hover td,
#floodfills tr:hover td,
#ntcpconnections tr:nth-last-child(n+2):hover td,
-#udpconnections tr:nth-last-child(n+2):hover td,
+#udpconnections tr:nth-last-child(n+3):hover td,
#schedjobs tr:hover td,
#jobstats tr:nth-last-child(n+2):hover td,
#jardump tr:hover td,
@@ -8912,4 +8912,4 @@ th.options {
}
-/* end chrome overrides */
\ No newline at end of file
+/* end chrome overrides */
--
GitLab