Start on the console update.

apps/routerconsole/jsp/nav.jsp

 <%@page import="java.io.File" %>
-<div class="logo">
- <a href="index.jsp"><img src="i2plogo.png" alt="Router Console" width="187" height="35" /></a><br />
-</div>
-<div class="toolbar">
- <% if (new File("docs/toolbar.html").exists()) { %>
-   <jsp:useBean class="net.i2p.router.web.ContentHelper" id="toolbarhelper" scope="request" />
-   <jsp:setProperty name="toolbarhelper" property="page" value="docs/toolbar.html" />
-   <jsp:setProperty name="toolbarhelper" property="maxLines" value="300" />
-   <jsp:getProperty name="toolbarhelper" property="content" />
-<% } else { %>
- <!-- Could not find docs/toolbar.html! -->
- <a href="susimail/susimail">Susimail</a> |
- <a href="susidns/index.jsp">SusiDNS</a> |
- <!-- <a href="syndie/">Syndie</a> | -->
- <a href="i2psnark/">I2PSnark</a> |
- <a href="http://127.0.0.1:7658/">My Eepsite</a> <br>
- <a href="i2ptunnel/index.jsp">I2PTunnel</a> |
- <a href="tunnels.jsp">Tunnels</a> |
- <a href="profiles.jsp">Profiles</a> |
- <a href="netdb.jsp">NetDB</a> |
- <a href="logs.jsp">Logs</a> |
- <a href="jobs.jsp">Jobs</a> |
- <a href="graphs.jsp">Graphs</a> |
- <a href="oldstats.jsp">Stats</a> <!-- |
- <a href="oldconsole.jsp">Internals</a> -->
-<% }
-// the following is unused and a candidate for removal
-%>
- <jsp:useBean class="net.i2p.router.web.NavHelper" id="navhelper" scope="request" />
- <jsp:setProperty name="navhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <jsp:getProperty name="navhelper" property="clientAppLinks" />
-</div>

apps/routerconsole/jsp/summary.jsp

 <% // put width here too to prevent bad layout at startup %>
-<div class="routersummaryouter" style="width: 215px;">
+
+<div class="routersummaryouter" style="width: 200px;">
 <%
     // 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("<hr /><p><form action=\"" + request.getRequestURI() + "\" method=\"GET\">\n");
+        out.print("<hr /><p><center><form action=\"" + request.getRequestURI() + "\" method=\"GET\">\n");
         out.print("<b>Refresh (s):</b> <input size=\"3\" type=\"text\" name=\"refresh\" value=\"60\" />\n");
         out.print("<button type=\"submit\">Enable</button>\n");
-        out.print("</form></p></div>\n");
+        out.print("</form></center></p></div>\n");
     }
 %>
 </div>

apps/routerconsole/jsp/summaryframe.jsp

@@ -13,6 +13,7 @@
 <title>Summary Bar</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <%
+    out.print("<center>\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("</center>\n");
 %>
 <%@include file="css.jsp" %>
 </head>

apps/routerconsole/jsp/summarynoframe.jsp

@@ -10,16 +10,35 @@
 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="uhelper" scope="request" />
 <jsp:setProperty name="uhelper" property="*" />
 <jsp:setProperty name="uhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
- <center><b><a href="config.jsp" target="_top">Configuration</a>&nbsp;&nbsp;<a href="help.jsp" target="_top">Help</a></b></center>
+ <centre><a href="index.jsp" target="_top"><img src="i2plogo.png" alt="Router Console" title="I2P Router Console"/></a></centre><hr />
+ <centre>
+ <u><b>I2P Internals</b></u><br />
+ <a href="i2ptunnel/index.jsp" target="_blank">I2PTunnel</a> 
+ <a href="tunnels.jsp" target="_top">Tunnels</a> 
+ <a href="profiles.jsp" target="_top">Profiles</a> 
+ <a href="netdb.jsp" target="_top">NetDB</a> 
+ <a href="logs.jsp" target="_top">Logs</a> 
+ <a href="jobs.jsp" target="_top">Jobs</a> 
+ <a href="graphs.jsp" target="_top">Graphs</a> 
+ <a href="oldstats.jsp" target="_top">Stats</a> <!-- 
+ <a href="oldconsole.jsp" target="_top">Internals</a> -->
+ <a href="config.jsp" target="_top">Configuration</a> 
+ <a href="help.jsp" target="_top">Help</a></b><hr />
+ <u><b>I2P Services</b></u><br />
+ <a href="susimail/susimail" target="blank">Susimail</a> 
+ <a href="susidns/index.jsp" target="_blaank">SusiDNS</a> 
+ <a href="i2psnark/" target="_blank">I2PSnark</a> 
+ <a href="http://127.0.0.1:7658/" target="_blank">Eepsite</a> 
+ </center>
  <hr />
-
+ <center>
  <u><b>General</b></u><br />
  <b>Ident:</b> (<a title="Your router identity is <jsp:getProperty name="helper" property="ident" />, never reveal it to anyone" href="netdb.jsp?r=." target="_top">view</a>)<br />
  <b>Version:</b> <jsp:getProperty name="helper" property="version" /><br />
  <b>Uptime:</b> <jsp:getProperty name="helper" property="uptime" /><br />
  <b>Now:</b> <jsp:getProperty name="helper" property="time" /><br />
- <b>Reachability:</b> <a href="config.jsp#help" target="_top"><jsp:getProperty name="helper" property="reachability" /></a><%
+ <b>Reachability:</b> <a href="config.jsp#help" target="_top"><jsp:getProperty name="helper" property="reachability" /></a></center>
+ <%
     if (helper.updateAvailable()) {
         // display all the time so we display the final failure message
         out.print("<br />" + 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("<p><form action=\"" + uri + "\" method=\"GET\">\n");
+            out.print("<p><center><form action=\"" + uri + "\" method=\"GET\">\n");
             out.print("<input type=\"hidden\" name=\"updateNonce\" value=\"" + nonce + "\" />\n");
-            out.print("<input type=\"submit\" value=\"Download " + uhelper.getUpdateVersion() + " Update\" /></form></p>\n");
+            out.print("<input type=\"submit\" value=\"Download " + uhelper.getUpdateVersion() + " Update\" /></form></center></p>\n");
         }
     }
  %>
- <p>
+ <p><center>
  <%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%>
- </p>
+ </center></p>
  <hr />
- 
  <u><b><a href="peers.jsp" target="_top">Peers</a></b></u><br />
  <b>Active:</b> <jsp:getProperty name="helper" property="activePeers" />/<jsp:getProperty name="helper" property="activeProfiles" /><br />
  <b>Fast:</b> <jsp:getProperty name="helper" property="fastPeers" /><br />

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("<tt><font size=\"+1\">");
+        buf.append("<tt>");
         boolean found = _context.netDb().lookupRouterInfoLocally(peer) != null;
         if (found)
             buf.append("<a title=\"NetDb entry\" href=\"netdb.jsp?r=").append(h).append("\">");