From 138be42aa509198defab2712103cda66649662de Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 17 Nov 2010 22:26:31 +0000 Subject: [PATCH] bye .jsp part 2 --- .../net/i2p/router/web/ConfigNavHelper.java | 2 +- .../net/i2p/router/web/ConfigPeerHandler.java | 2 +- .../net/i2p/router/web/ConfigUIHandler.java | 2 +- .../src/net/i2p/router/web/GraphHelper.java | 4 +- .../i2p/router/web/LocaleWebAppHandler.java | 19 +++++++++- .../src/net/i2p/router/web/NetDbRenderer.java | 12 +++--- .../router/web/ProfileOrganizerRenderer.java | 4 +- .../net/i2p/router/web/ShitlistRenderer.java | 2 +- .../net/i2p/router/web/StatsGenerator.java | 4 +- .../i2p/router/web/SummaryBarRenderer.java | 38 +++++++++---------- .../src/net/i2p/router/web/SummaryHelper.java | 2 +- .../net/i2p/router/web/TunnelRenderer.java | 4 +- apps/routerconsole/jsp/index.html | 2 - installer/resources/clients.config | 2 +- 14 files changed, 56 insertions(+), 43 deletions(-) delete mode 100644 apps/routerconsole/jsp/index.html diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java index 40371a833..44204f66d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java @@ -22,7 +22,7 @@ public class ConfigNavHelper extends HelperBase { public void renderNavBar(String requestURI) throws IOException { StringBuilder buf = new StringBuilder(1024); for (int i = 0; i < pages.length; i++) { - String page = "config" + pages[i] + ".jsp"; + String page = "config" + pages[i]; if (requestURI.indexOf(page) != -1) { // we are there buf.append(_(titles[i])); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHandler.java index 693febddc..a0a3df8c9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHandler.java @@ -20,7 +20,7 @@ public class ConfigPeerHandler extends FormHandler { } else if (_action.equals(_("Ban peer until restart"))) { Hash h = getHash(); if (h != null) { - _context.shitlist().shitlistRouterForever(h, _("Manually banned via {0}"), "configpeer.jsp"); + _context.shitlist().shitlistRouterForever(h, _("Manually banned via {0}"), "configpeer"); addFormNotice(_("Peer") + " " + _peer + " " + _("banned until restart") ); return; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java index 8f359e25c..8c0925e4b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java @@ -29,7 +29,7 @@ public class ConfigUIHandler extends FormHandler { if (_context.router().saveConfig()) { if (!oldTheme.equals(_config)) addFormNotice(_("Theme change saved.") + - " " + + " " + _("Refresh the page to view.") + ""); } else { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java index 8fc78e790..4f3dc4fcc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -127,8 +127,8 @@ public class GraphHelper extends HelperBase { public String getForm() { saveSettings(); try { - _out.write("

" + _("Configure Graph Display") + " [" + _("Select Stats") + "]

"); - _out.write("
"); + _out.write("

" + _("Configure Graph Display") + " [" + _("Select Stats") + "]

"); + _out.write(""); _out.write(_("Periods") + ":
\n"); _out.write(_("Plot averages") + ": "); _out.write(_("or")+ " " +_("plot events") + ":
\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java index a075fb62f..91ede9e52 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java @@ -13,7 +13,9 @@ import org.mortbay.jetty.servlet.WebApplicationHandler; /** * Convert foo.jsp to foo_xx.jsp for language xx. * This is appropriate for jsps with large amounts of text. - * This does not work for included jsps (e.g. summary*) + * + * Also, as of 0.8.2, rewrite "/" and "/index.html" to "/index.jsp",x + * and "/foo" to "/foo.jsp". * * @author zzz */ @@ -46,9 +48,22 @@ public class LocaleWebAppHandler extends WebApplicationHandler return; } + // transparent rewriting + if (pathInContext.equals("/") || pathInContext.equals("/index.html")) { + // home page + pathInContext = "/index.jsp"; + } else if (pathInContext.indexOf("/", 1) < 0 && + !pathInContext.endsWith(".jsp")) { + // add .jsp to pages at top level + pathInContext += ".jsp"; + } + //System.err.println("Path: " + pathInContext); String newPath = pathInContext; - if (pathInContext.endsWith(".jsp")) { + //if (pathInContext.endsWith(".jsp")) { + // We only ended up doing this for help.jsp, so save some effort + // unless we translate more pages like this + if (pathInContext.equals("/help.jsp")) { int len = pathInContext.length(); // ...but leave foo_xx.jsp alone if (len < 8 || pathInContext.charAt(len - 7) != '_') { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java index d2b0a17e9..131cacb92 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -105,7 +105,7 @@ public class NetDbRenderer { public void renderLeaseSetHTML(Writer out, boolean debug) throws IOException { StringBuilder buf = new StringBuilder(4*1024); buf.append("

" + _("Network Database Contents") + "

\n"); - buf.append("" + _("View RouterInfo") + ""); + buf.append("" + _("View RouterInfo") + ""); buf.append("

").append(_("LeaseSets")).append("

\n"); Hash ourRKey; Set leases; @@ -130,7 +130,7 @@ public class NetDbRenderer { Hash key = dest.calculateHash(); buf.append("").append(_("LeaseSet")).append(": ").append(key.toBase64()); if (_context.clientManager().isLocal(dest)) { - buf.append(" (" + _("Local") + " "); + buf.append(" (" + _("Local") + " "); if (! _context.clientManager().shouldPublishLeaseSet(key)) buf.append(_("Unpublished") + ' '); buf.append(_("Destination") + ' '); @@ -212,7 +212,7 @@ public class NetDbRenderer { * @param mode 0: our info and charts only; 1: full routerinfos and charts; 2: abbreviated routerinfos and charts */ public void renderStatusHTML(Writer out, int mode) throws IOException { - out.write("

" + _("Network Database Contents") + " (" + _("View LeaseSets") + ")

\n"); + out.write("

" + _("Network Database Contents") + " (" + _("View LeaseSets") + ")

\n"); if (!_context.netDb().isInitialized()) { out.write(_("Not initialized")); out.flush(); @@ -223,7 +223,7 @@ public class NetDbRenderer { boolean shortStats = mode == 2; boolean showStats = full || shortStats; Hash us = _context.routerHash(); - out.write("

" + _("Routers") + " (

" + _("Routers") + " (" + _("Show all routers")); else @@ -343,9 +343,9 @@ public class NetDbRenderer { } else { buf.append("" + _("Peer info for") + ": ").append(hash).append("\n"); if (full) { - buf.append("[Back]\n"); + buf.append("[Back]\n"); } else { - buf.append("[").append(_("Full entry")).append("]\n"); + buf.append("[").append(_("Full entry")).append("]\n"); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java index 726557873..f452df2ba 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -74,7 +74,7 @@ class ProfileOrganizerRenderer { if (older > 0) buf.append(_("Hiding {0} older profiles.", older)).append('\n'); if (standard > 0) - buf.append("").append(_("Hiding {0} standard profiles.", standard)).append("\n"); + buf.append("").append(_("Hiding {0} standard profiles.", standard)).append("\n"); buf.append("

"); buf.append(""); buf.append(""); @@ -173,7 +173,7 @@ class ProfileOrganizerRenderer { buf.append(" "); buf.append("\n"); + buf.append(" +-\n"); buf.append(""); // let's not build the whole page in memory (~500 bytes per peer) out.write(buf.toString()); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ShitlistRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/ShitlistRenderer.java index f0b9c910b..12c667872 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ShitlistRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ShitlistRenderer.java @@ -67,7 +67,7 @@ public class ShitlistRenderer { else buf.append(_(entry.cause)); } - buf.append(" (").append(_("unban now")).append(")"); buf.append("\n"); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java index b229e8483..b1e1de976 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatsGenerator.java @@ -30,7 +30,7 @@ public class StatsGenerator { public void generateStatsPage(Writer out, boolean showAll) throws IOException { StringBuilder buf = new StringBuilder(16*1024); - buf.append("
"); + buf.append("
"); buf.append("
").append(_("profile")).append(""); - buf.append(" +-
\n" + - "

") .append(_("I2P Internals")) @@ -95,31 +95,31 @@ public class SummaryBarRenderer { "\n" + @@ -194,7 +194,7 @@ public class SummaryBarRenderer { .append(_helper.getUptime()) .append("
\n" + - "") .append(_("Tunnels")) .append("\n" + - "") .append(_("Peers")) .append("\n" + - "") .append(_("Profiles")) .append("\n" + - "") .append(_("NetDB")) .append("\n" + - "") .append(_("Logs")) @@ -131,13 +131,13 @@ public class SummaryBarRenderer { // .append(_("Jobs")) // .append("\n" + - "") .append(_("Graphs")) .append("\n" + - "") .append(_("Stats")) @@ -156,7 +156,7 @@ public class SummaryBarRenderer { - buf.append("

") .append(_("General")) @@ -173,7 +173,7 @@ public class SummaryBarRenderer { .append(_helper.getIdent()) .append(", ") .append(_("never reveal it to anyone")) - .append("\" href=\"/netdb.jsp?r=.\" target=\"_top\">") + .append("\" href=\"/netdb?r=.\" target=\"_top\">") .append(_("show")) .append("

\n" + - "

") .append(_("Network")) @@ -250,7 +250,7 @@ public class SummaryBarRenderer { buf.append("

") .append(ConfigRestartBean.renderStatus(_helper.getRequestURI(), _helper.getAction(), _helper.getConsoleNonce())) - .append("

") .append(_("Peers")) @@ -299,7 +299,7 @@ public class SummaryBarRenderer { boolean anotherLine = false; if (_helper.showFirewallWarning()) { - buf.append("

") .append(_("Check NAT/firewall")) @@ -338,7 +338,7 @@ public class SummaryBarRenderer { buf.append("
"); - buf.append("

") .append(_("Bandwidth in/out")) @@ -375,7 +375,7 @@ public class SummaryBarRenderer { .append(_helper.getOutboundTransferred()) .append("\n" + - "

") .append(_("Tunnels")) @@ -406,7 +406,7 @@ public class SummaryBarRenderer { .append(_helper.getShareRatio()) .append("\n" + - "

") .append(_("Congestion")) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index 5f2cb891b..fe41f7f27 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -377,7 +377,7 @@ public class SummaryHelper extends HelperBase { buf.append("server.png\" alt=\"Server\" title=\"" + _("Server") + "\">"); else buf.append("client.png\" alt=\"Client\" title=\"" + _("Client") + "\">"); - buf.append(""); if (name.length() < 16) buf.append(name); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java index 3d52c653f..bed2647d2 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java @@ -38,7 +38,7 @@ public class TunnelRenderer { } public void renderStatusHTML(Writer out) throws IOException { - out.write("

" + _("Exploratory tunnels") + " (" + _("configure") + ")

\n"); + out.write("

" + _("Exploratory tunnels") + " (" + _("configure") + ")

\n"); renderPool(out, _context.tunnelManager().getInboundExploratoryPool(), _context.tunnelManager().getOutboundExploratoryPool()); List destinations = null; @@ -60,7 +60,7 @@ public class TunnelRenderer { out.write("

" + _("Client tunnels for") + ' ' + _(name)); if (_context.clientManager().isLocal(client)) - out.write(" (" + _("configure") + ")

\n"); + out.write(" (" + _("configure") + ")

\n"); else out.write(" (" + _("dead") + ")

\n"); renderPool(out, in, outPool); diff --git a/apps/routerconsole/jsp/index.html b/apps/routerconsole/jsp/index.html deleted file mode 100644 index ea1321105..000000000 --- a/apps/routerconsole/jsp/index.html +++ /dev/null @@ -1,2 +0,0 @@ -I2P Router Console -Enter diff --git a/installer/resources/clients.config b/installer/resources/clients.config index db6fa628e..f82aec526 100644 --- a/installer/resources/clients.config +++ b/installer/resources/clients.config @@ -34,7 +34,7 @@ clientApp.3.startOnLoad=true # load a browser pointing at the web console whenever we start up clientApp.4.main=net.i2p.apps.systray.UrlLauncher clientApp.4.name=Open Router Console in web browser at startup -clientApp.4.args=http://127.0.0.1:7657/index.jsp +clientApp.4.args=http://127.0.0.1:7657/ clientApp.4.delay=3 clientApp.4.startOnLoad=true