From 27693826a2a78977c7954b0871d080a11d689c86 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 19 Oct 2009 21:40:14 +0000
Subject: [PATCH] summary bar post-refactor fixups
---
.../i2p/router/web/SummaryBarRenderer.java | 204 +++++++++---------
apps/routerconsole/jsp/summarynoframe.jsp | 17 ++
apps/routerconsole/locale/messages_de.po | 38 ++--
apps/routerconsole/locale/messages_zh.po | 38 ++--
4 files changed, 160 insertions(+), 137 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index 59a6ecd21c..e7d6ee4126 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -264,12 +264,14 @@ public class SummaryBarRenderer {
buf.setLength(0);
+ boolean anotherLine = false;
if (_helper.showFirewallWarning()) {
buf.append("<h4><a href=\"config.jsp\" target=\"_top\" title=\"")
.append(_("Help with firewall configuration"))
.append("\">")
.append(_("Check NAT/firewall"))
.append("</a></h4>");
+ anotherLine = true;
}
boolean reseedInProgress = Boolean.valueOf(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress")).booleanValue();
@@ -289,116 +291,120 @@ public class SummaryBarRenderer {
buf.append("<input type=\"hidden\" name=\"reseedNonce\" value=\"").append(nonce).append("\" >\n");
buf.append("<button type=\"submit\" >Reseed</button></form>\n");
}
+ anotherLine = true;
}
// If a new reseed ain't running, and the last reseed had errors, show error message
if (!reseedInProgress) {
String reseedErrorMessage = System.getProperty("net.i2p.router.web.ReseedHandler.errorMessage","");
if (reseedErrorMessage.length() > 0) {
buf.append("<i>").append(reseedErrorMessage).append("</i><br>");
+ anotherLine = true;
}
}
+ if (anotherLine)
+ buf.append("<hr>");
+ buf.append("<h3><a href=\"config.jsp\" title=\"")
+ .append(_("Configure router bandwidth allocation"))
+ .append("\" target=\"_top\">")
+ .append(_("Bandwidth in/out"))
+ .append("</a></h3><hr>" +
+ "<table>\n" +
+
+ "<tr><td align=\"left\"><b>1s:</b></td><td align=\"right\">")
+ .append(_helper.getInboundSecondKBps())
+ .append('/')
+ .append(_helper.getOutboundSecondKBps())
+ .append("K/s</td></tr>\n" +
+
+ "<tr><td align=\"left\"><b>5m:</b></td><td align=\"right\">")
+ .append(_helper.getInboundFiveMinuteKBps())
+ .append('/')
+ .append(_helper.getOutboundFiveMinuteKBps())
+ .append("K/s</td></tr>\n" +
+
+ "<tr><td align=\"left\"><b>")
+ .append(_("Total"))
+ .append(":</b></td><td align=\"right\">")
+ .append(_helper.getInboundLifetimeKBps())
+ .append('/')
+ .append(_helper.getOutboundLifetimeKBps())
+ .append("K/s</td></tr>\n" +
+
+ "<tr><td align=\"left\"><b>")
+ .append(_("Used"))
+ .append(":</b></td><td align=\"right\">")
+ .append(_helper.getInboundTransferred())
+ .append('/')
+ .append(_helper.getOutboundTransferred())
+ .append("</td></tr></table>\n" +
+
+ "<hr><h3><a href=\"tunnels.jsp\" target=\"_top\" title=\"")
+ .append(_("View existing tunnels and tunnel build status"))
+ .append("\">")
+ .append(_("Tunnels in/out"))
+ .append("</a></h3><hr>" +
+ "<table>\n" +
+
+ "<tr><td align=\"left\"><b>")
+ .append(_("Exploratory"))
+ .append(":</b></td><td align=\"right\">")
+ .append(_helper.getInboundTunnels())
+ .append('/')
+ .append(_helper.getOutboundTunnels())
+ .append("</td></tr>\n" +
+
+ "<tr><td align=\"left\"><b>")
+ .append(_("Client"))
+ .append(":</b></td><td align=\"right\">")
+ .append(_helper.getInboundClientTunnels())
+ .append('/')
+ .append(_helper.getOutboundClientTunnels())
+ .append("</td></tr>\n" +
+
+ "<tr><td align=\"left\"><b>")
+ .append(_("Participating"))
+ .append(":</b></td><td align=\"right\">")
+ .append(_helper.getParticipatingTunnels())
+ .append("</td></tr>\n" +
+
+ "</table><hr><h3><a href=\"/jobs.jsp\" target=\"_top\" title=\"")
+ .append(_("What's in the router's job queue?"))
+ .append("\">")
+ .append(_("Congestion"))
+ .append("</a></h3><hr>" +
+ "<table>\n" +
+
+ "<tr><td align=\"left\"><b>")
+ .append(_("Job lag"))
+ .append(":</b></td><td align=\"right\">")
+ .append(_helper.getJobLag())
+ .append("</td></tr>\n" +
+
+ "<tr><td align=\"left\"><b>")
+ .append(_("Message delay"))
+ .append(":</b></td><td align=\"right\">")
+ .append(_helper.getMessageDelay())
+ .append("</td></tr>\n" +
+
+ "<tr><td align=\"left\"><b>")
+ .append(_("Tunnel lag"))
+ .append(":</b></td><td align=\"right\">")
+ .append(_helper.getTunnelLag())
+ .append("</td></tr>\n" +
+
+ "<tr><td align=\"left\"><b>")
+ .append(_("Backlog"))
+ .append(":</b></td><td align=\"right\">")
+ .append(_helper.getInboundBacklog())
+ .append("</td></tr>\n" +
+
+ "</table><hr><h4>")
+ .append(_helper.getTunnelStatus())
+ .append("</h4><hr>\n")
+ .append(_helper.getDestinations());
- buf.append("<hr><h3><a href=\"config.jsp\" title=\"")
- .append(_("Configure router bandwidth allocation"))
- .append("\" target=\"_top\">")
- .append(_("Bandwidth in/out"))
- .append("</a></h3><hr>" +
- "<table>\n" +
-
- "<tr><td align=\"left\"><b>1s:</b></td><td align=\"right\">")
- .append(_helper.getInboundSecondKBps())
- .append('/')
- .append(_helper.getOutboundSecondKBps())
- .append("K/s</td></tr>\n" +
-
- "<tr><td align=\"left\"><b>5m:</b></td><td align=\"right\">")
- .append(_helper.getInboundFiveMinuteKBps())
- .append('/')
- .append(_helper.getOutboundFiveMinuteKBps())
- .append("K/s</td></tr>\n" +
-
- "<tr><td align=\"left\"><b>")
- .append(_("Total"))
- .append(":</b></td><td align=\"right\">")
- .append(_helper.getInboundLifetimeKBps())
- .append('/')
- .append(_helper.getOutboundLifetimeKBps())
- .append("K/s</td></tr>\n" +
-
- "<tr><td align=\"left\"><b>")
- .append(_("Used"))
- .append(":</b></td><td align=\"right\">")
- .append(_helper.getInboundTransferred())
- .append('/')
- .append(_helper.getOutboundTransferred())
- .append("</td></tr></table>\n" +
-
- "<hr><h3><a href=\"tunnels.jsp\" target=\"_top\" title=\"")
- .append(_("View existing tunnels and tunnel build status"))
- .append("\">")
- .append(_("Tunnels in/out"))
- .append("</a></h3><hr>" +
- "<table>\n" +
-
- "<tr><td align=\"left\"><b>")
- .append(_("Exploratory"))
- .append(":</b></td><td align=\"right\">")
- .append(_helper.getInboundTunnels())
- .append('/')
- .append(_helper.getOutboundTunnels())
- .append("</td></tr>\n" +
-
- "<tr><td align=\"left\"><b>")
- .append(_("Client"))
- .append(":</b></td><td align=\"right\">")
- .append(_helper.getInboundClientTunnels())
- .append('/')
- .append(_helper.getOutboundClientTunnels())
- .append("</td></tr>\n" +
-
- "<tr><td align=\"left\"><b>")
- .append(_("Participating"))
- .append(":</b></td><td align=\"right\">")
- .append(_helper.getParticipatingTunnels())
- .append("</td></tr>\n" +
-
- "</table><hr><h3><a href=\"/jobs.jsp\" target=\"_top\" title=\"")
- .append(_("What's in the router's job queue?"))
- .append("\">")
- .append(_("Congestion"))
- .append("</a></h3><hr>" +
- "<table>\n" +
-
- "<tr><td align=\"left\"><b>")
- .append(_("Job lag"))
- .append(":</b></td><td align=\"right\">")
- .append(_helper.getJobLag())
- .append("</td></tr>\n" +
-
- "<tr><td align=\"left\"><b>")
- .append(_("Message delay"))
- .append(":</b></td><td align=\"right\">")
- .append(_helper.getMessageDelay())
- .append("</td></tr>\n" +
-
- "<tr><td align=\"left\"><b>")
- .append(_("Tunnel lag"))
- .append(":</b></td><td align=\"right\">")
- .append(_helper.getTunnelLag())
- .append("</td></tr>\n" +
-
- "<tr><td align=\"left\"><b>")
- .append(_("Backlog"))
- .append(":</b></td><td align=\"right\">")
- .append(_helper.getInboundBacklog())
- .append("</td></tr>\n" +
-
- "</table><hr><h4>")
- .append(_helper.getTunnelStatus())
- .append("</h4><hr>\n")
- .append(_helper.getDestinations());
out.write(buf.toString());
diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp
index 0279a038a3..33a029e765 100644
--- a/apps/routerconsole/jsp/summarynoframe.jsp
+++ b/apps/routerconsole/jsp/summarynoframe.jsp
@@ -12,6 +12,23 @@
<jsp:setProperty name="helper" property="consoleNonce" value="<%=request.getParameter("consoleNonce")%>" />
<jsp:setProperty name="helper" property="requestURI" value="<%=request.getRequestURI()%>" />
<jsp:setProperty name="helper" property="writer" value="<%=out%>" />
+<%
+/*
+ * The following is required for the reseed button to work, although we probably
+ * only need the reseedNonce property.
+ */
+%>
+<jsp:useBean class="net.i2p.router.web.ReseedHandler" id="reseed" scope="request" />
+<jsp:setProperty name="reseed" property="*" />
+<%
+/*
+ * The following is required for the update buttons to work, although we probably
+ * only need the updateNonce property.
+ */
+%>
+<jsp:useBean class="net.i2p.router.web.UpdateHandler" id="update" scope="request" />
+<jsp:setProperty name="update" property="*" />
+<jsp:setProperty name="update" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<%
// moved to java for ease of translation and to avoid 30 copies
helper.renderSummaryBar();
diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po
index a5d3146137..75cbc0d560 100644
--- a/apps/routerconsole/locale/messages_de.po
+++ b/apps/routerconsole/locale/messages_de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 13:41+0000\n"
+"POT-Creation-Date: 2009-10-19 21:30+0000\n"
"PO-Revision-Date: 2009-10-19 12:50+0000\n"
"Last-Translator: foo <foo@bar>\n"
"Language-Team: foo <foo@bar>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: German\n"
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:332
msgid "Update policy"
msgstr "Update policy in german foobarbaz"
@@ -75,7 +75,7 @@ msgid "I2P Internals"
msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:80
-#: src/net/i2p/router/web/SummaryBarRenderer.java:339
+#: src/net/i2p/router/web/SummaryBarRenderer.java:344
msgid "View existing tunnels and tunnel build status"
msgstr ""
@@ -211,66 +211,66 @@ msgstr ""
msgid "Known"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:269
+#: src/net/i2p/router/web/SummaryBarRenderer.java:270
msgid "Help with firewall configuration"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:271
+#: src/net/i2p/router/web/SummaryBarRenderer.java:272
msgid "Check NAT/firewall"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:304
+#: src/net/i2p/router/web/SummaryBarRenderer.java:309
msgid "Configure router bandwidth allocation"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:306
+#: src/net/i2p/router/web/SummaryBarRenderer.java:311
msgid "Bandwidth in/out"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:323
+#: src/net/i2p/router/web/SummaryBarRenderer.java:328
msgid "Total"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:331
+#: src/net/i2p/router/web/SummaryBarRenderer.java:336
msgid "Used"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:341
+#: src/net/i2p/router/web/SummaryBarRenderer.java:346
msgid "Tunnels in/out"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:346
+#: src/net/i2p/router/web/SummaryBarRenderer.java:351
msgid "Exploratory"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:354
+#: src/net/i2p/router/web/SummaryBarRenderer.java:359
msgid "Client"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:362
+#: src/net/i2p/router/web/SummaryBarRenderer.java:367
msgid "Participating"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:368
+#: src/net/i2p/router/web/SummaryBarRenderer.java:373
msgid "What's in the router's job queue?"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:370
+#: src/net/i2p/router/web/SummaryBarRenderer.java:375
msgid "Congestion"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:375
+#: src/net/i2p/router/web/SummaryBarRenderer.java:380
msgid "Job lag"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:381
+#: src/net/i2p/router/web/SummaryBarRenderer.java:386
msgid "Message delay"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:387
+#: src/net/i2p/router/web/SummaryBarRenderer.java:392
msgid "Tunnel lag"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:393
+#: src/net/i2p/router/web/SummaryBarRenderer.java:398
msgid "Backlog"
msgstr ""
diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po
index 953f13adf9..805d2b8cb5 100644
--- a/apps/routerconsole/locale/messages_zh.po
+++ b/apps/routerconsole/locale/messages_zh.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-19 13:41+0000\n"
+"POT-Creation-Date: 2009-10-19 21:30+0000\n"
"PO-Revision-Date: 2009-10-19 12:59+0000\n"
"Last-Translator: foo <foo@bar>\n"
"Language-Team: foo <foo@par>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Chinese\n"
-#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:293
+#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:332
msgid "Update policy"
msgstr ""
@@ -75,7 +75,7 @@ msgid "I2P Internals"
msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:80
-#: src/net/i2p/router/web/SummaryBarRenderer.java:339
+#: src/net/i2p/router/web/SummaryBarRenderer.java:344
msgid "View existing tunnels and tunnel build status"
msgstr ""
@@ -211,66 +211,66 @@ msgstr ""
msgid "Known"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:269
+#: src/net/i2p/router/web/SummaryBarRenderer.java:270
msgid "Help with firewall configuration"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:271
+#: src/net/i2p/router/web/SummaryBarRenderer.java:272
msgid "Check NAT/firewall"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:304
+#: src/net/i2p/router/web/SummaryBarRenderer.java:309
msgid "Configure router bandwidth allocation"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:306
+#: src/net/i2p/router/web/SummaryBarRenderer.java:311
msgid "Bandwidth in/out"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:323
+#: src/net/i2p/router/web/SummaryBarRenderer.java:328
msgid "Total"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:331
+#: src/net/i2p/router/web/SummaryBarRenderer.java:336
msgid "Used"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:341
+#: src/net/i2p/router/web/SummaryBarRenderer.java:346
msgid "Tunnels in/out"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:346
+#: src/net/i2p/router/web/SummaryBarRenderer.java:351
msgid "Exploratory"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:354
+#: src/net/i2p/router/web/SummaryBarRenderer.java:359
msgid "Client"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:362
+#: src/net/i2p/router/web/SummaryBarRenderer.java:367
msgid "Participating"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:368
+#: src/net/i2p/router/web/SummaryBarRenderer.java:373
msgid "What's in the router's job queue?"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:370
+#: src/net/i2p/router/web/SummaryBarRenderer.java:375
msgid "Congestion"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:375
+#: src/net/i2p/router/web/SummaryBarRenderer.java:380
msgid "Job lag"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:381
+#: src/net/i2p/router/web/SummaryBarRenderer.java:386
msgid "Message delay"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:387
+#: src/net/i2p/router/web/SummaryBarRenderer.java:392
msgid "Tunnel lag"
msgstr ""
-#: src/net/i2p/router/web/SummaryBarRenderer.java:393
+#: src/net/i2p/router/web/SummaryBarRenderer.java:398
msgid "Backlog"
msgstr ""
--
GitLab