I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Insert some <h3>'s into various config pages and minor meddling with the css.

Browse Source
This commit is contained in:
z3d
2009-07-17 20:57:18 +00:00
parent a09c06849b
commit 895490df3d
5 changed files with 225 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
apps/routerconsole/jsp/configadvanced.jsp
View File

@ -1,43 +1,44 @@
<%@page contentType="text/html"%> <%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%> <%@page pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head> <html><head>
<title>I2P Router Console - config advanced</title> <title>I2P Router Console - config advanced</title>
<%@include file="css.jsp" %> <%@include file="css.jsp" %>
</head><body> </head><body>
<%@include file="summary.jsp" %> <%@include file="summary.jsp" %>
<jsp:useBean class="net.i2p.router.web.ConfigAdvancedHelper" id="advancedhelper" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHelper" id="advancedhelper" scope="request" />
<jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<h1>I2P Advanced Configuration</h1> <h1>I2P Advanced Configuration</h1>
<div class="main" id="main"> <div class="main" id="main">
<%@include file="confignav.jsp" %> <%@include file="confignav.jsp" %>
<jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" />
<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"> <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="60" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br /><hr> <h3>Advanced I2P Configuration</h3>
<p align="right"> <textarea rows="32" cols="60" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br /><hr>
<input type="submit" name="shouldsave" value="Apply" /> <p align="right">
<input type="reset" value="Cancel" /> <input type="submit" name="shouldsave" value="Apply" />
</p> <input type="reset" value="Cancel" />
<p> </p>
NOTE: Some changes may require a restart to take effect. <p>
</p> NOTE: Some changes may require a restart to take effect.
</form> </p>
</div> </form>
</div> </div>
</body> </div>
</html> </body>
</html>

135
apps/routerconsole/jsp/configlogging.jsp
View File

@ -1,67 +1,68 @@
<%@page contentType="text/html"%> <%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%> <%@page pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head> <html><head>
<title>I2P Router Console - config logging</title> <title>I2P Router Console - config logging</title>
<%@include file="css.jsp" %> <%@include file="css.jsp" %>
</head><body> </head><body>
<jsp:useBean class="net.i2p.router.web.ConfigLoggingHelper" id="logginghelper" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigLoggingHelper" id="logginghelper" scope="request" />
<jsp:setProperty name="logginghelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <jsp:setProperty name="logginghelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<%@include file="summary.jsp" %> <%@include file="summary.jsp" %>
<h1>I2P Logging Configuration</h1> <h1>I2P Logging Configuration</h1>
<div class="main" id="main"> <div class="main" id="main">
<%@include file="confignav.jsp" %> <%@include file="confignav.jsp" %>
<jsp:useBean class="net.i2p.router.web.ConfigLoggingHandler" id="formhandler" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigLoggingHandler" id="formhandler" scope="request" />
<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"> <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);
System.setProperty("net.i2p.router.web.ConfigLoggingHandler.nonce", new java.util.Random().nextLong()+""); %> System.setProperty("net.i2p.router.web.ConfigLoggingHandler.nonce", new java.util.Random().nextLong()+""); %>
<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"> <h3>Configure I2P Logging Options</h3>
<tr> <table border="0" cellspacing="5">
<td valign="top"><b>Logging filename:</b> <tr>
<td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" /> <td valign="top"><b>Logging filename:</b>
<br /> <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> <br /> <i>(the symbol '@' will be replaced during log rotation)</i>
<td valign="top"><b>Log record format:</b> <tr>
<td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" /> <td valign="top"><b>Log record format:</b>
<br /> <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" />
'm' = message)</i> <br /> <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority,
<tr> 'm' = message)</i>
<td valign="top"><b>Log date format:</b> <tr>
<td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" /> <td valign="top"><b>Log date format:</b>
<br /> <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" />
= second, 'SSS' = millisecond)</i> <br /> <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss'
<tr> = second, 'SSS' = millisecond)</i>
<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" />" /> <td valign="top"><b>Max log file size:</b>
<br /> <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" />
<tr> <br />
<td valign="top"><b>Default log level:</b> <tr>
<td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /> <br /> <i>(DEBUG and INFO are not recommended defaults, <td valign="top"><b>Default log level:</b>
as they will drastically slow down your router)</i> <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /> <br /> <i>(DEBUG and INFO are not recommended defaults,
<tr> as they will drastically slow down your router)</i>
<td valign="top"><b>Log level overrides:</b> <tr>
<td><jsp:getProperty name="logginghelper" property="logLevelTable" /> <td valign="top"><b>Log level overrides:</b>
<tr> <td><jsp:getProperty name="logginghelper" property="logLevelTable" />
<td colspan="2" valign="top"><hr> <tr>
<tr> <td colspan="2" valign="top"><hr>
<td> <tr>
<td> <div align="right"> <td>
<input type="submit" name="shouldsave" value="Save changes" /> <td> <div align="right">
<input type="reset" value="Cancel" /> <input type="submit" name="shouldsave" value="Save changes" />
</div> <input type="reset" value="Cancel" />
</table> </div>
</form> </table>
</div> </form>
</div> </div>
</body> </div>
</html> </body>
</html>

