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 d9f392275..758b990ce 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java @@ -19,12 +19,14 @@ public class ConfigNavHelper extends HelperBase { private static final String pages[] = {"", "net", "ui", "sidebar", "home", "service", "update", "tunnels", "clients", "peer", "keyring", "logging", "stats", + "i2cp", "plugins", "webapps", "reseed", "advanced", "family" }; private static final String titles[] = {_x("Bandwidth"), _x("Network"), _x("UI"), _x("Summary Bar"), _x("Home Page"), _x("Service"), _x("Update"), _x("Tunnels"), _x("Clients"), _x("Peers"), _x("Keyring"), _x("Logging"), _x("Stats"), + _x("I2CP"), _x("Plugins"), _x("Web Apps"), _x("Reseeding"), _x("Advanced"), _x("Router Family") }; /** @since 0.9.19 */ @@ -61,7 +63,10 @@ public class ConfigNavHelper extends HelperBase { if (!span) buf.append("
"); List tabs = new ArrayList(pages.length); + boolean hidePlugins = !PluginStarter.pluginsEnabled(_context); for (int i = 0; i < pages.length; i++) { + if (hidePlugins && pages[i].equals("plugins")) + continue; tabs.add(new Tab(pages[i], _t(titles[i]))); } Collections.sort(tabs, new TabComparator()); diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index e1e1c2d52..d6b0862ba 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -44,123 +44,4 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% } %> " /> - -

<%=intl._t("Advanced Client Interface Configuration")%>

-
- -

-<%=intl._t("External I2CP (I2P Client Protocol) Interface Configuration")%>
- > -<%=intl._t("Enabled without SSL")%>
- > -<%=intl._t("Enabled with SSL required")%>
- > -<%=intl._t("Disabled - Clients outside this Java process may not connect")%>
-<%=intl._t("I2CP Interface")%>: -
-<%=intl._t("I2CP Port")%>: -" >
-<%=intl._t("Authorization")%>
- > -<%=intl._t("Require username and password")%>
-<%=intl._t("Username")%>: -
-<%=intl._t("Password")%>: -
-

<%=intl._t("The default settings will work for most people.")%> -<%=intl._t("Any changes made here must also be configured in the external client.")%> -<%=intl._t("Many clients do not support SSL or authorization.")%> -<%=intl._t("All changes require restart to take effect.")%> -

-" /> -" /> -" /> -
- -

<%=intl._t("WebApp Configuration")%>

- <%=intl._t("The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook).")%> -

- <%=intl._t("A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method.")%> -

-
- - -

<%=intl._t("All changes require restart to take effect.")%> -

- " /> - " /> -
- -<% - if (clientshelper.showPlugins()) { - if (clientshelper.isPluginUpdateEnabled()) { -%> -

<%=intl._t("Plugin Configuration")%>

- <%=intl._t("The plugins listed below are started by the webConsole client.")%> -

-
- - -
- " /> - " /> -
-<% - } // pluginUpdateEnabled - if (clientshelper.isPluginInstallEnabled()) { -%> -

<%=intl._t("Plugin Installation from URL")%>

- <%=intl._t("Look for available plugins on {0}.", "i2pwiki.i2p")%> - <%=intl._t("To install a plugin, enter the download URL:")%> -

-
-
- -

- -

- " /> - " /> - " /> -
- - -
-

<%=intl._t("Plugin Installation from File")%>

-
- -

<%=intl._t("Install plugin from file.")%> -
<%=intl._t("Select xpi2p or su3 file")%> : - -

-" /> -
-<% - } // pluginInstallEnabled - if (clientshelper.isPluginUpdateEnabled()) { -%> -

<%=intl._t("Update All Plugins")%>

-
-
- - " /> -
-<% - } // pluginUpdateEnabled - } // showPlugins -%> diff --git a/apps/routerconsole/jsp/configi2cp.jsp b/apps/routerconsole/jsp/configi2cp.jsp new file mode 100644 index 000000000..e7a89a245 --- /dev/null +++ b/apps/routerconsole/jsp/configi2cp.jsp @@ -0,0 +1,75 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + + +<%@include file="css.jsi" %> +<%=intl.title("config clients")%> + + +<%@include file="summaryajax.jsi" %> + + +<%@include file="summary.jsi" %> + + +" /> +" /> +

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

+
+ <%@include file="confignav.jsi" %> + + +<%@include file="formhandler.jsi" %> +
+

<%=intl._t("Advanced Client Interface Configuration")%>

+
+ +

+<%=intl._t("External I2CP (I2P Client Protocol) Interface Configuration")%>
+ > +<%=intl._t("Enabled without SSL")%>
+ > +<%=intl._t("Enabled with SSL required")%>
+ > +<%=intl._t("Disabled - Clients outside this Java process may not connect")%>
+<%=intl._t("I2CP Interface")%>: +
+<%=intl._t("I2CP Port")%>: +" >
+<%=intl._t("Authorization")%>
+ > +<%=intl._t("Require username and password")%>
+<%=intl._t("Username")%>: +
+<%=intl._t("Password")%>: +
+

<%=intl._t("The default settings will work for most people.")%> +<%=intl._t("Any changes made here must also be configured in the external client.")%> +<%=intl._t("Many clients do not support SSL or authorization.")%> +<%=intl._t("All changes require restart to take effect.")%> +

+" /> +" /> +" /> +
+
diff --git a/apps/routerconsole/jsp/configplugins.jsp b/apps/routerconsole/jsp/configplugins.jsp new file mode 100644 index 000000000..9eb7ec3d2 --- /dev/null +++ b/apps/routerconsole/jsp/configplugins.jsp @@ -0,0 +1,88 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + + +<%@include file="css.jsi" %> +<%=intl.title("config plugins")%> + + +<%@include file="summaryajax.jsi" %> + + +<%@include file="summary.jsi" %> + + +" /> +" /> +

<%=intl._t("Plugin Configuration")%>

+
+ <%@include file="confignav.jsi" %> + + +<%@include file="formhandler.jsi" %> +
+<% + if (clientshelper.showPlugins()) { + if (clientshelper.isPluginUpdateEnabled()) { +%> +

<%=intl._t("Plugin Configuration")%>

+ <%=intl._t("The plugins listed below are started by the webConsole client.")%> +

+
+ + +
+ " /> + " /> +
+<% + } // pluginUpdateEnabled + if (clientshelper.isPluginInstallEnabled()) { +%> +

<%=intl._t("Plugin Installation from URL")%>

+ <%=intl._t("Look for available plugins on {0}.", "i2pwiki.i2p")%> + <%=intl._t("To install a plugin, enter the download URL:")%> +

+
+
+ +

+ +

+ " /> + " /> + " /> +
+ + +
+

<%=intl._t("Plugin Installation from File")%>

+
+ +

<%=intl._t("Install plugin from file.")%> +
<%=intl._t("Select xpi2p or su3 file")%> : + +

+" /> +
+<% + } // pluginInstallEnabled + if (clientshelper.isPluginUpdateEnabled()) { +%> +

<%=intl._t("Update All Plugins")%>

+
+
+ + " /> +
+<% + } // pluginUpdateEnabled + } // showPlugins +%> +
diff --git a/apps/routerconsole/jsp/configwebapps.jsp b/apps/routerconsole/jsp/configwebapps.jsp new file mode 100644 index 000000000..25f4734f2 --- /dev/null +++ b/apps/routerconsole/jsp/configwebapps.jsp @@ -0,0 +1,43 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + + +<%@include file="css.jsi" %> +<%=intl.title("config webapps")%> + + +<%@include file="summaryajax.jsi" %> + + +<%@include file="summary.jsi" %> + + +" /> +" /> +

<%=intl._t("WebApp Configuration")%>

+
+ <%@include file="confignav.jsi" %> + + +<%@include file="formhandler.jsi" %> +
+

<%=intl._t("WebApp Configuration")%>

+ <%=intl._t("The Java web applications listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console. They may be complete applications (e.g. i2psnark),front-ends to another client or application which must be separately enabled (e.g. susidns, i2ptunnel), or have no web interface at all (e.g. addressbook).")%> +

+ <%=intl._t("A web app may also be disabled by removing the .war file from the webapps directory; however the .war file and web app will reappear when you update your router to a newer version, so disabling the web app here is the preferred method.")%> +

+
+ + +

<%=intl._t("All changes require restart to take effect.")%> +

+ " /> + " /> +
+
diff --git a/apps/routerconsole/jsp/nowebapp.jsp b/apps/routerconsole/jsp/nowebapp.jsp index 8d3e22768..16aab8422 100644 --- a/apps/routerconsole/jsp/nowebapp.jsp +++ b/apps/routerconsole/jsp/nowebapp.jsp @@ -14,5 +14,5 @@

<%=intl._t("Web Application Not Running")%>

<%=intl._t("The requested web application is not running.")%> -<%=intl._t("Please visit the {0}config clients page{1} to start it.", "", "")%> +<%=intl._t("Please visit the {0}config clients page{1} to start it.", "", "")%>