From dd39f3f2447e6beeb0dcd41d93c1ad5ff9adb049 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 19 Nov 2010 16:14:14 +0000 Subject: [PATCH] i2ptunnel jsp cleanup --- apps/i2ptunnel/jsp/editClient.jsp | 2 +- apps/i2ptunnel/jsp/editServer.jsp | 2 +- apps/i2ptunnel/jsp/index.html | 2 -- apps/i2ptunnel/jsp/index.jsp | 26 +++++++++---------- apps/i2ptunnel/jsp/web.xml | 13 ++++++++++ .../i2p/router/web/SummaryBarRenderer.java | 2 +- .../src/net/i2p/router/web/SummaryHelper.java | 2 +- apps/routerconsole/jsp/configkeyring.jsp | 2 +- 8 files changed, 31 insertions(+), 20 deletions(-) delete mode 100644 apps/i2ptunnel/jsp/index.html diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp index be48bb2b9..2b69440ac 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -29,7 +29,7 @@ -
+
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index 97a0a93c9..773d323a2 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -29,7 +29,7 @@ - +
diff --git a/apps/i2ptunnel/jsp/index.html b/apps/i2ptunnel/jsp/index.html deleted file mode 100644 index ea1321105..000000000 --- a/apps/i2ptunnel/jsp/index.html +++ /dev/null @@ -1,2 +0,0 @@ -I2P Router Console -Enter diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index 8b7f8051e..cf0d0067c 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -44,7 +44,7 @@
- <%=intl._("Refresh")%> + <%=intl._("Refresh")%>
@@ -53,7 +53,7 @@
- <%=intl._("Stop All")%> <%=intl._("Start All")%> <%=intl._("Restart All")%> <%=intl._("Reload Config")%> + <%=intl._("Stop All")%> <%=intl._("Start All")%> <%=intl._("Restart All")%> <%=intl._("Reload Config")%>
@@ -89,7 +89,7 @@ %>
- <%=indexBean.getTunnelName(curServer)%> + <%=indexBean.getTunnelName(curServer)%>
@@ -125,17 +125,17 @@ switch (indexBean.getTunnelStatus(curServer)) { case IndexBean.STARTING: %>
<%=intl._("Starting...")%>
- <%=intl._("Stop")%> + <%=intl._("Stop")%> <% break; case IndexBean.RUNNING: %>
<%=intl._("Running")%>
- <%=intl._("Stop")%> + <%=intl._("Stop")%> <% break; case IndexBean.NOT_RUNNING: %>
<%=intl._("Stopped")%>
- <%=intl._("Start")%> + <%=intl._("Start")%> <% break; } @@ -157,7 +157,7 @@
- +
@@ -209,7 +209,7 @@ %>
- <%=indexBean.getTunnelName(curClient)%> + <%=indexBean.getTunnelName(curClient)%>
@@ -229,22 +229,22 @@ switch (indexBean.getTunnelStatus(curClient)) { case IndexBean.STARTING: %>
<%=intl._("Starting...")%>
- <%=intl._("Stop")%> + <%=intl._("Stop")%> <% break; case IndexBean.STANDBY: %>
<%=intl._("Standby")%>
- <%=intl._("Stop")%> + <%=intl._("Stop")%> <% break; case IndexBean.RUNNING: %>
<%=intl._("Running")%>
- <%=intl._("Stop")%> + <%=intl._("Stop")%> <% break; case IndexBean.NOT_RUNNING: %>
<%=intl._("Stopped")%>
- <%=intl._("Start")%> + <%=intl._("Start")%> <% break; } @@ -285,7 +285,7 @@
- +
diff --git a/apps/i2ptunnel/jsp/web.xml b/apps/i2ptunnel/jsp/web.xml index a814e9a87..d333d2936 100644 --- a/apps/i2ptunnel/jsp/web.xml +++ b/apps/i2ptunnel/jsp/web.xml @@ -5,6 +5,19 @@ + + + + net.i2p.i2ptunnel.jsp.index_jsp + + / + + + + net.i2p.i2ptunnel.jsp.edit_jsp + /edit + + 30 diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index ffd211810..5fc2000c5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -143,7 +143,7 @@ public class SummaryBarRenderer { .append(_("Stats")) .append("\n" + - "") .append(_("I2PTunnel")) 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 fe41f7f27..c6b9a593a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -362,7 +362,7 @@ public class SummaryHelper extends HelperBase { List clients = new ArrayList(_context.clientManager().listClients()); StringBuilder buf = new StringBuilder(512); - buf.append("

").append(_("Local Destinations")).append("

"); + buf.append("

").append(_("Local Destinations")).append("

"); if (!clients.isEmpty()) { Collections.sort(clients, new AlphaComparator()); buf.append(""); diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index 01c332b49..84cd54384 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -32,7 +32,7 @@ " >

<%=intl._("Manual Keyring Addition")%>

<%=intl._("Enter keys for encrypted remote destinations here.")%> - <%=intl._("Keys for local destinations must be entered on the")%> <%=intl._("I2PTunnel page")%>. + <%=intl._("Keys for local destinations must be entered on the")%> <%=intl._("I2PTunnel page")%>.