diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index d14405bdb6ccd05e14adbbaf6b6f6f99e7f76727..8f506c8d0d70ced491f2efcbf97cc79930e9947a 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -6,7 +6,8 @@
<head>
<title>I2PTunnel Webmanager - List</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta htt
+p-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<% if (indexBean.allowCSS()) {
@@ -17,7 +18,7 @@
%>
</head>
<body id="tunnelListPage">
- <div id="pageHeader">
+ <div id="pageHeader">
</div>
<div id="statusMessagePanel" class="panel">
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index 933401913f622fde6c6a9d31f58604ddf62fcba7..8568db62cbc0c5396fbcce99edbec647c8bf5bc3 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -11,7 +11,7 @@
<jsp:useBean class="net.i2p.router.web.ConfigNetHelper" id="nethelper" scope="request" />
<jsp:setProperty name="nethelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
+<h1>I2P Network Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp
index d2097c252ba1e36b2a416fd568ba38b6551ce467..a2f758fc2bd0a0ad6537893814d1a1a89a6ed9d6 100644
--- a/apps/routerconsole/jsp/configadvanced.jsp
+++ b/apps/routerconsole/jsp/configadvanced.jsp
@@ -13,7 +13,9 @@
<jsp:useBean class="net.i2p.router.web.ConfigAdvancedHelper" id="advancedhelper" scope="request" />
<jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
+<h1>I2P Advanced Configuration</h1>
<div class="main" id="main">
+
<%@include file="confignav.jsp" %>
<jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" />
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp
index 701e39aff0074ea177f0903fba3e53b8b1a28918..7699eb725a7cbe0059853ce78f9cf9628d004ca3 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/apps/routerconsole/jsp/configclients.jsp
@@ -17,7 +17,7 @@ button span.hide{
<jsp:useBean class="net.i2p.router.web.ConfigClientsHelper" id="clientshelper" scope="request" />
<jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
+<h1>I2P Client Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp
index 65c0638f401827f5db6e93b00e8ec28fbc5b5688..5f31e1b3b73708e93121ec0b4aa352f9a8399fd2 100644
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/apps/routerconsole/jsp/configkeyring.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+<h1>I2P Keyring Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index d76df86c9567707c11998a62e388bb1fe9e582ee..a3f854c0ebaca89fcfb7895d55492e93e7f0b7cc 100644
--- a/apps/routerconsole/jsp/configlogging.jsp
+++ b/apps/routerconsole/jsp/configlogging.jsp
@@ -11,7 +11,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+<h1>I2P Logging Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/confignav.jsp b/apps/routerconsole/jsp/confignav.jsp
index d3cc361977233011641bfc48c7c30f39ea905ba4..ca7a7e8e855baba4fee4ef0d5eeb6634fac8998b 100644
--- a/apps/routerconsole/jsp/confignav.jsp
+++ b/apps/routerconsole/jsp/confignav.jsp
@@ -1,5 +1,6 @@
<div class="confignav" id="confignav">
<center>
+<!--
<b>
<% if (request.getRequestURI().indexOf("config.jsp") != -1) {
%>Network<% }
@@ -22,6 +23,7 @@
else if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) {
%>Advanced<% }%>
Configuration</b>
+-->
<h4><% if (request.getRequestURI().indexOf("config.jsp") != -1) {
%>Network | <% } else { %><a href="config.jsp">Network</a> | <% }
if (request.getRequestURI().indexOf("configservice.jsp") != -1) {
@@ -43,5 +45,4 @@ Configuration</b>
if (request.getRequestURI().indexOf("configadvanced.jsp") != -1) {
%>Advanced<% } else { %><a href="configadvanced.jsp">Advanced</a><% } %></h4>
</center>
-<hr />
</div>
diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp
index 62d2e209c25e879323034f837f797c1b203bd586..b465559cd151cf20330a6acedf4b7aae477dd026 100644
--- a/apps/routerconsole/jsp/configpeer.jsp
+++ b/apps/routerconsole/jsp/configpeer.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+<h1>I2P Peer Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index 9c494d81996398cec15ee9cbeb0956eaf86fa575..da4f7996f4785a865a078f4ab83e6d662004ba49 100644
--- a/apps/routerconsole/jsp/configservice.jsp
+++ b/apps/routerconsole/jsp/configservice.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+<h1>I2P Service Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index e84c5ca1f338d11ea2d378af68327c9e5f6b31c0..e2dde4c4441a0e7376deb4ac80fcecab73a7c1a5 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/apps/routerconsole/jsp/configstats.jsp
@@ -54,7 +54,7 @@ function toggleAll(category)
</head><body onLoad="init();">
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+<h1>I2P Stats Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp
index d61d14d1cbd49c72b8776bdebed77c9f20d6a791..cb195b5cab44de90bb5cdbc739938fb29f59d6e9 100644
--- a/apps/routerconsole/jsp/configtunnels.jsp
+++ b/apps/routerconsole/jsp/configtunnels.jsp
@@ -12,7 +12,7 @@
<jsp:useBean class="net.i2p.router.web.ConfigTunnelsHelper" id="tunnelshelper" scope="request" />
<jsp:setProperty name="tunnelshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
+<h1>I2P Tunnel Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp
index 0435412758a152e5ea0ef704fec227cdb827b134..3b9a28668e6d52c4a395c1071db47efaa60123d7 100644
--- a/apps/routerconsole/jsp/configupdate.jsp
+++ b/apps/routerconsole/jsp/configupdate.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+<h1>I2P Update Configuration</h1>
<div class="main" id="main">
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp
index 950610a7594cb2d14517ef1f61fc6a8af93536f4..e0a5f6cda2b6d8995876b4ffabf6d91a2297ae9d 100644
--- a/apps/routerconsole/jsp/graphs.jsp
+++ b/apps/routerconsole/jsp/graphs.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+<h1>I2P Performance Graphs</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" />
<jsp:setProperty name="graphHelper" property="*" />
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index bad68ff5e915b29a8616ac933aeb353cec3e3beb..35979439d380e3cd4c98941d9f9340a9b316208d 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -9,17 +9,20 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+<h1>I2P Router Help & Support</h1>
<div class="main" id="main">
-<h2>Help</h2>
-Sorry, there's not much help text here yet, so also check out the
-<a href="http://www.i2p2.i2p/faq.html">FAQ on www.i2p2.i2p</a>
-or the
-<a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.
-You may also try the
-<a href="http://forum.i2p/">forum</a>
-or IRC.
-<br />
+If you'd like to help improve or translate the documentation, or
+other help with other aspects of the project, please see the documentation for
+<a href="http://www.i2p2.i2p/getinvolved.html">volunteers.</a>
+<br><br>Further assistance is available here:
+<br>
+<ul>
+<li><a href="http://www.i2p2.i2p/faq.html">FAQ on www.i2p2.i2p</a>
+<li><a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.
+</ul>
+<br>
+You may also try the <a href="http://forum.i2p/">I2P forum</a>
+or IRC.<br />
<h2>Summary Bar Information</h2>
Many of the stats on the summary bar may be
diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index bc6c48a2ff439489daac9ebfb571f05aefe3907f..7ff7bec32087c5c7a1900bbf5a80f964a912004f 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -17,6 +17,7 @@ if (System.getProperty("router.consoleNonce") == null) {
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
+<h1>I2P Router Console</h1>
<div class="news" id="news">
<jsp:useBean class="net.i2p.router.web.ContentHelper" id="newshelper" scope="request" />
<% 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 b7de2b7179146c8e0b84be312b074fd6355618fd..12d1608f6336f16417d64811098f6d80b0ef84b9 100644
--- a/apps/routerconsole/jsp/jobs.jsp
+++ b/apps/routerconsole/jsp/jobs.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+ <h1>I2P Router Job Queue</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.JobQueueHelper" id="jobQueueHelper" scope="request" />
<jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index a336d8d4f7c1cf8f7f1a457ddd94c9289f175d3c..b60d25288764412c56ba604273e2f035bbdbdff5 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+ <h1>I2P Router Logs</h1>
<div class="main" id="main">
<h4>Version:</h4><a name="version"> </a>
Please include this information in bug reports.
diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp
index 6d029d7d24f9221d90398b0e8d6ba081792db87e..27c1cd2dd86de3be8280212a439f2921f149322f 100644
--- a/apps/routerconsole/jsp/netdb.jsp
+++ b/apps/routerconsole/jsp/netdb.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+ <h1>I2P Network Database Summary</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.NetDbHelper" id="netdbHelper" scope="request" />
<jsp:setProperty name="netdbHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/oldconsole.jsp b/apps/routerconsole/jsp/oldconsole.jsp
index 7aa7bbcf42d15ad8bd5175b05f66a100c7cef608..18fc955cc13bd68ced3c2c0e7a5f59f9a652d97d 100644
--- a/apps/routerconsole/jsp/oldconsole.jsp
+++ b/apps/routerconsole/jsp/oldconsole.jsp
@@ -13,7 +13,7 @@
<jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="conhelper" scope="request" />
<jsp:setProperty name="conhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<jsp:setProperty name="conhelper" property="writer" value="<%=out%>" />
-
+ <h1>I2P Router » Old Console</h1>
<div class="main" id="main">
<jsp:getProperty name="conhelper" property="console" />
</div>
diff --git a/apps/routerconsole/jsp/oldstats.jsp b/apps/routerconsole/jsp/oldstats.jsp
index 9e150eeb42a55b46bf26b474662d1eea8f32f265..43cf408feae8091f2a8119df471a549ca63b0783 100644
--- a/apps/routerconsole/jsp/oldstats.jsp
+++ b/apps/routerconsole/jsp/oldstats.jsp
@@ -13,7 +13,7 @@
<jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="oldhelper" scope="request" />
<jsp:setProperty name="oldhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<jsp:setProperty name="oldhelper" property="writer" value="<%=out%>" />
-
+ <h1>I2P Router Statistics</h1>
<div class="main" id="main">
<jsp:getProperty name="oldhelper" property="stats" />
</div>
diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp
index 778a58e727aa74db3462875db13393e4615d855d..5131e3468e50d564c90ebf14a45742c760301f6d 100644
--- a/apps/routerconsole/jsp/peers.jsp
+++ b/apps/routerconsole/jsp/peers.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+ <h1>I2P Network Peers</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.PeerHelper" id="peerHelper" scope="request" />
<jsp:setProperty name="peerHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp
index 7dd40d6b82513f5c1bed9d128717c98730eecc86..ade3b9d64266a46bcf887329a63862bfc2de120c 100644
--- a/apps/routerconsole/jsp/profiles.jsp
+++ b/apps/routerconsole/jsp/profiles.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+ <h1>I2P Network Peer Profiles</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
<jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsp
index 4b7aaa908446e928636c28f4be9d37fdc902ee55..786e48353405e1c550fb4eba7d01503a29582b0c 100644
--- a/apps/routerconsole/jsp/summary.jsp
+++ b/apps/routerconsole/jsp/summary.jsp
@@ -1,5 +1,6 @@
<% // put width here too to prevent bad layout at startup %>
-<div class="routersummaryouter" style="width: 215px;">
+
+<div class="routersummaryouter" style="width: 200px;">
<%
// skip the iframe if refresh disabled
String d = request.getParameter("refresh");
@@ -21,10 +22,10 @@
} else {
// since we don't have an iframe this will reload the base page, and
// the new delay will be passed to the iframe above
- out.print("<hr /><p><form action=\"" + request.getRequestURI() + "\" method=\"GET\">\n");
+ out.print("<hr /><p><center><form action=\"" + request.getRequestURI() + "\" method=\"GET\">\n");
out.print("<b>Refresh (s):</b> <input size=\"3\" type=\"text\" name=\"refresh\" value=\"60\" />\n");
out.print("<button type=\"submit\">Enable</button>\n");
- out.print("</form></p></div>\n");
+ out.print("</form></center></p></div>\n");
}
%>
</div>
diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp
index 9532602fa4e78701bb67b736378f0d828dc0d146..ae65c69e417cbe0729fb1e4f7ff84f90d642f964 100644
--- a/apps/routerconsole/jsp/summaryframe.jsp
+++ b/apps/routerconsole/jsp/summaryframe.jsp
@@ -13,6 +13,7 @@
<title>Summary Bar</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<%
+ out.print("<center>\n");
// try hard to avoid an error page in the iframe after shutdown
String action = request.getParameter("action");
String d = request.getParameter("refresh");
@@ -49,6 +50,7 @@
shutdownSoon = true;
}
}
+ out.print("</center>\n");
%>
<%@include file="css.jsp" %>
</head>
diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp
index c12426a85e53c96b91e8d69845a809f59c505e39..cd099e98ec53d51d743506f2d3b4a4383d2d0654 100644
--- a/apps/routerconsole/jsp/summarynoframe.jsp
+++ b/apps/routerconsole/jsp/summarynoframe.jsp
@@ -10,16 +10,34 @@
<jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="uhelper" scope="request" />
<jsp:setProperty name="uhelper" property="*" />
<jsp:setProperty name="uhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
- <center><b><a href="config.jsp" target="_top">Configuration</a> <a href="help.jsp" target="_top">Help</a></b></center>
+ <centre><a href="index.jsp" target="_top"><img src="/themes/console/images/i2plogo.png" alt="I2P Router Console" title="I2P Router Console"/></a></centre><hr />
+ <centre>
+ <u><b>I2P Services</b></u><br />
+ <a href="susimail/susimail" target="blank">Susimail</a>
+ <a href="susidns/index.jsp" target="_blank">SusiDNS</a>
+ <a href="i2psnark/" target="_blank">I2PSnark</a>
+ <a href="http://127.0.0.1:7658/" target="_blank">Eepsite</a><hr />
+ <u><b>I2P Internals</b></u><br />
+ <a href="i2ptunnel/index.jsp" target="_blank">I2PTunnel</a>
+ <a href="tunnels.jsp" target="_top">Tunnels</a>
+ <a href="profiles.jsp" target="_top">Profiles</a>
+ <a href="netdb.jsp" target="_top">NetDB</a>
+ <a href="logs.jsp" target="_top">Logs</a>
+ <a href="jobs.jsp" target="_top">Jobs</a>
+ <a href="graphs.jsp" target="_top">Graphs</a>
+ <a href="oldstats.jsp" target="_top">Stats</a> <!--
+ <a href="oldconsole.jsp" target="_top">Internals</a> -->
+ <a href="config.jsp" target="_top">Configuration</a>
+ <a href="help.jsp" target="_top">Help</a></b>
+ </center>
<hr />
-
<u><b>General</b></u><br />
<b>Ident:</b> (<a title="Your router identity is <jsp:getProperty name="helper" property="ident" />, never reveal it to anyone" href="netdb.jsp?r=." target="_top">view</a>)<br />
<b>Version:</b> <jsp:getProperty name="helper" property="version" /><br />
<b>Uptime:</b> <jsp:getProperty name="helper" property="uptime" /><br />
<b>Now:</b> <jsp:getProperty name="helper" property="time" /><br />
- <b>Reachability:</b> <a href="config.jsp#help" target="_top"><jsp:getProperty name="helper" property="reachability" /></a><%
+ <b>Reachability:</b> <a href="config.jsp#help" target="_top"><jsp:getProperty name="helper" property="reachability" /></a>
+ <%
if (helper.updateAvailable()) {
// display all the time so we display the final failure message
out.print("<br />" + update.getStatus());
@@ -30,17 +48,16 @@
if (prev != null) System.setProperty("net.i2p.router.web.UpdateHandler.noncePrev", prev);
System.setProperty("net.i2p.router.web.UpdateHandler.nonce", nonce+"");
String uri = request.getRequestURI();
- out.print("<p><form action=\"" + uri + "\" method=\"GET\">\n");
+ out.print("<p><center><form action=\"" + uri + "\" method=\"GET\">\n");
out.print("<input type=\"hidden\" name=\"updateNonce\" value=\"" + nonce + "\" />\n");
- out.print("<input type=\"submit\" value=\"Download " + uhelper.getUpdateVersion() + " Update\" /></form></p>\n");
+ out.print("<input type=\"submit\" value=\"Download " + uhelper.getUpdateVersion() + " Update\" /></form></center></p>\n");
}
}
%>
- <p>
+ <p><center>
<%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%>
- </p>
+ </center></p>
<hr />
-
<u><b><a href="peers.jsp" target="_top">Peers</a></b></u><br />
<b>Active:</b> <jsp:getProperty name="helper" property="activePeers" />/<jsp:getProperty name="helper" property="activeProfiles" /><br />
<b>Fast:</b> <jsp:getProperty name="helper" property="fastPeers" /><br />
diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp
index 61fb4eb7bd93f980064d386d5ee39f93406952cc..d6852b72f4ba009516fa1e3e2919bf5720976c2e 100644
--- a/apps/routerconsole/jsp/tunnels.jsp
+++ b/apps/routerconsole/jsp/tunnels.jsp
@@ -9,7 +9,7 @@
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+ <h1>I2P Tunnel Summary</h1>
<div class="main" id="main">
<jsp:useBean class="net.i2p.router.web.TunnelHelper" id="tunnelHelper" scope="request" />
<jsp:setProperty name="tunnelHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/build.xml b/build.xml
index 162064b05de186262490fb498928866cff49d570..36b07a136c30619003ebebe6224dde1664f93390 100644
--- a/build.xml
+++ b/build.xml
@@ -333,6 +333,14 @@
<copy todir="pkg-temp/docs/themes/console/classic/" >
<fileset dir="installer/resources/themes/console/classic/" />
</copy>
+ <!-- Add dark theme -->
+ <copy todir="pkg-temp/docs/themes/console/dark/" >
+ <fileset dir="installer/resources/themes/console/dark/" />
+ </copy>
+ <!-- Add light theme -->
+ <copy todir="pkg-temp/docs/themes/console/light/" >
+ <fileset dir="installer/resources/themes/console/light/" />
+ </copy>
</target>
<!-- this is no longer required, izpack 4.3.0 supports headless installs with java -jar i2pinstall.exe -console -->
diff --git a/history.txt b/history.txt
index fa86dcd76ef330cddac5656b4179287b439a2d00..ab69419fdadfb5134515d12082218c8fc83bf6e1 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2009-07-07 dr|z3d
+ * Introducing 2 new console themes (light & dark), in addition
+ to changes to the console navigation; navbar now resides in
+ the sidepanel and other stuff besides. More to follow!
+
2009-07-06 zzz
* Console: Fix small textareas on Opera
* EepGet: Don't send X-Accept-Encoding for non-proxied fetches
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 99077d1e013637fa26b5ac13deffaa339e3eeb28..f0bb2b8315f9a75b7e2ba3b5e3f81c471e617fbf 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -29,16 +29,18 @@ div.logo {
margin: 0em;
padding: .5em;
text-align: center;
+ display: none !important;
}
div.toolbar {
margin: 0em 0em 2em 0em;
font-weight: bold;
+ display: none !important;
}
div.routersummaryouter {
float: left;
- width: 215px;
+ width: 200px;
margin: 0;
padding: 0;
border: 0;
@@ -48,7 +50,7 @@ div.routersummaryouter {
div.routersummary {
background-color: #fafaff;
- width: 195px;
+ width: 200px;
color: inherit;
margin: 0em;
padding: 5px;
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
new file mode 100644
index 0000000000000000000000000000000000000000..3f6ef7b12bd41caa1e7f6014e6df4bd41f744829
--- /dev/null
+++ b/installer/resources/themes/console/dark/console.css
@@ -0,0 +1,457 @@
+body {
+ font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+ margin: 25px 10px 0 5px;
+ padding: 0;
+ text-align: center;
+ background-color: #000022;
+ color: white;
+ font-size: 9pt;
+}
+
+.hide {
+ display: none;
+}
+
+img {
+ border: none;
+}
+
+pre {
+ width: 98%;
+ overflow-x: scroll;
+ text-align: left;
+ font-size: 8pt;
+ font-family: "Lucida Console", Courier, mono;
+ color: #99d;
+}
+
+div.logo {
+ float: left;
+ left: 10px;
+ top: 0px;
+ padding: 10px 10px 10px 14px;
+ text-align: left;
+ font-color: #fff;
+ border: 0px solid #f00;
+ float: none;
+ margin: 0px;
+ background-color: #003;
+ display: none;
+ border-bottom: 1px solid #eef;
+}
+
+div.toolbar {
+ margin: 0;
+ padding: 10px;
+ font-weight: bold;
+ background-color: #eeeeff
+ border: 1px solid #002;
+ display: none;
+}
+
+div.toolbar a:link {
+border: 1px outset #ddddc0;
+padding: 0px 5px 1px 5px;
+line-height: 250%;
+background-color: #bbf;
+text-decoration: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
+color: #002;
+}
+
+div.toolbar a:visited {
+line-height: 250%;
+background-color: #ddf;
+}
+
+div.toolbar a:hover{
+border: 1px solid #eeeeff;
+line-height: 250%;
+background-color: #003;
+color:#ff6600
+}
+a:active{color:#900}
+
+div.routersummaryouter {
+ float: left;
+ width: 200px;
+ margin: 0 0 10px 20px;
+ padding: 0;
+ border: 0;
+ clear: left; /* fixes a bug in Opera */
+ text-align: center;
+ display: block;
+}
+
+div.routersummary {
+ width: 175px;
+ padding: 10px;
+ text-align: center;
+ border: 1px solid #9999ff;
+ background-color: #000033;
+ background: url(images/darkbluebg.png);
+ color: #eeeeff;
+ font-size: 8pt;
+ clear: left; /* fixes a bug in Opera */
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
+ float: left;
+ -moz-box-shadow: inset 0px 0px 16px 0px #009;
+}
+
+div.warning {
+ margin: 0em 1em 1em 224px;
+ padding: .5em 1em;
+ background-color: #ffefef;
+ border: medium solid #ffafaf;
+ text-align: left;
+ color: inherit;
+}
+
+div.main {
+ margin: 0px 0px 20px 215px;
+ padding: 0 15px 15px 25px;
+ background-color: #002;
+ text-align: left;
+ color: #eeeeff;
+/* border-top: 1px solid #eeeeff; */
+/* border-right: 25px solid #fff; */
+/* border-radius: 0px 0 0 4px;
+ -moz-border-radius: 4px 0 0 4px;
+ -webkit-border-radius: 4px 0 0 4px;
+ -moz-box-shadow: 0 2px 2px 1px #bbbbff;
+ -webkit-box-shadow: 0 2px 2px 1px #bbbbff;
+ box-shadow: 0 2px 2px 0px #bbbbff; */
+ width: auto;
+/* overflow-x: scroll; */
+}
+
+
+div.main textarea {
+ width: 100% !important;
+ background-color: #002;
+ color: #fff;
+ font-size: 8pt;
+ font-family: "Lucida Console", Courier, mono;
+}
+
+div.news {
+ margin: 0px 15px 20px 240px;
+ padding: 20px 30px 20px 30px;
+ border: 1px solid #99f;
+ background-color: #004;
+ color: #eeeeff;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ text-align: justify;
+ background: url(images/darkbluetile.png);
+}
+
+div.news li {
+ text-align: left;
+ list-style-type:square;
+ margin: 2px 20px 0px 30px;
+ padding: 10px 20px 1px 0px;
+ }
+
+div.confignav {
+ padding: 10px;
+ margin: 0 0px 20px 0;
+ background-color: #004;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border: 1px solid #99f;
+ background: url(images/darkbluetile.png);
+ font-size: 8pt !important;
+}
+
+div.configure {
+ padding: 15px;
+ margin: 10px 0px;
+ background-color: #005;
+ -moz-border-radius: 4px;
+ border: 1px solid #99f;
+}
+
+div.messages {
+ padding: 10px;
+ margin: 10px 0 20px 0;
+ background-color: #005;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border: 1px solid #99f;
+ background: url(images/lightbluetile.png);
+}
+
+div.messages span.error {
+ color: #dddd00;
+}
+
+div.messages span.notice {
+ font-style: italic;
+}
+
+div.messages li {
+ text-align: justify;
+ font-weight: bold;
+ list-style-image: url(images/warning_dark.png);
+ margin: 0 0 0 30px !important;
+ padding: 5px;
+ border: 0px !important;
+ }
+
+
+table {
+ border-collapse: collapse;
+ width: 100%;
+ border: 1px solid #99f;
+ margin: 5px 0px 5px 0px;
+ cell-padding: 1px;
+ font-size: 7pt;
+ background-image:url('images/darkbluetile.png');
+ }
+
+ th {
+ padding: 4px;
+ color: #eef;
+ text-align: center;
+ font-size: 8pt;
+ background-color: #004;
+ background-image:url('images/tabletitledark.png');
+ background-repeat:repeat-x;
+ }
+
+ tr:nth-child(even)
+{
+ background-image:url('images/darkerbluetile.png');
+}
+
+
+ td {
+ padding: 5px 10px;
+ color: #eef;
+/* background-color: #004; */
+ text-align: left;
+ }
+
+ tt {
+ font-size: 8pt;
+ font-family: "Lucida Console", Courier, mono;
+ font-weight: bold;
+ color: yellow;
+ /*background: black;*/
+ padding: 10px;
+ }
+
+ div.main li {
+ text-align: left;
+ list-style-type:square;
+ margin: 4px 0px 4px 30px;
+ padding: 1px 20px 1px 0px;
+ padding: 1px 20px 1px 0px;
+ border-right: 4px solid #339;
+ }
+
+ div.main li:nth-child(even){
+ text-align: left;
+ list-style-type:square;
+ margin: 4px 0px 4px 30px;
+ padding: 1px 20px 1px 0px;
+ border-right: 4px solid #339;
+ }
+
+ ol {
+ white-space: pre-wrap;
+ display: inline;
+ margin: 2px 0 0 0;
+ padding 10px 0 0 20px;
+ display: inline;
+ }
+
+ ul {
+ display: inline;
+ margin: 5px 0 0 0;
+ }
+
+code {
+ text-align: left;
+ font-size: 8pt;
+ font-family: "Lucida Console", Courier, mono;
+}
+
+a:link{color:#99f}
+a:visited{color:#7bb}
+a:hover{color:#ff6600}
+a:active{color:#900}
+
+.links {
+list-style-image: url(images/link_dark.png);
+margin: 0 5px 0 0px;
+padding: 0px 5px;
+}
+
+p {
+text-align: justify;
+}
+
+h1 {
+ text-align: left;
+ color: #bbf;
+ padding: 10px;
+ margin-left: 240px;
+ margin-bottom: 20px;
+ margin-top: 0px;
+ margin-right: 15px;
+ font-size: 16pt;
+ font-weight: bold;
+ font-style: normal;
+ text-transform: uppercase;
+ letter-spacing: 0.06em;
+ text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.9);
+ white-space: normal;
+ background-color: #004;
+ -moz-box-shadow: inset 0px 0px 16px 0px #009;
+ border: 1px solid #99f;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ background-image:url('images/darkbluebg.png');
+ background-repeat:repeat-x;
+}
+
+h2{
+ color: #99f;
+ text-shadow: 0px 0px 1px rgba(0, 0, 128, 0.9);
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-bottom-color: #99f;
+ padding-bottom: 5px;
+ wordwrap: none;
+}
+
+h2 a:hover {
+ color: #ff6600;
+ text-shadow: 0px 0px 1px rgba(255, 255, 72, 0.9);
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-bottom-color: #99f;
+ padding-bottom: 5px;
+}
+
+
+button {
+border: 1px outset #ddddc0;
+padding: 0px 3px 1px 3px;
+/*line-height: 250%;*/
+background-color: #bbf;
+text-decoration: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+font-size: 8pt;
+font-weight: bold;
+margin: 2px 3px;
+text-align: center;
+}
+
+button:hover{
+border: 1px solid #eeeeff;
+line-height: 250%;
+background-color: #003;
+color:#ff6600
+}
+
+ .underline {
+ border-bottom: 1px solid #eeeeff;
+ padding: 5px 0px 5px 0px;
+ margin: 0px 0px 10px 0px;
+ -moz-border-radius: 4px 4px 4px 4px;
+}
+
+.langbox {
+ margin: 12px 0px 15px 5px;
+ padding: 7px 5px 5px 5px;
+ border: 1px solid #99f;
+ background-color: #005;
+ color: black;
+ font-size: 8pt;
+ -moz-border-radius: 4px 4px 4px 4px;
+ -webkit-border-radius: 4px 4px 4px 4px;
+ border-radius: 4px 4px 4px 4px;
+ width:120px;
+ text-align: center;
+ float: right;
+}
+
+hr {
+color: #99f;
+background-color: #99f;
+height: 1px;
+border: 0px solid #99f;
+margin: 10px 5px;
+}
+
+sidebarlogo {
+text-align: center;
+}
+
+input {
+background-color: #002;
+color: #eef;
+margin: 10px 2px 10px 0;
+font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+font-weight: bold;
+border: 1px solid #99f;
+/*border: 1px outset #ddddc0;*/
+padding: 0px 2px 1px 2px;
+/*line-height: 250%;*/
+background-color: #001;
+text-decoration: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+input hover {
+background-color: #f00;
+color: #eef;
+margin: 10px 2px 10px 0;
+font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+font-weight: bold;
+border: 1px solid #99f;
+/*border: 1px outset #ddddc0;*/
+padding: 0px 2px 1px 2px;
+/*line-height: 250%;*/
+background-color: #001;
+text-decoration: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+select {
+ background-color: #001;
+ color: #eef;
+ margin: 10px 2px 10px 0;
+ font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+ border: 1px solid #99f;
+}
+
+textarea {
+ background-color: #001;
+ color: #eef;
+ padding: 5px;
+ margin: 5px 0;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ font-family: "Lucida Console", Courier, mono;
+}
+
+form {
+}
\ No newline at end of file
diff --git a/installer/resources/themes/console/dark/default.css b/installer/resources/themes/console/dark/default.css
new file mode 100644
index 0000000000000000000000000000000000000000..0b17efa1f12c4e25d02eab7bb3989f6c0a6b64fe
--- /dev/null
+++ b/installer/resources/themes/console/dark/default.css
@@ -0,0 +1,284 @@
+body {
+ margin : 0px;
+ padding : 0px;
+ text-align : center;
+ font-family : "Lucida Sans Unicode", Verdana, Helvetica, sans-serif;
+ background-color : #001;
+ color : #000000;
+ font-size : 11pt;
+
+ /* we've avoided Tantek Hacks so far,
+ ** but we can't avoid using the non-w3c method of
+ ** box rendering. (and therefore one of mozilla's
+ ** proprietry -moz properties (which hopefully they'll
+ ** drop soon).
+ */
+ -moz-box-sizing : border-box;
+ box-sizing : border-box;
+}
+
+div {
+ -moz-box-sizing : border-box;
+ box-sizing : border-box;
+}
+
+h4, label {
+ margin : 0px;
+ padding : 4px 2px 2px 0px;
+ float : left;
+ width : 150px;
+/* height : 24px; */
+ font-weight : bold;
+ text-align : right;
+ font-size : 1.0em;
+ -moz-box-sizing: border-box;
+ box-sizing : border-box;
+}
+
+h4 {
+ font-size : 1.2em;
+ text-align : center;
+ width : 750px;
+}
+
+a {
+ text-decoration : none;
+}
+
+form {
+ margin : 0px;
+}
+
+textarea, input, select, button, a {
+ font-family : "Lucida Sans Unicode", Verdana, Helvetica, sans-serif;
+ -moz-box-sizing : border-box;
+ box-sizing : border-box;
+ font-size : 1.0em;
+ float : left;
+}
+
+button {
+ float : none;
+}
+
+textarea {
+ border : 1px solid #9999ff;
+}
+
+br {
+ clear : left;
+}
+
+/*
+div.statusNotRunning {
+ float : left;
+ width : 82px;
+ height : 24px;
+ color : #dd0000;
+ font-weight: bold;
+}
+div.statusRunning {
+ float : left;
+ width : 82px;
+ height : 24px;
+ color : #00dd00;
+ font-weight: bold;
+}
+div.statusStarting {
+ float : left;
+ width : 82px;
+ height : 24px;
+ color : #339933;
+}
+*/
+
+div.statusNotRunning {
+ float : left;
+ width : 78px;
+ height : 24px;
+ overflow : hidden;
+ color : #dd0000;
+ padding-top: 24px;
+ background: url('images/console_status_stopped.png') 0 0 no-repeat;
+}
+div.statusRunning {
+ float : left;
+ width : 78px;
+ height : 24px;
+ overflow : hidden;
+ color : #00dd00;
+ padding-top: 24px;
+ background: url('images/console_status_running.png') 0 0 no-repeat;
+}
+div.statusStarting {
+ float : left;
+ width : 78px;
+ height : 24px;
+ overflow : hidden;
+ color : #339933;
+ padding-top: 24px;
+ background: url('images/console_status_starting.png') 0 0 no-repeat;
+}
+
+hr {
+ display : none;
+}
+
+.separator, .subdivider {
+ clear : both;
+ height : 1px;
+ margin : 3px 0px 3px 0px;
+ border-bottom : 1px solid #9999ff;
+}
+
+.subdivider {
+ border-bottom : 1px solid #9999ff;
+ padding: 5px 0px 0px 0px;
+}
+
+.freetext {
+ width : 150px;
+/* height : 22px; */
+ border : 1px solid #9999ff;
+ padding: 2px;
+ margin: 4px 0 2px 4px;
+ background-color: #002;
+ font-family: "Lucida Console", Courier, mono;
+ font-weight: bold;
+}
+
+.control {
+ margin : 0 4px 0 0;
+ padding : 0 0 2px 0;
+ overflow : hidden;
+ height : 20px;
+ width : 60px;
+ font-weight : normal;
+ background-color : #bbbbff;
+ color : black;
+ border : 1px outset #ddddc0;
+ text-align : center;
+ white-space : nowrap;
+ -moz-border-radius: 4px 4px 4px 4px;
+ border 1px solid #000022;
+ font-weight: bold;
+}
+
+.control:link {
+ color: #001;
+}
+
+.control:hover {
+
+border: 1px solid #eeeeff;
+background-color: #003;
+color:#ff6600
+}
+
+.control:active {
+ border : 2px inset;
+}
+
+.control:visited {
+ color: #001;
+}
+
+.panel {
+ width : 760px;
+ margin : 16px auto 16px auto;
+ overflow : hidden;
+ text-align : left;
+ font-size : 0.8em;
+ color: white;
+ background-color : #002;
+ background: url(images/darkbluebg.png);
+ -moz-border-radius: 4px 4px 4px 4px;
+ border: 1px solid #99f;
+ padding: 10px 20px;
+}
+
+.panel .footer {
+ float : right;
+ padding : 4px;
+}
+
+.toolbox {
+ float : right;
+}
+
+.rowItem {
+ width : 750px;
+ float : left;
+ margin : 0px;
+}
+
+.comment {
+ font-style : italic;
+}
+
+.text {
+ height : 24px;
+ width : 150px;
+ padding : 4px 0 0 2px;
+ float : left;
+ margin : 0;
+}
+
+.accessKey {
+ text-decoration : underline;
+}
+
+#globalOperationsPanel {
+ background-color : #003;
+ border : 1px solid #f22;
+ background: url(images/lightbluetile.png);
+}
+
+#globalOperationsPanel .control {
+ width : 100px;
+}
+
+.header {
+ -moz-border-radius: 4px 4px 4px 4px;
+ border 1px solid #ff0000;
+}
+
+a:link{color:#99f}
+a:visited{color:#7bb}
+a:hover{color:#ff6600}
+a:active{color:#900}
+
+input {
+background-color: #002;
+color: #eef;
+margin: 0 2px 0 2px;
+font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+font-weight: bold;
+border: 1px solid #99f;
+padding: 0px 2px 1px 2px;
+background-color: #001;
+text-decoration: none;
+}
+
+input hover {
+background-color: #f00;
+color: #eef;
+margin: 0 2px 0 2px;
+font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+font-weight: bold;
+border: 1px solid #99f;
+padding: 0px 2px 1px 2px;
+background-color: #001;
+text-decoration: none;
+}
+
+select {
+ background-color: #001;
+ color: #eef;
+margin: 0 2px 0 2px;
+ font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+ border: 1px solid #99f;
+}
+
+form {
+}
\ No newline at end of file
diff --git a/installer/resources/themes/console/dark/i2ptunnel.css b/installer/resources/themes/console/dark/i2ptunnel.css
new file mode 100644
index 0000000000000000000000000000000000000000..a60ec21d3ddc46da91e404f3acce91fff284288a
--- /dev/null
+++ b/installer/resources/themes/console/dark/i2ptunnel.css
@@ -0,0 +1,183 @@
+/* I2P Tunnel Edit Page
+*/
+
+#tunnelEditPage input {
+ width : 458px;
+}
+
+#tunnelEditPage select {
+ width : 308px;
+}
+
+#tunnelEditPage option[selected] {
+ color: green;
+}
+
+#tunnelEditPage #targetField,
+#tunnelEditPage #accessField,
+#tunnelEditPage #optionsField {
+ height : 48px;
+ width : 150px;
+}
+#tunnelEditPage #tunnelOptionsField {
+ height : 96px;
+ width : 150px;
+}
+
+#tunnelEditPage #targetField label,
+#tunnelEditPage #accessField label,
+#tunnelEditPage #tunnelOptionsField label,
+#tunnelEditPage #optionsField label{
+ height : 48px;
+ width : 150px;
+}
+
+#tunnelEditPage #reachField,
+#tunnelEditPage #hostField,
+#tunnelEditPage #depthField,
+#tunnelEditPage #countField,
+#tunnelEditPage #optionsHostField {
+ width : 304px;
+ margin-right: 4px;
+}
+
+#tunnelEditPage #portField,
+#tunnelEditPage #optionsPortField,
+#tunnelEditPage #backupField,
+#tunnelEditPage #varianceField {
+ width : 150px;
+
+}
+
+#tunnelEditPage #reachField label,
+#tunnelEditPage #hostField label,
+#tunnelEditPage #portField label,
+#tunnelEditPage #optionsHostField label,
+#tunnelEditPage #optionsPortField label,
+#tunnelEditPage #depthField label,
+#tunnelEditPage #countField label,
+#tunnelEditPage #backupField label,
+#tunnelEditPage #varianceField label {
+ text-align : left;
+
+}
+
+#tunnelEditPage #otherField label {
+ width : 300px;
+}
+
+#tunnelEditPage #reachableByOther,
+#tunnelEditPage #tunnelDepth,
+#tunnelEditPage #tunnelQuantity,
+#tunnelEditPage #targetHost,
+#tunnelEditPage #clientHost {
+ width : 306px;
+}
+
+#tunnelEditPage #port {
+ width : 80px;
+}
+
+#tunnelEditPage #targetPort,
+#tunnelEditPage #clientPort,
+#tunnelEditPage #tunnelBackupQuantity,
+#tunnelEditPage #tunnelVariance {
+ width : 150px;
+}
+
+#tunnelEditPage #shared,
+#tunnelEditPage #connectDelay,
+#tunnelEditPage #startOnLoad {
+ width : 16px;
+}
+
+#tunnelEditPage label {
+ width : 150px;
+ font-weight : bold;
+ text-align : right;
+ float : left;
+}
+
+/* I2P Tunnel List Page
+*/
+
+#tunnelListPage .rowItem {
+ width : 150px;
+}
+
+#tunnelListPage select {
+ width : 150px;
+}
+
+#tunnelListPage textarea {
+ width : 100%;
+ height : 100px;
+ padding : 0 0 0 4px;
+ margin: 1px 0 4px 0;
+ background-color: #000088;
+ color: #fff;
+ font-family : "Lucida Console", "Andale Mono", "Courier New", Courier, mono;
+ border: 1px inset #002;
+}
+
+#tunnelListPage .footer .control {
+ margin-left: 2px;
+}
+
+#tunnelListPage .footer label {
+ text-align : right;
+ height : 24px;
+ width : 360px;
+ float : left;
+
+}
+
+/* Use Leary and Langridge content replacement methods (LIR)
+** to embed accessibility information into the document.
+** Should allow the lists to be rendered nicely by
+** screen readers. (and lynx!)
+*/
+
+#tunnelListPage label {
+ height : 0;
+ width : 0;
+ overflow : hidden;
+}
+
+#tunnelListPage .nameHeaderField label,
+#tunnelListPage .portHeaderField label,
+#tunnelListPage .typeHeaderField label,
+#tunnelListPage .interfaceHeaderField label,
+#tunnelListPage .targetHeaderField label,
+#tunnelListPage .previewHeaderField label,
+#tunnelListPage .statusHeaderField label {
+ text-align : left;
+ width : 150px;
+ height : 24px;
+ float : left;
+}
+
+#tunnelListPage .targetField,
+#tunnelListPage .targetField .text,
+#tunnelListPage .targetHeaderField,
+#tunnelListPage .targetHeaderField label {
+ width : 300px;
+}
+
+#tunnelListPage .descriptionField,
+#tunnelListPage .destinationField {
+ width : 750px;
+}
+
+#tunnelListPage .descriptionField .text,
+#tunnelListPage .destinationField input {
+ width : 450px;
+}
+
+#tunnelListPage .descriptionField label,
+#tunnelListPage .destinationField label {
+ text-align : right;
+ width : 150px;
+ height : 24px;
+ float : left;
+}
diff --git a/installer/resources/themes/console/dark/images/console_status_running.png b/installer/resources/themes/console/dark/images/console_status_running.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bbc5e37aad0b1118ccc86b31e985c75832ab5e3
Binary files /dev/null and b/installer/resources/themes/console/dark/images/console_status_running.png differ
diff --git a/installer/resources/themes/console/dark/images/console_status_starting.png b/installer/resources/themes/console/dark/images/console_status_starting.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbff2340912a95cc59554a5c36fb8d8dfbdf4fe5
Binary files /dev/null and b/installer/resources/themes/console/dark/images/console_status_starting.png differ
diff --git a/installer/resources/themes/console/dark/images/console_status_stopped.png b/installer/resources/themes/console/dark/images/console_status_stopped.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d43eb4eab436a06e60a33922f27638db4e327e0
Binary files /dev/null and b/installer/resources/themes/console/dark/images/console_status_stopped.png differ
diff --git a/installer/resources/themes/console/dark/images/darkbluebg.png b/installer/resources/themes/console/dark/images/darkbluebg.png
new file mode 100644
index 0000000000000000000000000000000000000000..32a0972b94e66a702def8f4a8a3c62cb3d5bd42b
Binary files /dev/null and b/installer/resources/themes/console/dark/images/darkbluebg.png differ
diff --git a/installer/resources/themes/console/dark/images/darkbluetile.png b/installer/resources/themes/console/dark/images/darkbluetile.png
new file mode 100644
index 0000000000000000000000000000000000000000..89df70b960574329efe68890e5c3303e8bbefef4
Binary files /dev/null and b/installer/resources/themes/console/dark/images/darkbluetile.png differ
diff --git a/installer/resources/themes/console/dark/images/darkerbluetile.png b/installer/resources/themes/console/dark/images/darkerbluetile.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e28effafc342c4f06f859247988538ed3ed5ecd
Binary files /dev/null and b/installer/resources/themes/console/dark/images/darkerbluetile.png differ
diff --git a/installer/resources/themes/console/dark/images/h1bg.png b/installer/resources/themes/console/dark/images/h1bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd2ce33886bd43f3efb27b64860edfb2a0e91da6
Binary files /dev/null and b/installer/resources/themes/console/dark/images/h1bg.png differ
diff --git a/installer/resources/themes/console/dark/images/i2plogo.png b/installer/resources/themes/console/dark/images/i2plogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..52d1fd6c7d7e7f5ccd9c1cac26f5502a4549d007
Binary files /dev/null and b/installer/resources/themes/console/dark/images/i2plogo.png differ
diff --git a/installer/resources/themes/console/dark/images/lightbluetile.png b/installer/resources/themes/console/dark/images/lightbluetile.png
new file mode 100644
index 0000000000000000000000000000000000000000..f31f7cd8ed420d91d8546bb59cd3f9cd643ac2d4
Binary files /dev/null and b/installer/resources/themes/console/dark/images/lightbluetile.png differ
diff --git a/installer/resources/themes/console/dark/images/link.png b/installer/resources/themes/console/dark/images/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0eba7969888b86b7f9b554434dc9750c1218c9e
Binary files /dev/null and b/installer/resources/themes/console/dark/images/link.png differ
diff --git a/installer/resources/themes/console/dark/images/link_dark.png b/installer/resources/themes/console/dark/images/link_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..e33c92544f0daf08363c3a6156beb43d1f22d4b4
Binary files /dev/null and b/installer/resources/themes/console/dark/images/link_dark.png differ
diff --git a/installer/resources/themes/console/dark/images/tabletitledark.png b/installer/resources/themes/console/dark/images/tabletitledark.png
new file mode 100644
index 0000000000000000000000000000000000000000..2616ec7a68cdbd6679c11b118b19ace0ea7a9878
Binary files /dev/null and b/installer/resources/themes/console/dark/images/tabletitledark.png differ
diff --git a/installer/resources/themes/console/dark/images/warning_dark.png b/installer/resources/themes/console/dark/images/warning_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..198786c505487374d9770c3d80a0d7683191f166
Binary files /dev/null and b/installer/resources/themes/console/dark/images/warning_dark.png differ
diff --git a/installer/resources/themes/console/images/i2plogo.png b/installer/resources/themes/console/images/i2plogo.png
index ee5c91da2a3fbb7b5bd589f18dada5146510eac3..52d1fd6c7d7e7f5ccd9c1cac26f5502a4549d007 100644
Binary files a/installer/resources/themes/console/images/i2plogo.png and b/installer/resources/themes/console/images/i2plogo.png differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
new file mode 100644
index 0000000000000000000000000000000000000000..c1caddfcff67afa34bb641047c261d4c4db78354
--- /dev/null
+++ b/installer/resources/themes/console/light/console.css
@@ -0,0 +1,428 @@
+body {
+ font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+ margin: 25px 10px 0 5px;
+ padding: 0em;
+ text-align: center;
+ background-color: #fff;
+ color: black;
+/* font-size: 100%; */
+ font-size: 9pt;
+}
+
+.hide {
+ display: none;
+}
+
+img {
+ border: none;
+}
+
+pre {
+ width: 98%;
+ overflow-x: scroll;
+ text-align: left;
+ font-size: 8pt;
+ font-family: "Lucida Console", Courier, mono;
+ color: #333;
+}
+
+div.logo {
+ float: left;
+ left: 10px;
+ top: 0px;
+ padding: 10px 10px 10px 14px;
+ text-align: left;
+ font-color: #fff;
+ border: 0px solid #f00;
+ float: none;
+ margin: 0px;
+ background-color: #003;
+ display: block;
+ border: 1px solid #002;
+ display: none;
+}
+
+div.toolbar {
+ margin: 0;
+ padding: 10px;
+ font-weight: bold;
+ background-color: #eeeeff
+ border: 1px solid #002;
+ display: none;
+}
+
+div.toolbar a:link {
+border: 1px outset #ddddc0;
+padding: 0px 5px 1px 5px;
+line-height: 250%;
+background-color: #bbf;
+text-decoration: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+div.toolbar a:visited {
+line-height: 250%;
+background-color: #ddf;
+}
+
+div.toolbar a:hover{
+border: 1px solid #eeeeff;
+line-height: 250%;
+background-color: #003;
+color:#ff6600
+}
+a:active{color:#900}
+
+div.routersummaryouter {
+ float: left;
+ width: 215px;
+ margin: 0 0 10px 20px;
+ padding: 0px 0 0 0;
+ border: 0;
+ clear: left; /* fixes a bug in Opera */
+ text-align: center;
+ display: block;
+}
+
+div.routersummary {
+/* margin: 0px 20px 20px 0px; */
+ width: auto;
+ padding: 10px;
+ text-align: center;
+ border: 1px solid #000033;
+ background-color: #ddddff;
+ color: black;
+ font-size: 8pt;
+ clear: left; /* fixes a bug in Opera */
+ -moz-border-radius: 4px 4px 4px 4px;
+ -webkit-border-radius: 4px 4px 4px 4px;
+ float: left;
+ -moz-box-shadow: inset 0px 0px 16px 1px #eef;
+ background-image: url('images/lightbluetile.png');
+}
+
+div.warning {
+ margin: 0em 1em 1em 224px;
+ padding: .5em 1em;
+ background-color: #ffefef;
+ border: medium solid #ffafaf;
+ text-align: left;
+ color: inherit;
+}
+
+div.main {
+ margin: 0px 0px 20px 220px;
+ padding: 0 15px 15px 25px;
+ background-color: #fff;
+ text-align: left;
+ color: #000011;
+ width: auto;
+/* overflow-x: scroll; */
+}
+
+div.main hr {
+color: #003;
+background-color: #003;
+height: 1px;
+border: 0px solid #003;
+margin: 10px 0;
+}
+
+div.main textarea {
+ width: 100% !important;
+}
+
+div.news {
+ margin: 0px 15px 20px 245px;
+ padding: 20px 30px 20px 30px;
+ border: 1px solid #003;
+ background-color: #ffeeaa;
+ color: #001;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ text-align: justify;
+}
+
+div.confignav {
+ padding: 10px;
+ margin: 0 0px 25px 0;
+ background-color: #ddddff;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border: 1px solid #000022;
+ background-image: url('images/tabletile.png');
+}
+
+div.configure {
+ padding: 1em;
+ margin: 10px 0px 25px 0;
+ background-color: #ddf;
+ -moz-border-radius: 4px;
+ border: 1px solid #000022;
+}
+
+div.messages {
+ padding: 0 10px 0 15px;
+ margin: 10px 0 20px 0;
+ background-color: #ddf;
+ background: url(images/tabletile_alt.png);
+ -moz-border-radius: 4px;
+ border: 1px solid #000033;
+ text-size: 9pt;
+}
+
+div.messages span.error {
+ color: #d00000;
+}
+
+div.messages span.notice {
+ font-style: italic;
+}
+
+div.messages li {
+ text-align: justify;
+ font-weight: bold;
+ list-style-image: url(images/warning.png);
+ margin: 0 10px 0 30px;
+ padding: 5px;
+ }
+
+table {
+ border-collapse: collapse;
+ width: 100%;
+ border: 1px solid #000022;
+ margin: 5px 0px 5px 0px;
+ cell-padding: 1px;
+ font-size: 7pt;
+ }
+
+ th {
+ padding: 4px;
+ color: black;
+ background-color: #b4c8ff;
+ text-align: center;
+ background-image: url('images/tabletitlelight.png');
+ background-repeat:repeat-x;
+ font-size: 8pt;
+ }
+
+
+tr:nth-child(even) {
+ background-image: url('images/tabletile.png');
+ }
+
+ tr:nth-child(odd) {
+ background-image: url('images/tabletile_alt.png');
+ }
+
+ td {
+ padding: 5px;
+ color: black;
+ /*background-color: #ffc;*/
+ text-align: left;
+ }
+
+ tt {
+ font-size: 8pt;
+ font-family: "Lucida Console", Courier, mono;
+ font-weight: bold;
+ color: green;
+ /*background: black;*/
+ padding: 1px 5px;
+ }
+
+ li {
+ text-align: left;
+ list-style-type:square;
+ margin: 2px 20px 0px 30px;
+ padding: 1px 20px 1px 0px;
+ }
+
+ ol {
+ white-space: pre-wrap;
+ display: inline;
+ margin: 2px 0 0 0;
+ padding 10px 0 0 20px;
+ display: inline;
+ }
+
+ ul {
+ display: inline;
+ margin: 5px 0 0 0;
+ }
+
+code {
+ text-align: left;
+ font-size: 8pt;
+ font-family: "Lucida Console", Courier, mono;
+}
+
+a:link{color:#007}
+a:visited{color:#606}
+a:hover{color:#ff6600}
+a:active{color:#900}
+
+.links {
+list-style-image: url(images/link.png);
+margin: 0 5px 0 0px;
+padding: 0px 5px;
+}
+
+p {
+text-align: justify;
+}
+
+h1 {
+ text-align: left;
+ color: #000022;
+ padding: 10px;
+ margin-bottom: 25px;
+ margin-top: 0px;
+ margin-left: 245px;
+ margin-right: 15px;
+ font-size: 16pt;
+ font-weight: bold;
+ font-style: normal;
+ letter-spacing: 0.06em;
+ text-transform: uppercase;
+ text-shadow: 0px 0px 1px rgba(0, 0, 176, 0.9);
+ white-space: normal;
+ background-color: #ddddff;
+ border: 1px solid #002;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ background-image: url('images/lightbluetile.png');
+}
+
+h2{
+ color: #000011;
+ text-shadow: 0px 0px 1px rgba(0, 0, 128, 0.9);
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-bottom-color: #000022;
+ padding-bottom: 5px;
+ wordwrap: none;
+}
+
+h2 a:hover {
+ color: #ff6600;
+ text-shadow: 0px 0px 1px rgba(255, 255, 72, 0.9);
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-bottom-color: #000022;
+ padding-bottom: 5px;
+}
+
+
+button {
+border: 1px outset #ddddc0;
+padding: 0px 3px 1px 3px;
+line-height: 250%;
+background-color: #bbf;
+text-decoration: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+font-size: 8pt;
+font-weight: bold;
+margin: 2px 3px;
+text-align: center;
+}
+
+button:hover{
+border: 1px solid #001;
+line-height: 250%;
+background-color: #003;
+color:#ff6600
+}
+
+ .underline {
+ border-bottom: 1px solid #000022;
+ padding: 5px 0px 5px 0px;
+ margin: 0px 0px 10px 0px;
+ -moz-border-radius: 4px 4px 4px 4px;
+ }
+
+.langbox {
+ margin: 12px 0px 15px 5px;
+ padding: 7px 5px 5px 5px;
+ border: 1px solid #002;
+ background-color: #e4e4ff;
+ color: black;
+ font-size: 8pt;
+ -moz-border-radius: 4px 4px 4px 4px;
+ -webkit-border-radius: 4px 4px 4px 4px;
+ border-radius: 4px 4px 4px 4px;
+ width:120px;
+ text-align: center;
+ float: right;
+ background-image:url('images/lightbluetile.png');
+}
+
+hr {
+color: #003;
+background-color: #003;
+height: 1px;
+border: 0px solid #003;
+margin: 10px 5px;
+}
+
+input {
+background-color: #eef;
+color: #003;
+margin: 5px 10px 5px 10px;
+font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+font-weight: bold;
+border: 1px solid #001;
+/*border: 1px outset #ddddc0;*/
+padding: 0px 2px 1px 2px;
+/*line-height: 250%;*/
+text-decoration: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+submit {
+background-color: #f00;
+color: #eef;
+margin: 10px 2px 10px 0;
+font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+font-weight: bold;
+border: 1px solid #001;
+/*border: 1px outset #ddddc0;*/
+padding: 0px 2px 1px 2px;
+/*line-height: 250%;*/
+background-color: #001;
+text-decoration: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+select {
+ background-color: #eef;
+ color: #003;
+ margin: 5px 10px 5px 10px;
+ font-family: "Lucida Sans Unicode", Verdana, Tahoma, Helvetica, sans-serif;
+ border: 1px solid #001;
+}
+
+textarea {
+ padding: 5px;
+ margin: 5px 0;
+ background-color: #eef;
+ color: #003;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ font-family: "Lucida Console", Courier, mono;
+ font-size: 8pt;
+}
+
+form {
+}
\ No newline at end of file
diff --git a/installer/resources/themes/console/light/default.css b/installer/resources/themes/console/light/default.css
new file mode 100644
index 0000000000000000000000000000000000000000..bb86f4ca2ca2cccaf82979cb00531bfb191d0539
--- /dev/null
+++ b/installer/resources/themes/console/light/default.css
@@ -0,0 +1,233 @@
+body {
+ margin : 0px;
+ padding : 0px;
+ text-align : center;
+ font-family : "Lucida Sans Unicode", Verdana, Helvetica, sans-serif;
+ background-color : #eeeeff;
+ color : #000000;
+ font-size : 11pt;
+
+ /* we've avoided Tantek Hacks so far,
+ ** but we can't avoid using the non-w3c method of
+ ** box rendering. (and therefore one of mozilla's
+ ** proprietry -moz properties (which hopefully they'll
+ ** drop soon).
+ */
+ -moz-box-sizing : border-box;
+ box-sizing : border-box;
+}
+
+div {
+ -moz-box-sizing : border-box;
+ box-sizing : border-box;
+}
+
+h4, label {
+ margin : 0px;
+ padding : 2px 2px 2px 0px;
+ float : left;
+ width : 150px;
+ height : 24px;
+ font-weight : bold;
+ text-align : right;
+ font-size : 1.0em;
+ -moz-box-sizing: border-box;
+ box-sizing : border-box;
+}
+
+h4 {
+ font-size : 1.2em;
+ text-align : center;
+ width : 750px;
+}
+
+a {
+ text-decoration : none;
+}
+
+form {
+ margin : 0px;
+}
+
+textarea, input, select, button, a {
+ font-family : "Lucida Sans Unicode", Verdana, Helvetica, sans-serif;
+ -moz-box-sizing : border-box;
+ box-sizing : border-box;
+ font-size : 1.0em;
+ float : left;
+}
+
+button {
+ float : none;
+}
+
+textarea {
+ border : 1px solid #9999ff;
+}
+
+br {
+ clear : left;
+}
+
+/*
+div.statusNotRunning {
+ float : left;
+ width : 82px;
+ height : 24px;
+ color : #dd0000;
+ font-weight: bold;
+}
+div.statusRunning {
+ float : left;
+ width : 82px;
+ height : 24px;
+ color : #00dd00;
+ font-weight: bold;
+}
+div.statusStarting {
+ float : left;
+ width : 82px;
+ height : 24px;
+ color : #339933;
+}
+*/
+
+div.statusNotRunning {
+ float : left;
+ width : 78px;
+ height : 24px;
+ overflow : hidden;
+ color : #dd0000;
+ padding-top: 24px;
+ background: url('images/console_status_stopped.png') 0 0 no-repeat;
+}
+div.statusRunning {
+ float : left;
+ width : 78px;
+ height : 24px;
+ overflow : hidden;
+ color : #00dd00;
+ padding-top: 24px;
+ background: url('images/console_status_running.png') 0 0 no-repeat;
+}
+div.statusStarting {
+ float : left;
+ width : 78px;
+ height : 24px;
+ overflow : hidden;
+ color : #339933;
+ padding-top: 24px;
+ background: url('images/console_status_starting.png') 0 0 no-repeat;
+}
+
+hr {
+ display : none;
+}
+
+.separator, .subdivider {
+ clear : both;
+ height : 1px;
+ margin : 3px 0px 3px 0px;
+ border-bottom : 1px solid #9999ff;
+}
+
+.subdivider {
+ border-bottom : 1px solid #9999ff;
+ padding: 5px 0px 0px 0px;
+}
+
+.freetext {
+ width : 150px;
+ height : 22px;
+ border : 1px solid #9999ff;
+}
+
+.control {
+ margin : 0 4px 0 0;
+ padding : 2px 0 2px 0;
+ overflow : hidden;
+ height : 22px;
+ width : 60px;
+ font-weight : normal;
+ background-color : #bbbbff;
+ color : black;
+ border : 1px outset #ddddc0;
+ text-align : center;
+ white-space : nowrap;
+ -moz-border-radius: 4px 4px 4px 4px;
+ border 1px solid #000022;
+ font-weight: bold;
+}
+
+.control:hover {
+/*
+ color: #fff;
+ background-color : #3333ff;
+ border 0px none #000022;
+*/
+border: 1px solid #eeeeff;
+background-color: #003;
+color:#ff6600
+}
+
+.control:active {
+ border : 2px inset;
+}
+
+.panel {
+ width : 760px;
+ margin : 16px auto 16px auto;
+ overflow : hidden;
+ text-align : left;
+ font-size : 0.8em;
+ background-color : #fff;
+ background: url(images/tabletile.png);
+ -moz-border-radius: 4px 4px 4px 4px;
+ border: 1px solid #002;
+ padding: 10px 20px;
+}
+
+.panel .footer {
+ float : right;
+ padding : 4px;
+}
+
+.toolbox {
+ float : right;
+}
+
+.rowItem {
+ width : 750px;
+ float : left;
+ margin : 0px;
+}
+
+.comment {
+ font-style : italic;
+}
+
+.text {
+ height : 24px;
+ width : 150px;
+ padding : 2px 0 0 2px;
+ float : left;
+ margin : 0;
+}
+
+.accessKey {
+ text-decoration : underline;
+}
+
+#globalOperationsPanel {
+ background-color : #ddddff;
+ border : 1px solid #f22;
+}
+
+#globalOperationsPanel .control {
+ width : 100px;
+}
+
+.header {
+ -moz-border-radius: 4px 4px 4px 4px;
+ border 1px solid #ff0000;
+}
\ No newline at end of file
diff --git a/installer/resources/themes/console/light/i2ptunnel.css b/installer/resources/themes/console/light/i2ptunnel.css
new file mode 100644
index 0000000000000000000000000000000000000000..a60ec21d3ddc46da91e404f3acce91fff284288a
--- /dev/null
+++ b/installer/resources/themes/console/light/i2ptunnel.css
@@ -0,0 +1,183 @@
+/* I2P Tunnel Edit Page
+*/
+
+#tunnelEditPage input {
+ width : 458px;
+}
+
+#tunnelEditPage select {
+ width : 308px;
+}
+
+#tunnelEditPage option[selected] {
+ color: green;
+}
+
+#tunnelEditPage #targetField,
+#tunnelEditPage #accessField,
+#tunnelEditPage #optionsField {
+ height : 48px;
+ width : 150px;
+}
+#tunnelEditPage #tunnelOptionsField {
+ height : 96px;
+ width : 150px;
+}
+
+#tunnelEditPage #targetField label,
+#tunnelEditPage #accessField label,
+#tunnelEditPage #tunnelOptionsField label,
+#tunnelEditPage #optionsField label{
+ height : 48px;
+ width : 150px;
+}
+
+#tunnelEditPage #reachField,
+#tunnelEditPage #hostField,
+#tunnelEditPage #depthField,
+#tunnelEditPage #countField,
+#tunnelEditPage #optionsHostField {
+ width : 304px;
+ margin-right: 4px;
+}
+
+#tunnelEditPage #portField,
+#tunnelEditPage #optionsPortField,
+#tunnelEditPage #backupField,
+#tunnelEditPage #varianceField {
+ width : 150px;
+
+}
+
+#tunnelEditPage #reachField label,
+#tunnelEditPage #hostField label,
+#tunnelEditPage #portField label,
+#tunnelEditPage #optionsHostField label,
+#tunnelEditPage #optionsPortField label,
+#tunnelEditPage #depthField label,
+#tunnelEditPage #countField label,
+#tunnelEditPage #backupField label,
+#tunnelEditPage #varianceField label {
+ text-align : left;
+
+}
+
+#tunnelEditPage #otherField label {
+ width : 300px;
+}
+
+#tunnelEditPage #reachableByOther,
+#tunnelEditPage #tunnelDepth,
+#tunnelEditPage #tunnelQuantity,
+#tunnelEditPage #targetHost,
+#tunnelEditPage #clientHost {
+ width : 306px;
+}
+
+#tunnelEditPage #port {
+ width : 80px;
+}
+
+#tunnelEditPage #targetPort,
+#tunnelEditPage #clientPort,
+#tunnelEditPage #tunnelBackupQuantity,
+#tunnelEditPage #tunnelVariance {
+ width : 150px;
+}
+
+#tunnelEditPage #shared,
+#tunnelEditPage #connectDelay,
+#tunnelEditPage #startOnLoad {
+ width : 16px;
+}
+
+#tunnelEditPage label {
+ width : 150px;
+ font-weight : bold;
+ text-align : right;
+ float : left;
+}
+
+/* I2P Tunnel List Page
+*/
+
+#tunnelListPage .rowItem {
+ width : 150px;
+}
+
+#tunnelListPage select {
+ width : 150px;
+}
+
+#tunnelListPage textarea {
+ width : 100%;
+ height : 100px;
+ padding : 0 0 0 4px;
+ margin: 1px 0 4px 0;
+ background-color: #000088;
+ color: #fff;
+ font-family : "Lucida Console", "Andale Mono", "Courier New", Courier, mono;
+ border: 1px inset #002;
+}
+
+#tunnelListPage .footer .control {
+ margin-left: 2px;
+}
+
+#tunnelListPage .footer label {
+ text-align : right;
+ height : 24px;
+ width : 360px;
+ float : left;
+
+}
+
+/* Use Leary and Langridge content replacement methods (LIR)
+** to embed accessibility information into the document.
+** Should allow the lists to be rendered nicely by
+** screen readers. (and lynx!)
+*/
+
+#tunnelListPage label {
+ height : 0;
+ width : 0;
+ overflow : hidden;
+}
+
+#tunnelListPage .nameHeaderField label,
+#tunnelListPage .portHeaderField label,
+#tunnelListPage .typeHeaderField label,
+#tunnelListPage .interfaceHeaderField label,
+#tunnelListPage .targetHeaderField label,
+#tunnelListPage .previewHeaderField label,
+#tunnelListPage .statusHeaderField label {
+ text-align : left;
+ width : 150px;
+ height : 24px;
+ float : left;
+}
+
+#tunnelListPage .targetField,
+#tunnelListPage .targetField .text,
+#tunnelListPage .targetHeaderField,
+#tunnelListPage .targetHeaderField label {
+ width : 300px;
+}
+
+#tunnelListPage .descriptionField,
+#tunnelListPage .destinationField {
+ width : 750px;
+}
+
+#tunnelListPage .descriptionField .text,
+#tunnelListPage .destinationField input {
+ width : 450px;
+}
+
+#tunnelListPage .descriptionField label,
+#tunnelListPage .destinationField label {
+ text-align : right;
+ width : 150px;
+ height : 24px;
+ float : left;
+}
diff --git a/installer/resources/themes/console/light/images/Copy of console_status_starting.png b/installer/resources/themes/console/light/images/Copy of console_status_starting.png
new file mode 100644
index 0000000000000000000000000000000000000000..17326d925d059278c8a146e9053d741b6349d631
Binary files /dev/null and b/installer/resources/themes/console/light/images/Copy of console_status_starting.png differ
diff --git a/installer/resources/themes/console/light/images/console_status_running.png b/installer/resources/themes/console/light/images/console_status_running.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bbc5e37aad0b1118ccc86b31e985c75832ab5e3
Binary files /dev/null and b/installer/resources/themes/console/light/images/console_status_running.png differ
diff --git a/installer/resources/themes/console/light/images/console_status_starting.png b/installer/resources/themes/console/light/images/console_status_starting.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbff2340912a95cc59554a5c36fb8d8dfbdf4fe5
Binary files /dev/null and b/installer/resources/themes/console/light/images/console_status_starting.png differ
diff --git a/installer/resources/themes/console/light/images/console_status_stopped.png b/installer/resources/themes/console/light/images/console_status_stopped.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d43eb4eab436a06e60a33922f27638db4e327e0
Binary files /dev/null and b/installer/resources/themes/console/light/images/console_status_stopped.png differ
diff --git a/installer/resources/themes/console/light/images/darkbluetile.png b/installer/resources/themes/console/light/images/darkbluetile.png
new file mode 100644
index 0000000000000000000000000000000000000000..89df70b960574329efe68890e5c3303e8bbefef4
Binary files /dev/null and b/installer/resources/themes/console/light/images/darkbluetile.png differ
diff --git a/installer/resources/themes/console/light/images/darkerbluetile.png b/installer/resources/themes/console/light/images/darkerbluetile.png
new file mode 100644
index 0000000000000000000000000000000000000000..854d46f40c06681bd6ad567f51264a5198679350
Binary files /dev/null and b/installer/resources/themes/console/light/images/darkerbluetile.png differ
diff --git a/installer/resources/themes/console/light/images/i2plogo.png b/installer/resources/themes/console/light/images/i2plogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..52d1fd6c7d7e7f5ccd9c1cac26f5502a4549d007
Binary files /dev/null and b/installer/resources/themes/console/light/images/i2plogo.png differ
diff --git a/installer/resources/themes/console/light/images/lightbluetile.png b/installer/resources/themes/console/light/images/lightbluetile.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7fc6c1f12ab57637c3c0858a74ad87643a76b28
Binary files /dev/null and b/installer/resources/themes/console/light/images/lightbluetile.png differ
diff --git a/installer/resources/themes/console/light/images/link.png b/installer/resources/themes/console/light/images/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0eba7969888b86b7f9b554434dc9750c1218c9e
Binary files /dev/null and b/installer/resources/themes/console/light/images/link.png differ
diff --git a/installer/resources/themes/console/light/images/tabletile.png b/installer/resources/themes/console/light/images/tabletile.png
new file mode 100644
index 0000000000000000000000000000000000000000..f34c0632479b019d2b68c852a705323e6e5767ce
Binary files /dev/null and b/installer/resources/themes/console/light/images/tabletile.png differ
diff --git a/installer/resources/themes/console/light/images/tabletile_alt.png b/installer/resources/themes/console/light/images/tabletile_alt.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea691b8e20a44f5e4ac278ad6693b95984c58bb4
Binary files /dev/null and b/installer/resources/themes/console/light/images/tabletile_alt.png differ
diff --git a/installer/resources/themes/console/light/images/tabletitlelight.png b/installer/resources/themes/console/light/images/tabletitlelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c9092e7372739d8bd1deeabd0c125a81dc29c6e
Binary files /dev/null and b/installer/resources/themes/console/light/images/tabletitlelight.png differ
diff --git a/installer/resources/themes/console/light/images/warning.png b/installer/resources/themes/console/light/images/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2b7e8c098c275410860bf6ac25743c25c8b782d
Binary files /dev/null and b/installer/resources/themes/console/light/images/warning.png differ
diff --git a/installer/resources/themes/i2plogo.png b/installer/resources/themes/i2plogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..52d1fd6c7d7e7f5ccd9c1cac26f5502a4549d007
Binary files /dev/null and b/installer/resources/themes/i2plogo.png differ
diff --git a/readme.html b/readme.html
index 715ca510caff1266c1bc422d23bdfcbb2ac76f31..3b95e801aa8609611b56e06fd6831896b79c9390 100644
--- a/readme.html
+++ b/readme.html
@@ -1,13 +1,18 @@
-<p align=right><font size="-1">English | <a href="/index.jsp?lang=zh">Chinese</a> | <a href="/index.jsp?lang=de">Deutsch</a> | <a href="/index.jsp?lang=fr">Français</a> | <a href="/index.jsp?lang=nl">Nederlands</a> | <a href="/index.jsp?lang=sv">Svenska</a></font></p>
+<div align="right">
+<div class="langbox" align="right"><img src="/flags.jsp?c=us" title="English" alt="English"> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr" title="Français" alt="Français"><img src="/flags.jsp?c=fr"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+</div>
+<div align=justify>
+<h2>Welcome to I2P!</h2>
<p>If you've just started I2P, the Active: numbers on the left should start to
grow over the next few minutes and you'll see a "shared clients" local destination listed
on the left (if not, <a href="#trouble">see below</a>). Once those show up,
you can:</p>
+
<ul>
<li><b>browse "eepsites"</b> - on I2P there are anonymously hosted websites -
tell your browser to use the <b>HTTP proxy at localhost port 4444</b>, then
browse to an eepsite -
- <ul>
+ <ul class="links">
<li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> and
<a href="http://perv.i2p/stats.cgi">perv.i2p</a>: sites tracking active eepsites</li>
<li><a href="http://forum.i2p/">forum.i2p</a>: a secure and anonymous connection to <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
@@ -18,6 +23,7 @@ you can:</p>
<li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: Freenet proxy</li>
<li><a href="http://echelon.i2p">echelon.i2p</a>: software archive and information for I2P</li>
</ul>
+<p>
There are many more eepsites - just follow the links from the ones you see,
bookmark your favorites, and visit them often!</li>
<li><b>browse the web</b> - there is currently an HTTP "outproxy" in I2P hooked
@@ -38,7 +44,7 @@ you can:</p>
<li><b>blog anonymously</b> - check out <a href="http://syndie.i2p2.de/">Syndie</a></li>
<li>and lots more</li>
</ul>
-
+</p>
<h2>Want your own eepsite?</h2>
<p>We've bundled some software to let you run your own eepsite - a
@@ -51,6 +57,12 @@ will be visible to others.
Detailed instructions for starting your eepsite are on
<a href="http://localhost:7658/">your temporary eepsite page</a>.
</p>
+<!--
+<p>
+If you wish to register your eepsite with a unique top level domain (eg. http://bobsplace.i2p) making it visible on the network, you
+can do so here: <a href="http://stats.i2p/i2p/addkey.html">http://stats.i2p/i2p/addkey.html</a>
+</p>
+-->
<h2><a name="trouble">Troubleshooting</a></h2>
@@ -65,3 +77,4 @@ You may also want to review the information on the
#i2p-chat on IRC at <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p or irc.freshcoffee.i2p (they're linked together).</p>
<p><b>As a note, you can change this page by editing the file "docs/readme.html"</b></p>
+</div>
\ No newline at end of file
diff --git a/readme_de.html b/readme_de.html
index 28ea2e5ca26820c99bd7ad10cf4ae40f91c88370..60d8aeabe0239f8fc8b91f919c325062c1bc3e88 100644
--- a/readme_de.html
+++ b/readme_de.html
@@ -1,4 +1,7 @@
-<p align=right><font size="-1"><a href="/index.jsp?lang=en">English</a> | <a href="/index.jsp?lang=zh">Chinese</a> | Deutsch | <a href="/index.jsp?lang=fr">Français</a> | <a href="/index.jsp?lang=nl">Nederlands</a> | <a href="/index.jsp?lang=sv">Svenska</a></font></p>
+<div align="right">
+<div class="langbox" align="right"><img src="/flags.jsp?c=us" title="English" alt="English"> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr" title="Français" alt="Français"><img src="/flags.jsp?c=fr"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+</div>
+<h2>Willkommen zu I2P!</h2>
<p>Wenn Du gerade I2P gestartet hast, sollten die "Active:" Zahlen links in den nächsten paar Minuten anwachsen und Du siehst dann dort ein "shared clients" lokales Ziel gelistet (falls nicht, <a href="#trouble">siehe Unten</a>). Sobald das erscheint, kannst Du:</p>
<ul>
<li><b>"Eepsites" besuchen</b> - In I2P sind anonym gehostete Websites -
diff --git a/readme_fr.html b/readme_fr.html
index 0b2eb7ad9c498b0747b5d5724c7d914d3c45a522..9ab143e4adc90b9ba540fa3665719df71d6107f6 100644
--- a/readme_fr.html
+++ b/readme_fr.html
@@ -1,4 +1,7 @@
-<p align=right><font size="-1"><a href="/index.jsp?lang=de">Deutsch</a> | <a href="/index.jsp?lang=zh">Chinese</a> | <a href="/index.jsp?lang=en">English</a> | Français | <a href="/index.jsp?lang=nl">Nederlands</a> | <a href="/index.jsp?lang=sv">Svenska</a></font></p>
+<div align="right">
+<div class="langbox" align="right"><img src="/flags.jsp?c=us" title="English" alt="English"> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr" title="Français" alt="Français"><img src="/flags.jsp?c=fr"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+</div>
+<h2>Bienvenu a I2P!</h2>
<p>Si vous venez juste de lancer I2P, les chiffres sur la gauche à coté de Active devraient commencer à augmenter dans les prochaines minutes et vous verrez un "Shared client" en destination locale listés sur la gauche (si non, <a href=#trouble>voir plus bas</a>). Une fois qu'ils apparaissent, vous pouvez:</p>
<ul>
<li><b>parcourir les "eepsites"</b> - sur I2P il y a des sites web anonymes hébergés - dites à votre navigateur d'utiliser <b>le HTTP proxy a l'adresse localhost port 4444</b>, ensuite vous pouvez naviguer sur les eepsites.
diff --git a/readme_nl.html b/readme_nl.html
index 9ece712f045ef255aea9efec3d6d4a12a0dbe737..7ff79e89dcd6a3d1f66bf0c9d40735e02a19dfc0 100644
--- a/readme_nl.html
+++ b/readme_nl.html
@@ -1,4 +1,7 @@
-<p align=right><font size="-1"><a href="/index.jsp?lang=en">English</a> | <a href="/index.jsp?lang=zh">Chinese</a> | <a href="/index.jsp?lang=de">Deutsch</a> | <a href="/index.jsp?lang=fr">Français</a> | Nederlands | <a href="/index.jsp?lang=sv">Svenska</a></font></p>
+<div align="right">
+<div class="langbox" align="right"><img src="/flags.jsp?c=us" title="English" alt="English"> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr" title="Français" alt="Français"><img src="/flags.jsp?c=fr"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+</div>
+<h2>Welkom bij I2P!</h2>
<p>Als je net I2P opgestart hebt, zullen de 'Active:' (Actieve) getallen aan de linkerkant in de komende minuten stijgen, en je zal een "Shared clients" (Gedeelde clients) lokale bestemming zien staan aan de linkerkant (indien niet, <a href=#trouble>zie hieronder</a>). Eenmaal je deze bestemming ziet, kan je:</p>
<ul>
<li><b>surfen naar "eepsites"</b> - op I2P zijn er anonieme websites - stel je browser in om de <b>HTTP proxy op localhost, poort 4444</b> te gebruiken, en surf vervolgens naar een eepsite -
diff --git a/readme_sv.html b/readme_sv.html
index 5e91e1d7d714d3a9f4f1a9b4e3011e2fbb7d0be9..ef68ea14eee293726a27a79e7d10cbc1796475e7 100644
--- a/readme_sv.html
+++ b/readme_sv.html
@@ -1,6 +1,7 @@
-<p align=right><font size="-1"><a href="/index.jsp?lang=en">English</a> | <a href="/index.jsp?lang=zh">Chinese</a>
-| <a href="/index.jsp?lang=de">Deutsch</a> | <a href="/index.jsp?lang=fr">Français</a> | <a
-href="/index.jsp?lang=nl">Nederlands</a> | Svenska</font></p>
+<div align="right">
+<div class="langbox" align="right"><img src="/flags.jsp?c=us" title="English" alt="English"> <a href="/index.jsp?lang=zh"><img src="/flags.jsp?c=cn" title="Chinese" alt="Chinese"></a> <a href="/index.jsp?lang=de"><img src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> <a href="/index.jsp?lang=fr" title="Français" alt="Français"><img src="/flags.jsp?c=fr"></a> <a href="/index.jsp?lang=nl"><img src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> <a href="/index.jsp?lang=sv"><img src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a></div>
+</div>
+<h2>Welcome to I2P!</h2>
<p>Om du just har startat I2P kommer de "Aktiva: #/#" börja öka inom
några få minuter och du kommer se en destination kallad "delade
klienter" på den vänstra listan (om inte <a href="#trouble">se
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index e4d51a2bbbc6525a11e0ae2b6866c05bfb2d3470..b54d1de4bcebaa2676a267138f4700e337aabb2f 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 4;
+ public final static long BUILD = 5;
/** for example "-test" */
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
diff --git a/router/java/src/net/i2p/router/admin/StatsGenerator.java b/router/java/src/net/i2p/router/admin/StatsGenerator.java
index 5bfbb64ee29236825e618134d54429ae7c1bb424..8da59a255e39a48c5e211b168386ab1c869165fc 100644
--- a/router/java/src/net/i2p/router/admin/StatsGenerator.java
+++ b/router/java/src/net/i2p/router/admin/StatsGenerator.java
@@ -29,7 +29,6 @@ public class StatsGenerator {
public void generateStatsPage(Writer out) throws IOException {
StringBuilder buf = new StringBuilder(16*1024);
- buf.append("<h1>Router statistics</h1><hr />");
buf.append("<form action=\"/oldstats.jsp\">");
buf.append("<select name=\"go\" onChange='location.href=this.value'>");
out.write(buf.toString());
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index 6c9d08e2c74e94cd833bb7f195992093390989c2..60e2af05ce02c540016791c9f7f8e0611c67d797 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -471,7 +471,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
buf.append(getCountryName(c));
buf.append("\" src=\"/flags.jsp?c=").append(c).append("\"> ");
}
- buf.append("<tt><font size=\"+1\">");
+ buf.append("<tt>");
boolean found = _context.netDb().lookupRouterInfoLocally(peer) != null;
if (found)
buf.append("<a title=\"NetDb entry\" href=\"netdb.jsp?r=").append(h).append("\">");