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 0c1fb1174..5e22c1edc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -266,47 +266,7 @@ public class SummaryBarRenderer { out.write(buf.toString()); buf.setLength(0); - - boolean anotherLine = false; - if (_helper.showFirewallWarning()) { - buf.append("

") - .append(_("Check network connection and NAT/firewall")) - .append("

"); - anotherLine = true; - } - - boolean reseedInProgress = Boolean.valueOf(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress")).booleanValue(); - // If showing the reseed link is allowed - if (_helper.allowReseed()) { - if (reseedInProgress) { - // While reseed occurring, show status message instead - buf.append("").append(System.getProperty("net.i2p.router.web.ReseedHandler.statusMessage","")).append("
"); - } else { - // While no reseed occurring, show reseed link - long nonce = _context.random().nextLong(); - String prev = System.getProperty("net.i2p.router.web.ReseedHandler.nonce"); - if (prev != null) System.setProperty("net.i2p.router.web.ReseedHandler.noncePrev", prev); - System.setProperty("net.i2p.router.web.ReseedHandler.nonce", nonce+""); - String uri = _helper.getRequestURI(); - buf.append("

\n"); - buf.append("\n"); - buf.append("

\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("").append(reseedErrorMessage).append("
"); - anotherLine = true; - } - } - if (anotherLine) - buf.append("
"); - + buf.append(_helper.getFirewallAndReseedStatus()); buf.append("

") + .append(_("Check network connection and NAT/firewall")) + .append("

"); + } + + boolean reseedInProgress = Boolean.valueOf(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress")).booleanValue(); + // If showing the reseed link is allowed + if (allowReseed()) { + if (reseedInProgress) { + // While reseed occurring, show status message instead + buf.append("").append(System.getProperty("net.i2p.router.web.ReseedHandler.statusMessage","")).append("
"); + } else { + // While no reseed occurring, show reseed link + long nonce = _context.random().nextLong(); + String prev = System.getProperty("net.i2p.router.web.ReseedHandler.nonce"); + if (prev != null) System.setProperty("net.i2p.router.web.ReseedHandler.noncePrev", prev); + System.setProperty("net.i2p.router.web.ReseedHandler.nonce", nonce+""); + String uri = getRequestURI(); + buf.append("

\n"); + buf.append("\n"); + buf.append("

\n"); + } + } + // 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("").append(reseedErrorMessage).append("
"); + } + } + if (buf.length() <= 0) + return ""; + buf.append("
"); + return buf.toString(); + } + /** output the summary bar to _out */ public void renderSummaryBar() throws IOException { SummaryBarRenderer renderer = new SummaryBarRenderer(_context, this); diff --git a/apps/routerconsole/jsp/xhr1.jsi b/apps/routerconsole/jsp/xhr1.jsi index 159d3f4d6..c9722c69b 100644 --- a/apps/routerconsole/jsp/xhr1.jsi +++ b/apps/routerconsole/jsp/xhr1.jsi @@ -20,4 +20,5 @@
+