cleanup

apps/routerconsole/jsp/summarynoframe.jsp

 <%@page import="net.i2p.router.web.SummaryHelper" %>
+<%
+/*
+ * Note:
+ * This is included almost 30 times, so keep whitespace etc. to a minimum.
+ */
+%>
 <jsp:useBean class="net.i2p.router.web.SummaryHelper" id="helper" scope="request" />
 <jsp:setProperty name="helper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
 <jsp:useBean class="net.i2p.router.web.ReseedHandler" id="reseed" scope="request" />
 <jsp:setProperty name="reseed" property="*" />
 <jsp:useBean class="net.i2p.router.web.UpdateHandler" id="update" scope="request" />
@@ -10,43 +15,42 @@
 <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")%>" />
- <centre><a href="index.jsp" target="_top"><img src="/themes/console/images/i2plogo.png" alt="I2P Router Console" title="I2P Router Console"/></a></centre><hr />
- <centre>
- <% java.io.File lpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/toolbar.html");
+<center><a href="index.jsp" target="_top"><img src="/themes/console/images/i2plogo.png" alt="I2P Router Console" title="I2P Router Console"/></a></center><hr />
+<center>
+<% java.io.File lpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/toolbar.html");
     // you better have target="_top" for the links in there...
     if (lpath.exists()) { %>
-   <jsp:useBean class="net.i2p.router.web.ContentHelper" id="linkhelper" scope="request" />
-   <jsp:setProperty name="linkhelper" property="page" value="<%=lpath.getAbsolutePath()%>" />
-   <jsp:setProperty name="linkhelper" property="maxLines" value="100" />
-   <jsp:getProperty name="linkhelper" property="content" />
+<jsp:useBean class="net.i2p.router.web.ContentHelper" id="linkhelper" scope="request" />
+<jsp:setProperty name="linkhelper" property="page" value="<%=lpath.getAbsolutePath()%>" />
+<jsp:setProperty name="linkhelper" property="maxLines" value="100" />
+<jsp:getProperty name="linkhelper" property="content" />
 <% } else { %>
- <u><b>I2P Services</b></u><br />
- <a href="susimail/susimail" target="blank">Susimail</a> 
- <a href="susidns/index.jsp" target="_blank">SusiDNS</a> 
- <a href="i2psnark/" target="_blank">I2PSnark</a> 
- <a href="http://127.0.0.1:7658/" target="_blank">Eepsite</a><hr /> 
- <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>
+<u><b>I2P Services</b></u><br />
+<a href="susimail/susimail" target="blank">Susimail</a> 
+<a href="susidns/index.jsp" target="_blank">SusiDNS</a> 
+<a href="i2psnark/" target="_blank">I2PSnark</a> 
+<a href="http://127.0.0.1:7658/" target="_blank">Eepsite</a><hr /> 
+<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="config.jsp" target="_top">Configuration</a> 
+<a href="help.jsp" target="_top">Help</a></b>
 <% } %>
- </center>
- <hr />
- <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>
- <%
+</center>
+<hr />
+<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>
+<%
     if (helper.updateAvailable()) {
         // display all the time so we display the final failure message
         out.print("<br />" + update.getStatus());
@@ -62,17 +66,17 @@
             out.print("<input type=\"submit\" value=\"Download " + uhelper.getUpdateVersion() + " Update\" /></form></center></p>\n");
         }
     }
- %>
- <p><center>
- <%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%>
- </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 />
- <b>High capacity:</b> <jsp:getProperty name="helper" property="highCapacityPeers" /><br />
- <b>Well integrated:</b> <jsp:getProperty name="helper" property="wellIntegratedPeers" /><br />
- <b>Known:</b> <jsp:getProperty name="helper" property="allPeers" /><br /><%
+%>
+<p><center>
+<%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%>
+</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 />
+<b>High capacity:</b> <jsp:getProperty name="helper" property="highCapacityPeers" /><br />
+<b>Well integrated:</b> <jsp:getProperty name="helper" property="wellIntegratedPeers" /><br />
+<b>Known:</b> <jsp:getProperty name="helper" property="allPeers" /><br /><%
     if (helper.getActivePeers() <= 0) {
         %><b><a href="config.jsp" target="_top">check your NAT/firewall</a></b><br /><%
     }
