Visual overhaul of config pages.

This commit is contained in:
z3d
2009-07-17 16:28:38 +00:00
parent ec49d9becf
commit 1bff5a7b9e
8 changed files with 500 additions and 452 deletions

View File

@@ -22,20 +22,23 @@
<jsp:setProperty name="formhandler" property="*" /> <jsp:setProperty name="formhandler" property="*" />
<jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<jsp:getProperty name="formhandler" property="allMessages" /> <jsp:getProperty name="formhandler" property="allMessages" />
<div class="configure">
<form action="configadvanced.jsp" method="POST"> <form action="configadvanced.jsp" method="POST">
<% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce"); <% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce");
if (prev != null) System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.noncePrev", prev); if (prev != null) System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.noncePrev", prev);
System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce", new java.util.Random().nextLong()+""); %> System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce", new java.util.Random().nextLong()+""); %>
<input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce")%>" /> <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce")%>" />
<input type="hidden" name="action" value="blah" /> <input type="hidden" name="action" value="blah" />
<textarea rows="32" cols="100" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br /> <textarea rows="32" cols="100" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br /><hr>
<p> <p align="right">
<input type="submit" name="shouldsave" value="Apply" /> <input type="reset" value="Cancel" /> <input type="submit" name="shouldsave" value="Apply" />
</p><p> <input type="reset" value="Cancel" />
</p>
<p>
NOTE: Some changes may require a restart to take effect. NOTE: Some changes may require a restart to take effect.
</p> </p>
</form> </form>
</div> </div>
</div>
</body> </body>
</html> </html>

View File

@@ -27,7 +27,7 @@ button span.hide{
<jsp:setProperty name="formhandler" property="nonce" value="<%=request.getParameter("nonce")%>" /> <jsp:setProperty name="formhandler" property="nonce" value="<%=request.getParameter("nonce")%>" />
<jsp:setProperty name="formhandler" property="settings" value="<%=request.getParameterMap()%>" /> <jsp:setProperty name="formhandler" property="settings" value="<%=request.getParameterMap()%>" />
<jsp:getProperty name="formhandler" property="allMessages" /> <jsp:getProperty name="formhandler" property="allMessages" />
<div class="configure">
<form action="configclients.jsp" method="POST"> <form action="configclients.jsp" method="POST">
<% String prev = System.getProperty("net.i2p.router.web.ConfigClientsHandler.nonce"); <% String prev = System.getProperty("net.i2p.router.web.ConfigClientsHandler.nonce");
if (prev != null) System.setProperty("net.i2p.router.web.ConfigClientsHandler.noncePrev", prev); if (prev != null) System.setProperty("net.i2p.router.web.ConfigClientsHandler.noncePrev", prev);
@@ -57,13 +57,13 @@ button span.hide{
so disabling the web app here is the preferred method. so disabling the web app here is the preferred method.
</p><p> </p><p>
<jsp:getProperty name="clientshelper" property="form2" /> <jsp:getProperty name="clientshelper" property="form2" />
</p><p> </p><p><hr>
<input type="submit" name="action" value="Save WebApp Configuration" /> <input type="submit" name="action" value="Save WebApp Configuration" />
</p><p> </p><hr><p>
<i>All changes require restart to take effect. To change other webapp options, edit the webapps.config file.</i> <i>All changes require restart to take effect. To change other webapp options, edit the webapps.config file.</i>
</p> </p>
</form> </form>
</div> </div>
</div>
</body> </body>
</html> </html>

View File

@@ -22,7 +22,7 @@
<jsp:useBean class="net.i2p.router.web.ConfigKeyringHelper" id="keyringhelper" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigKeyringHelper" id="keyringhelper" scope="request" />
<jsp:setProperty name="keyringhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:setProperty name="keyringhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<div class="configure">
<p> <p>
<h2>Keyring</h2> <h2>Keyring</h2>
The router keyring is used to decrypt encrypted leaseSets. The router keyring is used to decrypt encrypted leaseSets.
@@ -42,16 +42,22 @@
Keys for local destinations must be entered on the <a href="i2ptunnel/index.jsp">I2PTunnel page</a>. Keys for local destinations must be entered on the <a href="i2ptunnel/index.jsp">I2PTunnel page</a>.
<p> <p>
<table> <table>
<tr><td>Dest. name, hash, or full key: <tr>
<td>Dest. name, hash, or full key:
<td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea> <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea>
<tr><td align="right">Session Key: <tr>
<td align="right">Session Key:
<td><input type="text" size="55" name="key" /> <td><input type="text" size="55" name="key" />
<tr><td><td><input type="submit" name="action" value="Add key" /> <tr>
<td>
<td><div align="right">
<input type="submit" name="action" value="Add key" />
</div>
</table> </table>
</form> </form>
</div> </div>
</div>
</body> </body>
</html> </html>

View File

@@ -19,7 +19,7 @@
<jsp:setProperty name="formhandler" property="*" /> <jsp:setProperty name="formhandler" property="*" />
<jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<jsp:getProperty name="formhandler" property="allMessages" /> <jsp:getProperty name="formhandler" property="allMessages" />
<div class="configure">
<form action="configlogging.jsp" method="POST"> <form action="configlogging.jsp" method="POST">
<% String prev = System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce"); <% String prev = System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce");
if (prev != null) System.setProperty("net.i2p.router.web.ConfigLoggingHandler.noncePrev", prev); if (prev != null) System.setProperty("net.i2p.router.web.ConfigLoggingHandler.noncePrev", prev);
@@ -27,28 +27,42 @@
<input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce")%>" /> <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce")%>" />
<input type="hidden" name="action" value="blah" /> <input type="hidden" name="action" value="blah" />
<table border="0" cellspacing="5"> <table border="0" cellspacing="5">
<tr><td valign="top"><b>Logging filename:</b> <tr>
<td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" /><br /> <td valign="top"><b>Logging filename:</b>
<i>(the symbol '@' will be replaced during log rotation)</i> <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" />
<tr><td valign="top"><b>Log record format:</b> <br /> <i>(the symbol '@' will be replaced during log rotation)</i>
<td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" /><br /> <tr>
<i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)</i> <td valign="top"><b>Log record format:</b>
<tr><td valign="top"><b>Log date format:</b> <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" />
<td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" /><br /> <br /> <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority,
<i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)</i> 'm' = message)</i>
<tr><td valign="top"><b>Max log file size:</b> <tr>
<td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" /><br /> <td valign="top"><b>Log date format:</b>
<tr><td valign="top"><b>Default log level:</b> <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" />
<td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /> <br /> <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss'
<br /><i>(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)</i> = second, 'SSS' = millisecond)</i>
<tr><td valign="top"><b>Log level overrides:</b> <tr>
<td valign="top"><b>Max log file size:</b>
<td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" />
<br />
<tr>
<td valign="top"><b>Default log level:</b>
<td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /> <br /> <i>(DEBUG and INFO are not recommended defaults,
as they will drastically slow down your router)</i>
<tr>
<td valign="top"><b>Log level overrides:</b>
<td><jsp:getProperty name="logginghelper" property="logLevelTable" /> <td><jsp:getProperty name="logginghelper" property="logLevelTable" />
<tr><td><td> <tr>
<td colspan="2" valign="top"><hr>
<tr>
<td>
<td> <div align="right">
<input type="submit" name="shouldsave" value="Save changes" /> <input type="submit" name="shouldsave" value="Save changes" />
<input type="reset" value="Cancel" /> <input type="reset" value="Cancel" />
</div>
</table> </table>
</form> </form>
</div> </div>
</div>
</body> </body>
</html> </html>

