diff --git a/apps/routerconsole/jsp/debug.jsp b/apps/routerconsole/jsp/debug.jsp index 694f9c1df2..b05f46a21f 100644 --- a/apps/routerconsole/jsp/debug.jsp +++ b/apps/routerconsole/jsp/debug.jsp @@ -1,10 +1,11 @@ <%@page contentType="text/html"%> <%@page pageEncoding="UTF-8"%> -DEBUG +I2P Router Console - Debug <%@include file="css.jsp" %> <%@include file="summary.jsp" %> +

Router SKM

<% /* @@ -15,7 +16,7 @@ /* * Print out the status for all the SessionKeyManagers */ - out.print("

Router SKM

"); + ctx.sessionKeyManager().renderStatusHTML(out); java.util.Set clients = ctx.clientManager().listClients(); for (net.i2p.data.Destination dest : clients) { diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index cf7d728d0d..b9bcaed8a6 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -145,7 +145,7 @@ div.routersummary { width: 185px; color: inherit; margin: 0; - padding: 7px 1px; + padding: 10px 1px 7px 1px; text-align: center !important; border: 5px solid #bbf; font-size: 9pt; diff --git a/installer/resources/themes/console/classic/images/i2plogo.png b/installer/resources/themes/console/classic/images/i2plogo.png new file mode 100644 index 0000000000..52d1fd6c7d Binary files /dev/null and b/installer/resources/themes/console/classic/images/i2plogo.png differ diff --git a/installer/resources/themes/console/dark/i2plogo.png b/installer/resources/themes/console/dark/i2plogo.png new file mode 100644 index 0000000000..0448b9065f Binary files /dev/null and b/installer/resources/themes/console/dark/i2plogo.png differ diff --git a/installer/resources/themes/console/light/images/i2plogo.png b/installer/resources/themes/console/light/images/i2plogo.png index 52d1fd6c7d..ac6a6c619c 100644 Binary files a/installer/resources/themes/console/light/images/i2plogo.png and b/installer/resources/themes/console/light/images/i2plogo.png differ diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index ff53f7d15d..5d4db71a52 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -998,7 +998,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { StringBuilder buf = new StringBuilder(size); out.write("

Network Database Contents (View LeaseSets)

\n"); if (!_initialized) { - buf.append("Not initialized\n"); + buf.append("Not initialized\n"); out.write(buf.toString()); out.flush(); return; @@ -1047,8 +1047,8 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { buf.append("VersionCount\n"); for (String routerVersion : versionList) { int num = versions.count(routerVersion); - buf.append("").append(DataHelper.stripHTML(routerVersion)); - buf.append("").append(num).append("\n"); + buf.append("").append(DataHelper.stripHTML(routerVersion)); + buf.append("").append(num).append("\n"); } buf.append("\n"); } @@ -1066,7 +1066,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { buf.append("\"").append(country.toUpperCase()).append("\""); "); buf.append(_context.commSystem().getCountryName(country)); - buf.append("").append(num).append("\n"); + buf.append("").append(num).append("\n"); } buf.append("\n"); } @@ -1081,21 +1081,22 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { */ private void renderRouterInfo(StringBuilder buf, RouterInfo info, boolean isUs, boolean full) { String hash = info.getIdentity().getHash().toBase64(); - buf.append(""); + buf.append("
"); if (isUs) { - buf.append("Our info: ").append(hash).append("
\n"); + buf.append("Our info: ").append(hash).append("
\n"); } else { - buf.append("Peer info for: ").append(hash).append("
\n"); + buf.append("Peer info for: ").append(hash).append("\n"); + buf.append("[Full entry]
\n"); } long age = _context.clock().now() - info.getPublished(); if (isUs && _context.router().isHidden()) - buf.append("Hidden, Updated: ").append(DataHelper.formatDuration(age)).append(" ago
\n"); + buf.append("Hidden, Updated: ").append(DataHelper.formatDuration(age)).append(" ago
\n"); else if (age > 0) - buf.append("Published: ").append(DataHelper.formatDuration(age)).append(" ago
\n"); + buf.append("Published: ").append(DataHelper.formatDuration(age)).append(" ago
\n"); else - buf.append("Published: in ").append(DataHelper.formatDuration(0-age)).append("???
\n"); - buf.append("Address(es): "); + buf.append("Published: in ").append(DataHelper.formatDuration(0-age)).append("???
\n"); + buf.append("Address(es): "); String country = _context.commSystem().getCountry(info.getIdentity().getHash()); if(country != null) { buf.append("