221
apps/routerconsole/jsp/configstats.jsp
View File

@ -1,110 +1,111 @@
<%@page contentType="text/html"%> <%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%> <%@page pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head> <html><head>
<title>I2P Router Console - config stats</title> <title>I2P Router Console - config stats</title>
<%@include file="css.jsp" %> <%@include file="css.jsp" %>
<script type="text/javascript"> <script type="text/javascript">
function init() function init()
{ {
checkAll = false; checkAll = false;
} }
function toggleAll(category) function toggleAll(category)
{ {
var inputs = document.getElementsByTagName("input"); var inputs = document.getElementsByTagName("input");
for(index = 0; index < inputs.length; index++) for(index = 0; index < inputs.length; index++)
{ {
if(inputs[index].id == category) if(inputs[index].id == category)
{ {
if(inputs[index].checked == 0) if(inputs[index].checked == 0)
{ {
inputs[index].checked = 1; inputs[index].checked = 1;
} }
else if(inputs[index].checked == 1) else if(inputs[index].checked == 1)
{ {
inputs[index].checked = 0; inputs[index].checked = 0;
} }
} }
if(category == '*') if(category == '*')
{ {
if (checkAll == false) if (checkAll == false)
{ {
inputs[index].checked = 1; inputs[index].checked = 1;
} }
else if (checkAll == true) else if (checkAll == true)
{ {
inputs[index].checked = 0; inputs[index].checked = 0;
} }
} }
} }
if(category == '*') if(category == '*')
{ {
if (checkAll == false) if (checkAll == false)
{ {
checkAll = true; checkAll = true;
} }
else if (checkAll == true) else if (checkAll == true)
{ {
checkAll = false; checkAll = false;
} }
} }
} }
</script> </script>
</head><body onLoad="init();"> </head><body onLoad="init();">
<%@include file="summary.jsp" %> <%@include file="summary.jsp" %>
<h1>I2P Stats Configuration</h1> <h1>I2P Stats Configuration</h1>
<div class="main" id="main"> <div class="main" id="main">
<%@include file="confignav.jsp" %> <%@include file="confignav.jsp" %>
<jsp:useBean class="net.i2p.router.web.ConfigStatsHandler" id="formhandler" scope="request" /> <jsp:useBean class="net.i2p.router.web.ConfigStatsHandler" id="formhandler" scope="request" />
<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:setProperty name="formhandler" property="*" /> <jsp:setProperty name="formhandler" property="*" />
<jsp:getProperty name="formhandler" property="allMessages" /> <jsp:getProperty name="formhandler" property="allMessages" />
<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="configure"> <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);
System.setProperty("net.i2p.router.web.ConfigStatsHandler.nonce", new java.util.Random().nextLong()+""); %> System.setProperty("net.i2p.router.web.ConfigStatsHandler.nonce", new java.util.Random().nextLong()+""); %>
<input type="hidden" name="action" value="foo" /> <input type="hidden" name="action" value="foo" />
<input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce")%>" /> <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce")%>" />
Enable full stats? <h3>Configure I2P Stat Collection</h3>
<input type="checkbox" name="isFull" value="true" <% Enable full stats?
if (statshelper.getIsFull()) { %>checked="true" <% } %>/> <input type="checkbox" name="isFull" value="true" <%
(change requires restart to take effect)<br /> if (statshelper.getIsFull()) { %>checked="true" <% } %>/>
Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br /> (change requires restart to take effect)<br />
Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<hr /> Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br />
<table> Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<hr />
<% while (statshelper.hasMoreStats()) { <table>
while (statshelper.groupRequired()) { %> <% while (statshelper.hasMoreStats()) {
<tr><td valign="top" align="left" colspan="3"> while (statshelper.groupRequired()) { %>
<b><%=statshelper.getCurrentGroupName()%></b> <tr><td valign="top" align="left" colspan="3">
(<a href="javascript: void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')">toggle all</a>) <b><%=statshelper.getCurrentGroupName()%></b>
</td></tr><tr><td>Log</td><td>Graph</td><td></td></tr><% (<a href="javascript: void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')">toggle all</a>)
} // end iterating over required groups for the current stat %> </td></tr><tr><td>Log</td><td>Graph</td><td></td></tr><%
<tr><td valign="top" align="left"> } // end iterating over required groups for the current stat %>
<a name="<%=statshelper.getCurrentStatName()%>"></a> <tr><td valign="top" align="left">
<input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" name="statList" value="<%=statshelper.getCurrentStatName()%>" <% <a name="<%=statshelper.getCurrentStatName()%>"></a>
if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %>/></td> <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" name="statList" value="<%=statshelper.getCurrentStatName()%>" <%
<td valign="top" align="left"> if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %>/></td>
<% if (statshelper.getCurrentCanBeGraphed()) { %> <td valign="top" align="left">
<input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <% <% if (statshelper.getCurrentCanBeGraphed()) { %>
if (statshelper.getCurrentIsGraphed()) { %>checked="true" <% } %>/><% } %></td> <input id="<%=statshelper.getCurrentGroupName()%>" type="checkbox" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <%
<td valign="top" align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br /> if (statshelper.getCurrentIsGraphed()) { %>checked="true" <% } %>/><% } %></td>
<%=statshelper.getCurrentStatDescription()%></td></tr><% <td valign="top" align="left"><b><%=statshelper.getCurrentStatName()%>:</b><br />
} // end iterating over all stats %> <%=statshelper.getCurrentStatDescription()%></td></tr><%
<tr><td colspan="3"><hr /></td></tr> } // end iterating over all stats %>
<tr><td><input type="checkbox" name="explicitFilter" /></td> <tr><td colspan="3"><hr /></td></tr>
<td colspan="2">Advanced filter: <tr><td><input type="checkbox" name="explicitFilter" /></td>
<input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" /></td></tr> <td colspan="2">Advanced filter:
<tr><td colspan="3"><hr /></td></tr> <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" /></td></tr>
<tr><td><input type="submit" name="shouldsave" value="Save changes" /> </td> <tr><td colspan="3"><hr /></td></tr>
<td><input type="reset" value="Cancel" /></td><td></td></tr></form> <tr><td><input type="submit" name="shouldsave" value="Save changes" /> </td>
</table> <td><input type="reset" value="Cancel" /></td><td></td></tr></form>
</div> </table>
</div> </div>
</body> </div>
</html> </body>
</html>

2
installer/resources/themes/console/dark/console.css
View File

@ -170,7 +170,7 @@ div.configure {
} }
div.messages { div.messages {
padding: 0 10px; padding: 10px;
margin: 10px 0 20px 0; margin: 10px 0 20px 0;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-khtml-border-radius: 4px; -khtml-border-radius: 4px;

2
installer/resources/themes/console/light/console.css
View File

@ -328,7 +328,7 @@ h2 {
font-size: 12pt; font-size: 12pt;
color: #001; color: #001;
letter-spacing: 0.05em; letter-spacing: 0.05em;
background: #ddf url('images/tabletile.png'); background: #ddf url('images/lightbluetile.png');
text-shadow: 0px 0px 1px rgba(0, 0, 64, 0.5); text-shadow: 0px 0px 1px rgba(0, 0, 64, 0.5);
padding: 7px 10px; padding: 7px 10px;
wordwrap: none; wordwrap: none;