View File

@@ -27,7 +27,7 @@
if (request.getParameter("peer") != null) if (request.getParameter("peer") != null)
peer = request.getParameter("peer"); peer = request.getParameter("peer");
%> %>
<div class="configure">
<form action="configpeer.jsp" method="POST"> <form action="configpeer.jsp" method="POST">
<% String prev = System.getProperty("net.i2p.router.web.ConfigPeerHandler.nonce"); <% String prev = System.getProperty("net.i2p.router.web.ConfigPeerHandler.nonce");
if (prev != null) System.setProperty("net.i2p.router.web.ConfigPeerHandler.noncePrev", prev); if (prev != null) System.setProperty("net.i2p.router.web.ConfigPeerHandler.noncePrev", prev);
@@ -43,6 +43,7 @@
<input type="text" size="55" name="peer" value="<%=peer%>" /> <input type="text" size="55" name="peer" value="<%=peer%>" />
<h3>Manually Shitlist / Unshitlist a Router</h3> <h3>Manually Shitlist / Unshitlist a Router</h3>
Shitlisting will prevent the participation of this peer in tunnels you create. Shitlisting will prevent the participation of this peer in tunnels you create.
<hr />
<p> <p>
<input type="submit" name="action" value="Shitlist peer until restart" /> <input type="submit" name="action" value="Shitlist peer until restart" />
<input type="submit" name="action" value="Unshitlist peer" /> <input type="submit" name="action" value="Unshitlist peer" />
@@ -52,9 +53,11 @@
</p> </p>
<h3>Adjust Profile Bonuses</h3> <h3>Adjust Profile Bonuses</h3>
Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Bonuses may be positive or negative, and affect the peer's inclusion in Fast
Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels. and High Capacity tiers. Fast peers are used for client tunnels, and High
Current bonuses are displayed on the <a href="profiles.jsp">profiles page</a>. Capacity peers are used for some exploratory tunnels. Current bonuses are
displayed on the <a href="profiles.jsp">profiles page</a>.
<hr />
<p> <p>
<% long speed = 0; long capacity = 0; <% long speed = 0; long capacity = 0;
if (! "".equals(peer)) { if (! "".equals(peer)) {
@@ -79,6 +82,6 @@
</div> </div>
</div>
</body> </body>
</html> </html>

View File

@@ -17,7 +17,7 @@
<jsp:setProperty name="formhandler" property="*" /> <jsp:setProperty name="formhandler" property="*" />
<jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<jsp:getProperty name="formhandler" property="allMessages" /> <jsp:getProperty name="formhandler" property="allMessages" />
<div class="configure">
<form action="configservice.jsp" method="POST"> <form action="configservice.jsp" method="POST">
<% String prev = System.getProperty("net.i2p.router.web.ConfigServiceHandler.nonce"); <% String prev = System.getProperty("net.i2p.router.web.ConfigServiceHandler.nonce");
if (prev != null) System.setProperty("net.i2p.router.web.ConfigServiceHandler.noncePrev", prev); if (prev != null) System.setProperty("net.i2p.router.web.ConfigServiceHandler.noncePrev", prev);
@@ -82,6 +82,6 @@
<input type="submit" name="action" value="Do not view console on startup" /> <input type="submit" name="action" value="Do not view console on startup" />
</form><hr> </form><hr>
</div> </div>
</div>
</body> </body>
</html> </html>

View File

@@ -65,7 +65,7 @@ function toggleAll(category)
<jsp:useBean class="net.i2p.router.web.ConfigStatsHelper" id="statshelper" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigStatsHelper" id="statshelper" scope="request" />
<jsp:setProperty name="statshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:setProperty name="statshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<div class="caonfigure"> <div class="configure">
<form id="statsForm" name="statsForm" action="configstats.jsp" method="POST"> <form id="statsForm" name="statsForm" action="configstats.jsp" method="POST">
<% String prev = System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce"); <% String prev = System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce");
if (prev != null) System.setProperty("net.i2p.router.web.ConfigStatsHandler.noncePrev", prev); if (prev != null) System.setProperty("net.i2p.router.web.ConfigStatsHandler.noncePrev", prev);

View File

@@ -20,40 +20,62 @@
<jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
<jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<div class="messages">
<br /><i><jsp:getProperty name="updatehelper" property="newsStatus" /></i><br />&nbsp;<br /> <i><jsp:getProperty name="updatehelper" property="newsStatus" /></i></div>
<div class="configure">
<form action="configupdate.jsp" method="POST"> <form action="configupdate.jsp" method="POST">
<% String prev = System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce"); <% String prev = System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce");
if (prev != null) System.setProperty("net.i2p.router.web.ConfigUpdateHandler.noncePrev", prev); if (prev != null) System.setProperty("net.i2p.router.web.ConfigUpdateHandler.noncePrev", prev);
System.setProperty("net.i2p.router.web.ConfigUpdateHandler.nonce", new java.util.Random().nextLong()+""); %> System.setProperty("net.i2p.router.web.ConfigUpdateHandler.nonce", new java.util.Random().nextLong()+""); %>
<input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce")%>" /> <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce")%>" />
<table border="0" cellspacing="5"><tr><td colspan="2"></tr><tr><td><b>News:</b></td><td> <table border="0" cellspacing="5">
<% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <tr>
<i>Update In Progress</i><br /> <td colspan="2"></tr>
<% } else { %> <tr>
<input type="submit" name="action" value="Check for update now" /> <td><b>News:</b></td>
<% } %></tr> <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i>Update In Progress</i><br /> <% } else { %> <input type="submit" name="action" value="Check for update now" />
<tr><td colspan="2"><hr /></td></tr> <% } %></tr>
<tr><td><b>News URL:</b></td> <tr>
<td><input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />"></td></tr> <td colspan="2"><hr /></td>
<tr><td><b>Refresh frequency:</b> </tr>
<td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" /> <tr>
<tr><td><b>Update policy:</b> <td><b>News URL:</b></td>
<td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" /> <td><input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />"></td>
<tr><td><b>Update through the eepProxy?</b> </tr>
<td><jsp:getProperty name="updatehelper" property="updateThroughProxy" /> <tr>
<tr><td><b>eepProxy host:</b> <td><b>Refresh frequency:</b>
<td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" /> <td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" />
<tr><td><b>eepProxy port:</b> <tr>
<td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" /> <td><b>Update policy:</b>
<tr><td><b>Update URLs:</b> <td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" />
<td><textarea name="updateURL" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea> <tr>
<tr><td><b>Trusted keys:</b> <td><b>Update through the eepProxy?</b>
<td><textarea name="trustedKeys" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea> <td><jsp:getProperty name="updatehelper" property="updateThroughProxy" />
<tr><tr><td colspan="2"><hr /><tr> <tr>
<tr><td><td><input type="submit" name="action" value="Save" /> <input type="reset" value="Cancel" /> <td><b>eepProxy host:</b>
</table> <td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" />
<tr>
<td><b>eepProxy port:</b>
<td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" />
<tr>
<td><b>Update URLs:</b>
<td><textarea name="updateURL" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea>
<tr>
<td><b>Trusted keys:</b>
<td><textarea name="trustedKeys" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea>
<tr>
<tr>
<td colspan="2"><hr />
<tr>
<tr>
<td>
<td><div align="right">
<input type="submit" name="action" value="Save" />
<input type="reset" value="Cancel" />
</div>
</table>
</form> </form>
</div> </div>
</div>
</body> </body>
</html> </html>