I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 6d4f8fd4 authored by str4d's avatar str4d
Browse files

Fixes after merge 

Also found several duplicate ids that were split up; these will be replaced with
classes later.
parent b38f3b56
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/routerconsole/jsp/configi2cp.jsp
+ 26
− 14
View file @ 6d4f8fd4
...@@ -27,17 +27,26 @@ input.default { width: 1px; height: 1px; visibility: hidden; } ...@@ -27,17 +27,26 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
<jsp:useBean class="net.i2p.router.web.ConfigClientsHandler" id="formhandler" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigClientsHandler" id="formhandler" scope="request" />
<%@include file="formhandler.jsi" %> <%@include file="formhandler.jsi" %>
<div class="configure"> <div class="configure">
<h3><a name="i2cp"></a><%=intl._t("Advanced Client Interface Configuration")%></h3> <h3 id="advancedclientconfig"><a name="i2cp"></a><%=intl._t("Advanced Client Interface Configuration")%></h3>
<form action="configi2cp" method="POST"> <form action="configi2cp" method="POST">
<input type="hidden" name="nonce" value="<%=pageNonce%>" > <input type="hidden" name="nonce" value="<%=pageNonce%>" >
<p> <table class="configtable" id="externali2cp">
<b><%=intl._t("External I2CP (I2P Client Protocol) Interface Configuration")%></b><br> <tr><td class="infowarn">
<b><%=intl._t("The default settings will work for most people.")%></b>
<%=intl._t("Any changes made here must also be configured in the external client.")%>
<%=intl._t("Many clients do not support SSL or authorization.")%>
<i><%=intl._t("All changes require restart to take effect.")%></i>
</td</tr>
<tr><th><%=intl._t("External I2CP (I2P Client Protocol) Interface Configuration")%></th></tr>
<tr><td>
<input type="radio" class="optbox" name="mode" value="1" <%=clientshelper.i2cpModeChecked(1) %> > <input type="radio" class="optbox" name="mode" value="1" <%=clientshelper.i2cpModeChecked(1) %> >
<%=intl._t("Enabled without SSL")%><br> <%=intl._t("Enabled without SSL")%><br>
<input type="radio" class="optbox" name="mode" value="2" <%=clientshelper.i2cpModeChecked(2) %> > <input type="radio" class="optbox" name="mode" value="2" <%=clientshelper.i2cpModeChecked(2) %> >
<%=intl._t("Enabled with SSL required")%><br> <%=intl._t("Enabled with SSL required")%><br>
<input type="radio" class="optbox" name="mode" value="0" <%=clientshelper.i2cpModeChecked(0) %> > <input type="radio" class="optbox" name="mode" value="0" <%=clientshelper.i2cpModeChecked(0) %> >
<%=intl._t("Disabled - Clients outside this Java process may not connect")%><br> <%=intl._t("Disabled - Clients outside this Java process may not connect")%><br>
</td</tr>
<tr><td>
<%=intl._t("I2CP Interface")%>: <%=intl._t("I2CP Interface")%>:
<select name="interface"> <select name="interface">
<% <%
...@@ -53,23 +62,26 @@ input.default { width: 1px; height: 1px; visibility: hidden; } ...@@ -53,23 +62,26 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
out.print("</option>\n"); out.print("</option>\n");
} }
%> %>
</select><br> </select>&nbsp;
<%=intl._t("I2CP Port")%>: <%=intl._t("I2CP Port")%>:
<input name="port" type="text" size="5" maxlength="5" value="<jsp:getProperty name="clientshelper" property="port" />" ><br> <input name="port" type="text" size="5" maxlength="5" value="<jsp:getProperty name="clientshelper" property="port" />" >
<b><%=intl._t("Authorization")%></b><br> </td></tr>
<tr><th><%=intl._t("Authorization")%></th></tr>
<tr><td>
<input type="checkbox" class="optbox" name="auth" value="true" <jsp:getProperty name="clientshelper" property="auth" /> > <input type="checkbox" class="optbox" name="auth" value="true" <jsp:getProperty name="clientshelper" property="auth" /> >
<%=intl._t("Require username and password")%><br> <%=intl._t("Require username and password")%><br>
</td></tr>
<tr><td>
<%=intl._t("Username")%>: <%=intl._t("Username")%>:
<input name="user" type="text" value="" /><br> <input name="user" type="text" value="" />&nbsp;
<%=intl._t("Password")%>: <%=intl._t("Password")%>:
<input name="nofilter_pw" type="password" value="" /><br> <input name="nofilter_pw" type="password" value="" />
</p><p><b><%=intl._t("The default settings will work for most people.")%></b> </td></tr>
<%=intl._t("Any changes made here must also be configured in the external client.")%> <tr><td class="optionsave" align="right">
<%=intl._t("Many clients do not support SSL or authorization.")%>
<i><%=intl._t("All changes require restart to take effect.")%></i>
</p><hr><div class="formaction">
<input type="submit" class="default" name="action" value="<%=intl._t("Save Interface Configuration")%>" /> <input type="submit" class="default" name="action" value="<%=intl._t("Save Interface Configuration")%>" />
<input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" /> <input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" />
<input type="submit" class="accept" name="action" value="<%=intl._t("Save Interface Configuration")%>" /> <input type="submit" class="accept" name="action" value="<%=intl._t("Save Interface Configuration")%>" />
</div></form> </td></tr>
</table>
</form>
</div></div></body></html> </div></div></body></html>
apps/routerconsole/jsp/configplugins.jsp
+ 35
− 23
View file @ 6d4f8fd4
...@@ -31,13 +31,13 @@ input.default { width: 1px; height: 1px; visibility: hidden; } ...@@ -31,13 +31,13 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
if (clientshelper.showPlugins()) { if (clientshelper.showPlugins()) {
if (clientshelper.isPluginUpdateEnabled()) { if (clientshelper.isPluginUpdateEnabled()) {
%> %>
<h3><a name="pconfig"></a><%=intl._t("Plugin Configuration")%></h3><p> <h3 id="pluginconfig"><a name="pconfig"></a><%=intl._t("Plugin Configuration")%></h3><p id="pluginconfigtext">
<%=intl._t("The plugins listed below are started by the webConsole client.")%> <%=intl._t("The plugins listed below are started by the webConsole client.")%>
</p><div class="wideload"> </p><div class="wideload">
<form action="" method="POST"> <form action="" method="POST">
<input type="hidden" name="nonce" value="<%=pageNonce%>" > <input type="hidden" name="nonce" value="<%=pageNonce%>" >
<jsp:getProperty name="clientshelper" property="form3" /> <jsp:getProperty name="clientshelper" property="form3" />
<div class="formaction"> <div class="formaction" id="pluginconfigactions">
<input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" /> <input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" />
<input type="submit" name="action" class="accept" value="<%=intl._t("Save Plugin Configuration")%>" /> <input type="submit" name="action" class="accept" value="<%=intl._t("Save Plugin Configuration")%>" />
</div></form></div> </div></form></div>
...@@ -45,38 +45,50 @@ input.default { width: 1px; height: 1px; visibility: hidden; } ...@@ -45,38 +45,50 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
} // pluginUpdateEnabled } // pluginUpdateEnabled
if (clientshelper.isPluginInstallEnabled()) { if (clientshelper.isPluginInstallEnabled()) {
%> %>
<h3><a name="plugin"></a><%=intl._t("Plugin Installation from URL")%></h3><p> <h3 id="pluginmanage"><a name="plugin"></a><%=intl._t("Plugin Installation")%></h3><p>
<table id="plugininstall" class="configtable">
<tr><td class="infohelp" colspan="2">
<%=intl._t("Look for available plugins on {0}.", "<a href=\"http://i2pwiki.i2p/index.php?title=Plugins\">i2pwiki.i2p</a>")%> <%=intl._t("Look for available plugins on {0}.", "<a href=\"http://i2pwiki.i2p/index.php?title=Plugins\">i2pwiki.i2p</a>")%>
<%=intl._t("To install a plugin, enter the download URL:")%> </td></tr>
</p> <tr><th colspan="2">
<div class="wideload"> <%=intl._t("Installation from URL")%>
</th></tr>
<tr>
<form action="configplugins" method="POST"> <form action="configplugins" method="POST">
<input type="hidden" name="nonce" value="<%=pageNonce%>" > <td>
<p> <input type="hidden" name="nonce" value="<%=pageNonce%>" >
<input type="text" size="60" name="pluginURL" > URL:&nbsp;
</p><hr><div class="formaction"> <input type="text" size="60" name="pluginURL" title="<%=intl._t("To install a plugin, enter the download URL:")%>" >
<input type="submit" name="action" class="default" value="<%=intl._t("Install Plugin")%>" /> </td>
<td class="optionsave" align="right">
<input type="submit" name="action" class="default hideme" value="<%=intl._t("Install Plugin")%>" />
<input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" /> <input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" />
<input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin")%>" /> <input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin")%>" />
</div></form></div> </td>
</form>
</tr>
<div class="wideload"> <tr><th colspan="2">
<h3><a name="plugin"></a><%=intl._t("Plugin Installation from File")%></h3> <a name="plugin"></a><%=intl._t("Installation from File")%>
</th></tr>
<tr>
<form action="configplugins" method="POST" enctype="multipart/form-data" accept-charset="UTF-8"> <form action="configplugins" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
<td>
<input type="hidden" name="nonce" value="<%=pageNonce%>" > <input type="hidden" name="nonce" value="<%=pageNonce%>" >
<p><%=intl._t("Install plugin from file.")%> <%=intl._t("Select xpi2p or su3 file")%>:&nbsp;
<br><%=intl._t("Select xpi2p or su3 file")%> : <input type="file" name="pluginFile" accept=".xpi2p,.su3" >
<input type="file" name="pluginFile" > </td>
</p><hr><div class="formaction"> <td class="optionsave" align="right">
<input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin from File")%>" /> <input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin from File")%>" />
</div></form></div> </td>
</form>
</tr>
</table>
<% <%
} // pluginInstallEnabled } // pluginInstallEnabled
if (clientshelper.isPluginUpdateEnabled()) { if (clientshelper.isPluginUpdateEnabled()) {
%> %>
<h3><a name="plugin"></a><%=intl._t("Update All Plugins")%></h3> <h4 id="updateplugins" class="embeddedtitle"><a name="plugin"></a><%=intl._t("Update All Plugins")%></h4>
<div class="formaction"> <div class="formaction" id="pluginupdater">
<form action="configplugins" method="POST"> <form action="configplugins" method="POST">
<input type="hidden" name="nonce" value="<%=pageNonce%>" > <input type="hidden" name="nonce" value="<%=pageNonce%>" >
<input type="submit" name="action" class="reload" value="<%=intl._t("Update All Installed Plugins")%>" /> <input type="submit" name="action" class="reload" value="<%=intl._t("Update All Installed Plugins")%>" />
......
apps/routerconsole/jsp/configwebapps.jsp
+ 5
− 5
View file @ 6d4f8fd4
...@@ -27,16 +27,16 @@ input.default { width: 1px; height: 1px; visibility: hidden; } ...@@ -27,16 +27,16 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
<jsp:useBean class="net.i2p.router.web.ConfigClientsHandler" id="formhandler" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigClientsHandler" id="formhandler" scope="request" />
<%@include file="formhandler.jsi" %> <%@include file="formhandler.jsi" %>
<div class="configure"> <div class="configure">
<h3><a name="webapp"></a><%=intl._t("WebApp Configuration")%></h3><p> <h3 id="webappconfig"><a name="webapp"></a><%=intl._t("WebApp Configuration")%></h3><p>
<%=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).")%> <p class="infohelp" id="webappconfigtext">
</p><p> <%=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).")%>&nbsp;
<%=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("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.")%>
<i><%=intl._t("All changes require restart to take effect.")%></i>
</p><div class="wideload"> </p><div class="wideload">
<form action="configwebapps" method="POST"> <form action="configwebapps" method="POST">
<input type="hidden" name="nonce" value="<%=pageNonce%>" > <input type="hidden" name="nonce" value="<%=pageNonce%>" >
<jsp:getProperty name="clientshelper" property="form2" /> <jsp:getProperty name="clientshelper" property="form2" />
<p><i><%=intl._t("All changes require restart to take effect.")%></i> <div class="formaction" id="webappconfigactions">
</p><hr><div class="formaction">
<input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" /> <input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" />
<input type="submit" name="action" class="accept" value="<%=intl._t("Save WebApp Configuration")%>" /> <input type="submit" name="action" class="accept" value="<%=intl._t("Save WebApp Configuration")%>" />
</div></form></div> </div></form></div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]