I2P Advanced Configuration
+
<%@include file="confignav.jsp" %>
" />
-
+
I2P Client Configuration
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp
index 65c0638f4..5f31e1b3b 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" %>
-
+
I2P Keyring Configuration
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index d76df86c9..a3f854c0e 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" %>
-
+
I2P Logging Configuration
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/confignav.jsp b/apps/routerconsole/jsp/confignav.jsp
index d3cc36197..ca7a7e8e8 100644
--- a/apps/routerconsole/jsp/confignav.jsp
+++ b/apps/routerconsole/jsp/confignav.jsp
@@ -1,5 +1,6 @@
diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp
index 62d2e209c..b465559cd 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" %>
-
+
I2P Peer Configuration
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index 9c494d819..da4f7996f 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" %>
-
+
I2P Service Configuration
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index e84c5ca1f..e2dde4c44 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/apps/routerconsole/jsp/configstats.jsp
@@ -54,7 +54,7 @@ function toggleAll(category)
<%@include file="nav.jsp" %>
<%@include file="summary.jsp" %>
-
+
I2P Stats Configuration
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp
index d61d14d1c..cb195b5ca 100644
--- a/apps/routerconsole/jsp/configtunnels.jsp
+++ b/apps/routerconsole/jsp/configtunnels.jsp
@@ -12,7 +12,7 @@
" />
-
+
I2P Tunnel Configuration
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp
index 043541275..3b9a28668 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" %>
-
+
I2P Update Configuration
<%@include file="confignav.jsp" %>
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp
index 950610a75..e0a5f6cda 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" %>
-
+
I2P Performance Graphs
I2P Router Help & Support
-
+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 +volunteers. +
Further assistance is available here: +
+ +
+You may also try the I2P forum +or IRC.
" />
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index a336d8d4f..b60d25288 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" %>
-
+
" />
diff --git a/apps/routerconsole/jsp/oldconsole.jsp b/apps/routerconsole/jsp/oldconsole.jsp
index 7aa7bbcf4..18fc955cc 100644
--- a/apps/routerconsole/jsp/oldconsole.jsp
+++ b/apps/routerconsole/jsp/oldconsole.jsp
@@ -13,7 +13,7 @@
" />
" />
" />
diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp
index 7dd40d6b8..ade3b9d64 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" %>
-
+
" />
diff --git a/apps/routerconsole/jsp/summary.jsp b/apps/routerconsole/jsp/summary.jsp
index 4b7aaa908..786e48353 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 %>
-
diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp
index 9532602fa..ae65c69e4 100644
--- a/apps/routerconsole/jsp/summaryframe.jsp
+++ b/apps/routerconsole/jsp/summaryframe.jsp
@@ -13,6 +13,7 @@
Summary Bar
<%
+ out.print("\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(" \n");
%>
<%@include file="css.jsp" %>
diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp
index c12426a85..cd099e98e 100644
--- a/apps/routerconsole/jsp/summarynoframe.jsp
+++ b/apps/routerconsole/jsp/summarynoframe.jsp
@@ -10,16 +10,34 @@
" />
-
- Configuration Help
+ 
+
+ I2P Services
+ Susimail + SusiDNS + I2PSnark + Eepsite
+ I2P Internals
+ I2PTunnel + Tunnels + Profiles + NetDB + Logs + Jobs + Graphs + Stats + Configuration + Help +
- General
Ident: (, never reveal it to anyone" href="netdb.jsp?r=." target="_top">view)
Version:
Uptime:
Now:
- Reachability:
" + 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("\n"); } } %> -
<%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%>
-
+
- Peers
Active:
Fast:
diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp index 61fb4eb7b..d6852b72f 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" %> - +
" />
diff --git a/build.xml b/build.xml
index 162064b05..36b07a136 100644
--- a/build.xml
+++ b/build.xml
@@ -333,6 +333,14 @@
+
+
+
+
+
+
diff --git a/history.txt b/history.txt
index fa86dcd76..ab69419fd 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 99077d1e0..f0bb2b831 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 000000000..3f6ef7b12
--- /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 000000000..0b17efa1f
--- /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 000000000..a60ec21d3
--- /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 000000000..6bbc5e37a
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 000000000..fbff23409
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 000000000..0d43eb4ea
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 000000000..32a0972b9
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 000000000..89df70b96
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 000000000..2e28effaf
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 000000000..dd2ce3388
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 000000000..52d1fd6c7
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 000000000..f31f7cd8e
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 000000000..e0eba7969
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 000000000..e33c92544
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 000000000..2616ec7a6
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 000000000..198786c50
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 ee5c91da2..52d1fd6c7 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 000000000..c1caddfcf
--- /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 000000000..bb86f4ca2
--- /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 000000000..a60ec21d3
--- /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 000000000..17326d925
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 000000000..6bbc5e37a
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 000000000..fbff23409
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 000000000..0d43eb4ea
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 000000000..89df70b96
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 000000000..854d46f40
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 000000000..52d1fd6c7
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 000000000..e7fc6c1f1
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 000000000..e0eba7969
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 000000000..f34c06324
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 000000000..ea691b8e2
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 000000000..9c9092e73
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 000000000..c2b7e8c09
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 000000000..52d1fd6c7
Binary files /dev/null and b/installer/resources/themes/i2plogo.png differ
diff --git a/readme.html b/readme.html
index 715ca510c..3b95e801a 100644
--- a/readme.html
+++ b/readme.html
@@ -1,13 +1,18 @@
-
Help
-Sorry, there's not much help text here yet, so also check out the -FAQ on www.i2p2.i2p -or the -Deutsch FAQ. -You may also try the -forum -or IRC. -+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 +volunteers. +
Further assistance is available here: +
+ +
+You may also try the I2P forum +or IRC.
Summary Bar Information
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 bc6c48a2f..7ff7bec32 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" %> +I2P Router Console
I2P Router Job Queue
I2P Router Logs
Version:
Please include this information in bug reports. diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp index 6d029d7d2..27c1cd2dd 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" %> - +I2P Network Database Summary
I2P Router » Old Console
I2P Router Statistics
I2P Network Peers
I2P Network Peer Profiles
+
+
\n");
}
%>
<%
// 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("
\n");
+ out.print("+
+ Susimail + SusiDNS + I2PSnark + Eepsite
+ I2P Internals
+ I2PTunnel + Tunnels + Profiles + NetDB + Logs + Jobs + Graphs + Stats + Configuration + Help +
- General
Ident: (, never reveal it to anyone" href="netdb.jsp?r=." target="_top">view)
Version:
Uptime:
Now:
- Reachability:
" + 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("\n"); } } %> -
+
- Peers
Active:
Fast:
diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp index 61fb4eb7b..d6852b72f 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" %> - +
I2P Tunnel Summary
English | Chinese | Deutsch | Français | Nederlands | Svenska
+
+
+
+
+
\ No newline at end of file
diff --git a/readme_de.html b/readme_de.html
index 28ea2e5ca..60d8aeabe 100644
--- a/readme_de.html
+++ b/readme_de.html
@@ -1,4 +1,7 @@
-Welcome to I2P!
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, see below). Once those show up, you can:
+- browse "eepsites" - on I2P there are anonymously hosted websites -
tell your browser to use the HTTP proxy at localhost port 4444, then
browse to an eepsite -
-
-
+
- inproxy.tino.i2p and perv.i2p: sites tracking active eepsites
- forum.i2p: a secure and anonymous connection to forum.i2p2.de @@ -18,6 +23,7 @@ you can:
- fproxy.tino.i2p: Freenet proxy
- echelon.i2p: software archive and information for I2P
There are many more eepsites - just follow the links from the ones you see, bookmark your favorites, and visit them often!
- browse the web - there is currently an HTTP "outproxy" in I2P hooked @@ -38,7 +44,7 @@ you can:
- blog anonymously - check out Syndie
- and lots more
Want your own eepsite?
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 your temporary eepsite page.
+Troubleshooting
@@ -65,3 +77,4 @@ You may also want to review the information on the #i2p-chat on IRC at irc.freenode.net, irc.postman.i2p or irc.freshcoffee.i2p (they're linked together).As a note, you can change this page by editing the file "docs/readme.html"
+English | Chinese | Deutsch | Français | Nederlands | Svenska
+
+
+
+Willkommen zu I2P!
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, siehe Unten). Sobald das erscheint, kannst Du:
- "Eepsites" besuchen - In I2P sind anonym gehostete Websites -
diff --git a/readme_fr.html b/readme_fr.html
index 0b2eb7ad9..9ab143e4a 100644
--- a/readme_fr.html
+++ b/readme_fr.html
@@ -1,4 +1,7 @@
-
Deutsch | Chinese | English | Français | Nederlands | Svenska
++++Bienvenu a I2P!
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, voir plus bas). Une fois qu'ils apparaissent, vous pouvez:
- parcourir les "eepsites" - sur I2P il y a des sites web anonymes hébergés - dites à votre navigateur d'utiliser le HTTP proxy a l'adresse localhost port 4444, ensuite vous pouvez naviguer sur les eepsites.
diff --git a/readme_nl.html b/readme_nl.html
index 9ece712f0..7ff79e89d 100644
--- a/readme_nl.html
+++ b/readme_nl.html
@@ -1,4 +1,7 @@
-
English | Chinese | Deutsch | Français | Nederlands | Svenska
++++Welkom bij I2P!
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, zie hieronder). Eenmaal je deze bestemming ziet, kan je:
- surfen naar "eepsites" - op I2P zijn er anonieme websites - stel je browser in om de HTTP proxy op localhost, poort 4444 te gebruiken, en surf vervolgens naar een eepsite -
diff --git a/readme_sv.html b/readme_sv.html
index 5e91e1d7d..ef68ea14e 100644
--- a/readme_sv.html
+++ b/readme_sv.html
@@ -1,6 +1,7 @@
-
English | Chinese -| Deutsch | Français | Nederlands | Svenska
++++Welcome to I2P!
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 se diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e4d51a2bb..b54d1de4b 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 5bfbb64ee..8da59a255 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("
Router statistics
"); buf.append("
- surfen naar "eepsites" - op I2P zijn er anonieme websites - stel je browser in om de HTTP proxy op localhost, poort 4444 te gebruiken, en surf vervolgens naar een eepsite -
diff --git a/readme_sv.html b/readme_sv.html
index 5e91e1d7d..ef68ea14e 100644
--- a/readme_sv.html
+++ b/readme_sv.html
@@ -1,6 +1,7 @@
-
- parcourir les "eepsites" - sur I2P il y a des sites web anonymes hébergés - dites à votre navigateur d'utiliser le HTTP proxy a l'adresse localhost port 4444, ensuite vous pouvez naviguer sur les eepsites.
diff --git a/readme_nl.html b/readme_nl.html
index 9ece712f0..7ff79e89d 100644
--- a/readme_nl.html
+++ b/readme_nl.html
@@ -1,4 +1,7 @@
-