diff --git a/apps/routerconsole/jsp/i2plogo.png b/apps/routerconsole/jsp/i2plogo.png index ee5c91da2..52d1fd6c7 100644 Binary files a/apps/routerconsole/jsp/i2plogo.png and b/apps/routerconsole/jsp/i2plogo.png differ diff --git a/apps/routerconsole/jsp/nav.jsp b/apps/routerconsole/jsp/nav.jsp index ad0021487..322df974e 100644 --- a/apps/routerconsole/jsp/nav.jsp +++ b/apps/routerconsole/jsp/nav.jsp @@ -1,33 +1 @@ <%@page import="java.io.File" %> - -
- <% if (new File("docs/toolbar.html").exists()) { %> - - - - -<% } else { %> - - Susimail | - SusiDNS | - - I2PSnark | - My Eepsite
- I2PTunnel | - Tunnels | - Profiles | - NetDB | - Logs | - Jobs | - Graphs | - Stats -<% } -// the following is unused and a candidate for removal -%> - - " /> - -
diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsp index 4b7aaa908..786e48353 100644 --- a/apps/routerconsole/jsp/summary.jsp +++ b/apps/routerconsole/jsp/summary.jsp @@ -1,5 +1,6 @@ <% // put width here too to prevent bad layout at startup %> -
+ +
<% // skip the iframe if refresh disabled String d = request.getParameter("refresh"); @@ -21,10 +22,10 @@ } else { // since we don't have an iframe this will reload the base page, and // the new delay will be passed to the iframe above - out.print("

\n"); + out.print("

\n"); out.print("Refresh (s): \n"); out.print("\n"); - out.print("

\n"); + out.print("

\n"); } %> diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp index 9532602fa..ae65c69e4 100644 --- a/apps/routerconsole/jsp/summaryframe.jsp +++ b/apps/routerconsole/jsp/summaryframe.jsp @@ -13,6 +13,7 @@ Summary Bar <% + out.print("
\n"); // try hard to avoid an error page in the iframe after shutdown String action = request.getParameter("action"); String d = request.getParameter("refresh"); @@ -49,6 +50,7 @@ shutdownSoon = true; } } + out.print("
\n"); %> <%@include file="css.jsp" %> diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp index f3f8b8002..3f0238614 100644 --- a/apps/routerconsole/jsp/summarynoframe.jsp +++ b/apps/routerconsole/jsp/summarynoframe.jsp @@ -10,16 +10,35 @@ " /> - -
Configuration  Help
+ Router Console
+ + I2P Internals
+ I2PTunnel + Tunnels + Profiles + NetDB + Logs + Jobs + Graphs + Stats + Configuration + Help
+ I2P Services
+ Susimail + SusiDNS + I2PSnark + Eepsite +
- +
General
Ident: (, never reveal it to anyone" href="netdb.jsp?r=." target="_top">view)
Version:
Uptime:
Now:
- Reachability: <% + Reachability:
+ <% if (helper.updateAvailable()) { // display all the time so we display the final failure message out.print("
" + update.getStatus()); @@ -30,17 +49,16 @@ if (prev != null) System.setProperty("net.i2p.router.web.UpdateHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.UpdateHandler.nonce", nonce+""); String uri = request.getRequestURI(); - out.print("

\n"); + out.print("

\n"); out.print("\n"); - out.print("

\n"); + out.print("

\n"); } } %> -

+

<%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%> -

+

- Peers
Active: /
Fast:
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index a798e0c18..0f3f08985 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -447,7 +447,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { buf.append(c); buf.append("\" src=\"/flags.jsp?c=").append(c).append("\"> "); } - buf.append(""); + buf.append(""); boolean found = _context.netDb().lookupRouterInfoLocally(peer) != null; if (found) buf.append("");