diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index 3db3038eaa..e5b602129c 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -110,7 +110,7 @@ + basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml"> @@ -120,13 +120,35 @@ - - + diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 1013653c10..c422e1016f 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -3,17 +3,17 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config networking")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %> " />

<%=intl._("I2P Network Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index 2b506cd785..d015df0b31 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -3,11 +3,11 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config advanced")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %> " /> @@ -15,7 +15,7 @@

<%=intl._("I2P Advanced Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index bff2fc5901..974673b31f 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -3,7 +3,7 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config clients")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %> " />

<%=intl._("I2P Client Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> " /> diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index e7b8354555..038b2c778a 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -3,14 +3,14 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config keyring")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Keyring Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index 39ac2b7f62..c2f3a7ba5f 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -3,16 +3,16 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config logging")%> " /> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Logging Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> diff --git a/apps/routerconsole/jsp/confignav.jsp b/apps/routerconsole/jsp/confignav.jsi similarity index 100% rename from apps/routerconsole/jsp/confignav.jsp rename to apps/routerconsole/jsp/confignav.jsi diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index 6b4d90cde6..8b61f274db 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -3,14 +3,14 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config peers")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Peer Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index 96e6175f9a..e76e036231 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -3,14 +3,14 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config service")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Service Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index 05989dab0d..1c1158407a 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -3,7 +3,7 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config stats")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Stats Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> " /> diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp index 94c26f2c38..269f2186e0 100644 --- a/apps/routerconsole/jsp/configtunnels.jsp +++ b/apps/routerconsole/jsp/configtunnels.jsp @@ -3,17 +3,17 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config tunnels")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %> " />

<%=intl._("I2P Tunnel Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> " /> " /> diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index 6ca14cede5..7484880ce7 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -3,11 +3,11 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config UI")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %> " /> @@ -15,7 +15,7 @@

<%=uihelper._("I2P UI Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index c538a6c9ff..efc138b82f 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -3,14 +3,14 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("config update")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Update Configuration")%>

- <%@include file="confignav.jsp" %> + <%@include file="confignav.jsi" %> diff --git a/apps/routerconsole/jsp/css.jsp b/apps/routerconsole/jsp/css.jsi similarity index 100% rename from apps/routerconsole/jsp/css.jsp rename to apps/routerconsole/jsp/css.jsi diff --git a/apps/routerconsole/jsp/debug.jsp b/apps/routerconsole/jsp/debug.jsp index 9ee9370977..9f6aae5740 100644 --- a/apps/routerconsole/jsp/debug.jsp +++ b/apps/routerconsole/jsp/debug.jsp @@ -7,9 +7,9 @@ */ %> I2P Router Console - Debug -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

Router SKM

<% diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp index cfb2fe99bd..7bcfc3318e 100644 --- a/apps/routerconsole/jsp/error.jsp +++ b/apps/routerconsole/jsp/error.jsp @@ -13,10 +13,10 @@ // If it can't find the iframe or viewtheme.jsp I wonder if the whole thing blows up... %> -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("Page Not Found")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=ERROR_CODE%> <%=ERROR_MESSAGE%>

<%=intl._("Sorry! You appear to be requesting a non-existent Router Console page or resource.")%>
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp index 1ad8730416..d472d54574 100644 --- a/apps/routerconsole/jsp/graphs.jsp +++ b/apps/routerconsole/jsp/graphs.jsp @@ -3,11 +3,11 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("graphs")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Performance Graphs")%>

diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp index 35e4dd05b9..50c430f02d 100644 --- a/apps/routerconsole/jsp/help.jsp +++ b/apps/routerconsole/jsp/help.jsp @@ -7,9 +7,9 @@ */ %> I2P Router Console - help -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

I2P Router Help & Support

If you'd like to help improve or translate the documentation, or diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp index 2fbfb6dc11..9cc79ca49d 100644 --- a/apps/routerconsole/jsp/index.jsp +++ b/apps/routerconsole/jsp/index.jsp @@ -3,7 +3,7 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("home")%> <% @@ -12,7 +12,7 @@ if (System.getProperty("router.consoleNonce") == null) { } %> -<%@include file="summary.jsp" %>

<%=intl._("I2P Router Console")%>

+<%@include file="summary.jsi" %>

<%=intl._("I2P Router Console")%>

<% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml"); %> diff --git a/apps/routerconsole/jsp/jobs.jsp b/apps/routerconsole/jsp/jobs.jsp index c53ea0a445..ef84c8f8c5 100644 --- a/apps/routerconsole/jsp/jobs.jsp +++ b/apps/routerconsole/jsp/jobs.jsp @@ -3,10 +3,10 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("job queue")%> -<%@include file="summary.jsp" %>

<%=intl._("I2P Router Job Queue")%>

+<%@include file="summary.jsi" %>

<%=intl._("I2P Router Job Queue")%>

" /> diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index 859aba705d..5af8b6afdc 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -3,10 +3,10 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("logs")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Router Logs")%>

<%=intl._("I2P Version & Running Environment")%>

diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp index bc954d2bff..9cbac25e74 100644 --- a/apps/routerconsole/jsp/netdb.jsp +++ b/apps/routerconsole/jsp/netdb.jsp @@ -3,10 +3,10 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("network database summary")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Network Database Summary")%>

diff --git a/apps/routerconsole/jsp/oldconsole.jsp b/apps/routerconsole/jsp/oldconsole.jsp index 10394fb501..701d70f7d3 100644 --- a/apps/routerconsole/jsp/oldconsole.jsp +++ b/apps/routerconsole/jsp/oldconsole.jsp @@ -7,9 +7,9 @@ */ %> I2P Router Console - internals -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %> " /> diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp index 351ad10b6a..14a919d623 100644 --- a/apps/routerconsole/jsp/peers.jsp +++ b/apps/routerconsole/jsp/peers.jsp @@ -3,10 +3,10 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("peer connections")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Network Peers")%>

diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp index dc3a0a59db..035f50b5b3 100644 --- a/apps/routerconsole/jsp/profiles.jsp +++ b/apps/routerconsole/jsp/profiles.jsp @@ -3,9 +3,9 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("peer profiles")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %>

<%=intl._("I2P Network Peer Profiles")%>

diff --git a/apps/routerconsole/jsp/stats.jsp b/apps/routerconsole/jsp/stats.jsp index 7617ec565c..d140d7c2cc 100644 --- a/apps/routerconsole/jsp/stats.jsp +++ b/apps/routerconsole/jsp/stats.jsp @@ -3,10 +3,10 @@ -<%@include file="css.jsp" %> +<%@include file="css.jsi" %> <%=intl.title("statistics")%> -<%@include file="summary.jsp" %> +<%@include file="summary.jsi" %> " /> diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsi similarity index 97% rename from apps/routerconsole/jsp/summary.jsp rename to apps/routerconsole/jsp/summary.jsi index 33c5919ebb..10b71ae2cb 100644 --- a/apps/routerconsole/jsp/summary.jsp +++ b/apps/routerconsole/jsp/summary.jsi @@ -14,7 +14,7 @@ out.print("