I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 27693826 authored by zzz's avatar zzz
Browse files

summary bar post-refactor fixups

parent 8a647b42
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+ 105
− 99
View file @ 27693826
...@@ -264,12 +264,14 @@ public class SummaryBarRenderer { ...@@ -264,12 +264,14 @@ public class SummaryBarRenderer {
buf.setLength(0); buf.setLength(0);
boolean anotherLine = false;
if (_helper.showFirewallWarning()) { if (_helper.showFirewallWarning()) {
buf.append("<h4><a href=\"config.jsp\" target=\"_top\" title=\"") buf.append("<h4><a href=\"config.jsp\" target=\"_top\" title=\"")
.append(_("Help with firewall configuration")) .append(_("Help with firewall configuration"))
.append("\">") .append("\">")
.append(_("Check NAT/firewall")) .append(_("Check NAT/firewall"))
.append("</a></h4>"); .append("</a></h4>");
anotherLine = true;
} }
boolean reseedInProgress = Boolean.valueOf(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress")).booleanValue(); boolean reseedInProgress = Boolean.valueOf(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress")).booleanValue();
...@@ -289,116 +291,120 @@ public class SummaryBarRenderer { ...@@ -289,116 +291,120 @@ public class SummaryBarRenderer {
buf.append("<input type=\"hidden\" name=\"reseedNonce\" value=\"").append(nonce).append("\" >\n"); buf.append("<input type=\"hidden\" name=\"reseedNonce\" value=\"").append(nonce).append("\" >\n");
buf.append("<button type=\"submit\" >Reseed</button></form>\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 a new reseed ain't running, and the last reseed had errors, show error message
if (!reseedInProgress) { if (!reseedInProgress) {
String reseedErrorMessage = System.getProperty("net.i2p.router.web.ReseedHandler.errorMessage",""); String reseedErrorMessage = System.getProperty("net.i2p.router.web.ReseedHandler.errorMessage","");
if (reseedErrorMessage.length() > 0) { if (reseedErrorMessage.length() > 0) {
buf.append("<i>").append(reseedErrorMessage).append("</i><br>"); 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()); out.write(buf.toString());
......
apps/routerconsole/jsp/summarynoframe.jsp
+ 17
− 0
View file @ 27693826
...@@ -12,6 +12,23 @@ ...@@ -12,6 +12,23 @@
<jsp:setProperty name="helper" property="consoleNonce" value="<%=request.getParameter("consoleNonce")%>" /> <jsp:setProperty name="helper" property="consoleNonce" value="<%=request.getParameter("consoleNonce")%>" />
<jsp:setProperty name="helper" property="requestURI" value="<%=request.getRequestURI()%>" /> <jsp:setProperty name="helper" property="requestURI" value="<%=request.getRequestURI()%>" />
<jsp:setProperty name="helper" property="writer" value="<%=out%>" /> <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 // moved to java for ease of translation and to avoid 30 copies
helper.renderSummaryBar(); helper.renderSummaryBar();
......
apps/routerconsole/locale/messages_de.po
+ 19
− 19
View file @ 27693826
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P routerconsole\n" "Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2009-10-19 12:50+0000\n"
"Last-Translator: foo <foo@bar>\n" "Last-Translator: foo <foo@bar>\n"
"Language-Team: foo <foo@bar>\n" "Language-Team: foo <foo@bar>\n"
...@@ -17,7 +17,7 @@ msgstr "" ...@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: German\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" msgid "Update policy"
msgstr "Update policy in german foobarbaz" msgstr "Update policy in german foobarbaz"
...@@ -75,7 +75,7 @@ msgid "I2P Internals" ...@@ -75,7 +75,7 @@ msgid "I2P Internals"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:80 #: 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" msgid "View existing tunnels and tunnel build status"
msgstr "" msgstr ""
...@@ -211,66 +211,66 @@ msgstr "" ...@@ -211,66 +211,66 @@ msgstr ""
msgid "Known" msgid "Known"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:269 #: src/net/i2p/router/web/SummaryBarRenderer.java:270
msgid "Help with firewall configuration" msgid "Help with firewall configuration"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:271 #: src/net/i2p/router/web/SummaryBarRenderer.java:272
msgid "Check NAT/firewall" msgid "Check NAT/firewall"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:304 #: src/net/i2p/router/web/SummaryBarRenderer.java:309
msgid "Configure router bandwidth allocation" msgid "Configure router bandwidth allocation"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:306 #: src/net/i2p/router/web/SummaryBarRenderer.java:311
msgid "Bandwidth in/out" msgid "Bandwidth in/out"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:323 #: src/net/i2p/router/web/SummaryBarRenderer.java:328
msgid "Total" msgid "Total"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:331 #: src/net/i2p/router/web/SummaryBarRenderer.java:336
msgid "Used" msgid "Used"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:341 #: src/net/i2p/router/web/SummaryBarRenderer.java:346
msgid "Tunnels in/out" msgid "Tunnels in/out"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:346 #: src/net/i2p/router/web/SummaryBarRenderer.java:351
msgid "Exploratory" msgid "Exploratory"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:354 #: src/net/i2p/router/web/SummaryBarRenderer.java:359
msgid "Client" msgid "Client"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:362 #: src/net/i2p/router/web/SummaryBarRenderer.java:367
msgid "Participating" msgid "Participating"
msgstr "" 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?" msgid "What's in the router's job queue?"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:370 #: src/net/i2p/router/web/SummaryBarRenderer.java:375
msgid "Congestion" msgid "Congestion"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:375 #: src/net/i2p/router/web/SummaryBarRenderer.java:380
msgid "Job lag" msgid "Job lag"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:381 #: src/net/i2p/router/web/SummaryBarRenderer.java:386
msgid "Message delay" msgid "Message delay"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:387 #: src/net/i2p/router/web/SummaryBarRenderer.java:392
msgid "Tunnel lag" msgid "Tunnel lag"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:393 #: src/net/i2p/router/web/SummaryBarRenderer.java:398
msgid "Backlog" msgid "Backlog"
msgstr "" msgstr ""
apps/routerconsole/locale/messages_zh.po
+ 19
− 19
View file @ 27693826
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: I2P routerconsole\n" "Project-Id-Version: I2P routerconsole\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2009-10-19 12:59+0000\n"
"Last-Translator: foo <foo@bar>\n" "Last-Translator: foo <foo@bar>\n"
"Language-Team: foo <foo@par>\n" "Language-Team: foo <foo@par>\n"
...@@ -17,7 +17,7 @@ msgstr "" ...@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Chinese\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" msgid "Update policy"
msgstr "" msgstr ""
...@@ -75,7 +75,7 @@ msgid "I2P Internals" ...@@ -75,7 +75,7 @@ msgid "I2P Internals"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:80 #: 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" msgid "View existing tunnels and tunnel build status"
msgstr "" msgstr ""
...@@ -211,66 +211,66 @@ msgstr "" ...@@ -211,66 +211,66 @@ msgstr ""
msgid "Known" msgid "Known"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:269 #: src/net/i2p/router/web/SummaryBarRenderer.java:270
msgid "Help with firewall configuration" msgid "Help with firewall configuration"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:271 #: src/net/i2p/router/web/SummaryBarRenderer.java:272
msgid "Check NAT/firewall" msgid "Check NAT/firewall"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:304 #: src/net/i2p/router/web/SummaryBarRenderer.java:309
msgid "Configure router bandwidth allocation" msgid "Configure router bandwidth allocation"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:306 #: src/net/i2p/router/web/SummaryBarRenderer.java:311
msgid "Bandwidth in/out" msgid "Bandwidth in/out"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:323 #: src/net/i2p/router/web/SummaryBarRenderer.java:328
msgid "Total" msgid "Total"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:331 #: src/net/i2p/router/web/SummaryBarRenderer.java:336
msgid "Used" msgid "Used"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:341 #: src/net/i2p/router/web/SummaryBarRenderer.java:346
msgid "Tunnels in/out" msgid "Tunnels in/out"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:346 #: src/net/i2p/router/web/SummaryBarRenderer.java:351
msgid "Exploratory" msgid "Exploratory"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:354 #: src/net/i2p/router/web/SummaryBarRenderer.java:359
msgid "Client" msgid "Client"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:362 #: src/net/i2p/router/web/SummaryBarRenderer.java:367
msgid "Participating" msgid "Participating"
msgstr "" 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?" msgid "What's in the router's job queue?"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:370 #: src/net/i2p/router/web/SummaryBarRenderer.java:375
msgid "Congestion" msgid "Congestion"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:375 #: src/net/i2p/router/web/SummaryBarRenderer.java:380
msgid "Job lag" msgid "Job lag"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:381 #: src/net/i2p/router/web/SummaryBarRenderer.java:386
msgid "Message delay" msgid "Message delay"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:387 #: src/net/i2p/router/web/SummaryBarRenderer.java:392
msgid "Tunnel lag" msgid "Tunnel lag"
msgstr "" msgstr ""
#: src/net/i2p/router/web/SummaryBarRenderer.java:393 #: src/net/i2p/router/web/SummaryBarRenderer.java:398
msgid "Backlog" msgid "Backlog"
msgstr "" msgstr ""
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]