From b63d46e2a10a3717973d7a067ae52aa4fd33d19a Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sun, 16 Feb 2025 10:34:44 -0500
Subject: [PATCH] Console: Move family line above addresses in full netdb
output
looks better and was messing up last-child CSS in dark theme
---
.../i2p/router/web/helpers/NetDbRenderer.java | 36 ++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
index fafb472553..ebc1d52942 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
@@ -1422,8 +1422,25 @@ class NetDbRenderer {
}
}
}
- buf.append("</td></tr>\n<tr>")
- .append("<td><b>").append(_t("Addresses")).append(":</b></td><td colspan=\"2\"");
+ buf.append("</td></tr>\n");
+ if (full) {
+ String family = info.getOption("family");
+ if (family != null) {
+ FamilyKeyCrypto fkc = _context.router().getFamilyKeyCrypto();
+ if (fkc != null) {
+ String f = DataHelper.stripHTML(family);
+ buf.append("<tr><td><b>").append(_t("Family"))
+ .append(":</b><td colspan=\"2\"><span class=\"netdb_info\">")
+ .append(fkc.verify(info) == FamilyKeyCrypto.Result.STORED_KEY ? "Verified" : "Unverified")
+ .append(" <a href=\"/netdb?fam=")
+ .append(f)
+ .append("\">")
+ .append(f)
+ .append("</a></span></td></tr>\n");
+ }
+ }
+ }
+ buf.append("<tr><td><b>").append(_t("Addresses")).append(":</b></td><td colspan=\"2\"");
Collection<RouterAddress> addrs = info.getAddresses();
if (addrs.isEmpty()) {
buf.append('>').append(_t("none"));
@@ -1464,21 +1481,6 @@ class NetDbRenderer {
buf.append(DataHelper.stripHTML(key)).append(" = ").append(DataHelper.stripHTML(val)).append("<br>\n");
}
buf.append("</code></td></tr>\n");
- String family = info.getOption("family");
- if (family != null) {
- FamilyKeyCrypto fkc = _context.router().getFamilyKeyCrypto();
- if (fkc != null) {
- String f = DataHelper.stripHTML(family);
- buf.append("<tr><td><b>").append(_t("Family"))
- .append(":</b><td colspan=\"2\"><span class=\"netdb_info\">")
- .append(fkc.verify(info) == FamilyKeyCrypto.Result.STORED_KEY ? "Verified" : "Unverified")
- .append(" <a href=\"/netdb?fam=")
- .append(f)
- .append("\">")
- .append(f)
- .append("</a></span></td></tr>\n");
- }
- }
}
buf.append("</table>\n");
}
--
GitLab