From 882e08fc4fc1d43214cb6631babfc013a10ee7e3 Mon Sep 17 00:00:00 2001 From: z3d Date: Sat, 4 Jul 2009 01:56:53 +0000 Subject: [PATCH 01/33] Start on the console update. --- apps/routerconsole/jsp/i2plogo.png | Bin 925 -> 6507 bytes apps/routerconsole/jsp/nav.jsp | 32 ---------------- apps/routerconsole/jsp/summary.jsp | 7 ++-- apps/routerconsole/jsp/summaryframe.jsp | 2 + apps/routerconsole/jsp/summarynoframe.jsp | 36 +++++++++++++----- .../transport/CommSystemFacadeImpl.java | 2 +- 6 files changed, 34 insertions(+), 45 deletions(-) diff --git a/apps/routerconsole/jsp/i2plogo.png b/apps/routerconsole/jsp/i2plogo.png index ee5c91da2a3fbb7b5bd589f18dada5146510eac3..52d1fd6c7d7e7f5ccd9c1cac26f5502a4549d007 100644 GIT binary patch literal 6507 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 RS2X|t002ovPDHLkV1kNC;u!z{ literal 925 zcmV;O17iG%P)w(EZ*psMAWc}i zkt!qr00QkvL_t(|oYj^wZz3@eM!AB}WI9D z>ROs;M>|WjTavO1JdU<=iKe0g&v6_)fH!1tsJkO7`a@v!L~D1YXVmE_S-Viyx@&7O z$&!q@Prd-44lvB34(E$4Txs2QT9ei@d~X4&+ktHDvH*(X3MgadS&Zbe zhq;t|;n&=5K<++Be&}I8Q}PHq0Cj?DZ1fFq4s^OkC3dK_F%`!#DzP%RS&U?Ve5&># zA#>TETB29%k{W3@7Cm0FY$!s8Z zGgPES2^?)^5>W|`D?^0B6sQD8c5*fMFY!{m6vI*vGBoMM$* z=SO*{b5D-eS!+SP;V5p{Aj5)XKxA`3tui-cd`I{e$>kuf*;@zApvldoCm&hIpZQ+Px(N7y>Yv8hl39}9DrS{G|^K`EIPXU#U! z>s07OgKdz3p|2U|p1fW9UdH-KhJ^9By|Q=X>2d$>pI- z#G4{Rp%T*Te4SY{6|Cb3496|5G)ow)+a}i4u@*U*CeB+&FXEMQq2Ea?s$d>o?{Fl~UCO%~3j;k^C)^+%m^}X(3o$qybq4o9FjStq$dGPuzC-nvnoC;!o!$6?KpJWPJNK`xGb7VD - -
- <% 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(""); From ab8e2cf34dba8b436294b9f27bfdd23966191750 Mon Sep 17 00:00:00 2001 From: z3d Date: Sat, 4 Jul 2009 02:39:37 +0000 Subject: [PATCH 02/33] Router console updates. Opening shots. --- apps/routerconsole/jsp/nav.jsp | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/apps/routerconsole/jsp/nav.jsp b/apps/routerconsole/jsp/nav.jsp index 322df974e..35b5667b0 100644 --- a/apps/routerconsole/jsp/nav.jsp +++ b/apps/routerconsole/jsp/nav.jsp @@ -1 +1,34 @@ <%@page import="java.io.File" %> + +
+ <% File path = new File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/toolbar.html"); + if (path.exists()) { %> + + + + +<% } else { %> + + Susimail | + SusiDNS | + + I2PSnark | + My Eepsite
+ I2PTunnel | + Tunnels | + Profiles | + NetDB | + Logs | + Jobs | + Graphs | + Stats +<% } +// the following is unused and a candidate for removal +%> + + " /> + +
From 1c2cd4dcb2a434f1c361c64f08d292e973ac2105 Mon Sep 17 00:00:00 2001 From: z3d Date: Mon, 6 Jul 2009 13:29:35 +0000 Subject: [PATCH 03/33] Overhaul console layout. Add

header to most pages. Etc. --- apps/i2ptunnel/jsp/index.jsp | 5 +++-- apps/routerconsole/jsp/config.jsp | 2 +- apps/routerconsole/jsp/configadvanced.jsp | 2 ++ apps/routerconsole/jsp/configclients.jsp | 2 +- apps/routerconsole/jsp/configkeyring.jsp | 2 +- apps/routerconsole/jsp/configlogging.jsp | 2 +- apps/routerconsole/jsp/configpeer.jsp | 2 +- apps/routerconsole/jsp/configservice.jsp | 2 +- apps/routerconsole/jsp/configstats.jsp | 2 +- apps/routerconsole/jsp/configtunnels.jsp | 2 +- apps/routerconsole/jsp/configupdate.jsp | 2 +- apps/routerconsole/jsp/graphs.jsp | 2 +- apps/routerconsole/jsp/help.jsp | 14 ++++++++------ apps/routerconsole/jsp/index.jsp | 1 + apps/routerconsole/jsp/jobs.jsp | 2 +- apps/routerconsole/jsp/logs.jsp | 2 +- apps/routerconsole/jsp/netdb.jsp | 2 +- apps/routerconsole/jsp/oldconsole.jsp | 2 +- apps/routerconsole/jsp/oldstats.jsp | 2 +- apps/routerconsole/jsp/peers.jsp | 2 +- apps/routerconsole/jsp/profiles.jsp | 2 +- apps/routerconsole/jsp/summarynoframe.jsp | 4 ++-- apps/routerconsole/jsp/tunnels.jsp | 2 +- .../src/net/i2p/router/admin/StatsGenerator.java | 1 - 24 files changed, 34 insertions(+), 29 deletions(-) diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index 6c89d5ff4..3454b7eec 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -6,7 +6,8 @@ I2PTunnel Webmanager - List - + <% if (indexBean.allowCSS()) { @@ -17,7 +18,7 @@ %> -