@@ -101,26 +105,22 @@
         }
     }
  %><hr />
- 
- <u><b><a href="config.jsp" title="Configure the bandwidth limits" target="_top">Bandwidth in/out</a></b></u><br />
- <b>1s:</b> <jsp:getProperty name="helper" property="inboundSecondKBps" />/<jsp:getProperty name="helper" property="outboundSecondKBps" />KBps<br />
- <b>5m:</b> <jsp:getProperty name="helper" property="inboundFiveMinuteKBps" />/<jsp:getProperty name="helper" property="outboundFiveMinuteKBps" />KBps<br />
- <b>Total:</b> <jsp:getProperty name="helper" property="inboundLifetimeKBps" />/<jsp:getProperty name="helper" property="outboundLifetimeKBps" />KBps<br />
- <b>Used:</b> <jsp:getProperty name="helper" property="inboundTransferred" />/<jsp:getProperty name="helper" property="outboundTransferred" /><br />
- <hr />
- 
- <u><b>Tunnels in/out</b></u><br />
- <b>Exploratory:</b> <jsp:getProperty name="helper" property="inboundTunnels" />/<jsp:getProperty name="helper" property="outboundTunnels" /><br />
- <b>Client:</b> <jsp:getProperty name="helper" property="inboundClientTunnels" />/<jsp:getProperty name="helper" property="outboundClientTunnels" /><br />
- <b>Participating:</b> <jsp:getProperty name="helper" property="participatingTunnels" /><br />
- <hr />
- 
- <u><b>Congestion</b></u><br />
- <b>Job lag:</b> <jsp:getProperty name="helper" property="jobLag" /><br />
- <b>Message delay:</b> <jsp:getProperty name="helper" property="messageDelay" /><br />
- <b>Tunnel lag:</b> <jsp:getProperty name="helper" property="tunnelLag" /><br />
- <b>Handle backlog:</b> <jsp:getProperty name="helper" property="inboundBacklog" /><br />
- <b><jsp:getProperty name="helper" property="tunnelStatus" /></b><br />
- <hr />
-  
- <jsp:getProperty name="helper" property="destinations" />
+<u><b><a href="config.jsp" title="Configure the bandwidth limits" target="_top">Bandwidth in/out</a></b></u><br />
+<b>1s:</b> <jsp:getProperty name="helper" property="inboundSecondKBps" />/<jsp:getProperty name="helper" property="outboundSecondKBps" />KBps<br />
+<b>5m:</b> <jsp:getProperty name="helper" property="inboundFiveMinuteKBps" />/<jsp:getProperty name="helper" property="outboundFiveMinuteKBps" />KBps<br />
+<b>Total:</b> <jsp:getProperty name="helper" property="inboundLifetimeKBps" />/<jsp:getProperty name="helper" property="outboundLifetimeKBps" />KBps<br />
+<b>Used:</b> <jsp:getProperty name="helper" property="inboundTransferred" />/<jsp:getProperty name="helper" property="outboundTransferred" /><br />
+<hr />
+<u><b>Tunnels in/out</b></u><br />
+<b>Exploratory:</b> <jsp:getProperty name="helper" property="inboundTunnels" />/<jsp:getProperty name="helper" property="outboundTunnels" /><br />
+<b>Client:</b> <jsp:getProperty name="helper" property="inboundClientTunnels" />/<jsp:getProperty name="helper" property="outboundClientTunnels" /><br />
+<b>Participating:</b> <jsp:getProperty name="helper" property="participatingTunnels" /><br />
+<hr />
+<u><b>Congestion</b></u><br />
+<b>Job lag:</b> <jsp:getProperty name="helper" property="jobLag" /><br />
+<b>Message delay:</b> <jsp:getProperty name="helper" property="messageDelay" /><br />
+<b>Tunnel lag:</b> <jsp:getProperty name="helper" property="tunnelLag" /><br />
+<b>Handle backlog:</b> <jsp:getProperty name="helper" property="inboundBacklog" /><br />
+<b><jsp:getProperty name="helper" property="tunnelStatus" /></b><br />
+<hr />
+<jsp:getProperty name="helper" property="destinations" />