diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
index 037ca17af5a132ffbb87c0092ee5fc585371b048..e9749750cd3de6a2fec8be8f18d910565af36048 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java
@@ -115,7 +115,7 @@ public class GraphHelper extends HelperBase {
+ "\" /> pixels, height: <input size=\"4\" type=\"text\" name=\"height\" value=\"" + _height
+ "\" /><br />\n");
_out.write("Refresh delay: <select name=\"refreshDelay\"><option value=\"60\">1 minute</option><option value=\"120\">2 minutes</option><option value=\"300\">5 minutes</option><option value=\"600\">10 minutes</option><option value=\"1800\">30 minutes</option><option value=\"3600\">1 hour</option><option value=\"-1\">Never</option></select><br />\n");
- _out.write("<hr /><input type=\"submit\" value=\"Redraw\" /></div>");
+ _out.write("<hr /><div class=\"formaction\"><input type=\"submit\" value=\"Redraw\" /></div></div>");
} catch (IOException ioe) {
ioe.printStackTrace();
}
diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp
index 655741b83a7fec7bf68d6ccdf844604a37e8ccfe..6333a14cff522da1892ba616e0fbdadfbbcf5679 100644
--- a/apps/routerconsole/jsp/summarynoframe.jsp
+++ b/apps/routerconsole/jsp/summarynoframe.jsp
@@ -26,9 +26,9 @@
<jsp:getProperty name="linkhelper" property="content" />
<% } else { %>
<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">Torrents</a>
+<a href="susidns/index.jsp" target="_blank">Addressbook</a>
+<a href="i2psnark/" target="_blank">Torrents</a>
+<a href="susimail/susimail" target="blank">Webmail</a>
<a href="http://127.0.0.1:7658/" target="_blank">Webserver</a><hr />
<u><b>I2P Internals</b></u><br />
<a href="i2ptunnel/index.jsp" target="_blank">I2PTunnel</a>
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 7b79f28600f531a5cf66cb8f60b9348cd7ad9858..3231ef874ea781cc9e787d733ff5b5cc5c8f0c49 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -132,6 +132,10 @@ div.routersummary a:hover {
color: #f60;
}
+div.routersummary input[type=text] {
+ text-align: right !important;
+}
+
div.warning {
margin: 20px 20px 10px 260px;
padding: 0px 20px 20px 75px;
@@ -176,6 +180,7 @@ div.main {
div.main li {
padding-bottom: 10px;
+ list-style: square;
}
div.main li:first-child {
@@ -223,6 +228,11 @@ div.news a:link {
text-shadow: 0px 0px 1px rgba(128, 128, 48, 0.3);
}
+div.news a:visited {
+ color: #f00 !important;
+ text-shadow: 0px 0px 1px rgba(128, 128, 48, 0.3);
+}
+
div.news hr {
color: #cc7;
background: #cc7;
@@ -331,11 +341,20 @@ table {
}
table hr {
- padding: 1px 0;
+ padding: 0px 0;
+ color: #bbf;
+ background: #bbf;
+ border: 0px solid #bbf;
+ margin: 0px -5px;
+ height: 1px;
+}
+
+table tt {
+ font-size: 7.5pt;
}
th {
- background-color: #def;
+ background-color: #fff;
padding: 8px 2px;
text-align: center;
border-bottom: 1px solid #88f;
@@ -345,6 +364,10 @@ tt {
font-size: 8pt;
}
+tt, pre {
+ font: 8pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
+}
+
td {
padding: 4px;
}
diff --git a/installer/resources/themes/console/classic/ieshim.css b/installer/resources/themes/console/classic/ieshim.css
index 3e897a7af7728c24cfa4701825d02278691c7e85..9fff032b16d485a9aeaf9957b4d86ff066681d82 100644
--- a/installer/resources/themes/console/classic/ieshim.css
+++ b/installer/resources/themes/console/classic/ieshim.css
@@ -36,8 +36,10 @@ div.configure table {
}
h1 {
- padding: 15px 10px 16px 10px !important;
+ padding: 15px 10px 16px -10px !important;
margin: 0 0px 0 175px !important;
+ background-color: #bbf !important;
+ color: #001;
}
h2 {
@@ -97,6 +99,11 @@ div.routersummary {
border-left: 5px solid #bbf;
}
+div.routersummary submit {
+ padding: 0;
+ margin-bottom: 5px;
+}
+
div.news li {
padding-top: 0px 0px !important;
margin-bottom: -23px !important;
@@ -131,4 +138,15 @@ div.configure hr{
input {
padding: 0;
+}
+
+div.graphspanel img {
+ border: 1px solid #99f;
+ margin: 6px 0 !important;
+ background: #ddf;
+ -moz-box-shadow: inset 0px 0px 1px 1px #99f;
+}
+
+div.graphspanel hr {
+ margin: 20px 0;
}
\ No newline at end of file
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 8e0d75d607edbf237e8eda86bfad81032260f695..5c561e94a9da17f03e8f3f361c1542b75f4be438 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -89,7 +89,7 @@ div.routersummary {
width: 175px;
padding: 10px;
text-align: center;
- border: 1px solid #9999ff;
+ border: 1px solid #99f;
background: #003;
background: url(images/darkbluebg.png);
color: #eef;
@@ -102,6 +102,28 @@ div.routersummary {
-moz-box-shadow: inset 0px 0px 1px 0px #eef;
}
+div.routersummary input[type=text] {
+ text-align: right !important;
+ -moz-box-shadow: inset 1px 1px 1px 0px #000;
+}
+
+div.routersummary hr {
+ color: #99f;
+ background: #99f;
+ height: 1px;
+ border-bottom: 1px outset #bbf;
+ margin: 5px -10px 4px -10px;
+}
+
+div.routersummary hr {
+ color: #bbf;
+ background: #bbf;
+ height: 2px;
+ border-bottom: 1px outset #bbf;
+ margin: 8px -10px 7px -10px;
+ -moz-box-shadow: inset 0px -4px 2px 1px #001;
+}
+
div.warning {
margin: 5px 20px 10px 240px;
padding: 0px 25px 20px 75px;
@@ -254,6 +276,16 @@ table {
background: #003;
}
+table hr {
+ padding: 0px 0;
+ color: #99f;
+ background: #99f;
+ border: 0px solid #99f;
+ margin: 0px 0px;
+ height: 1px;
+ display: none;
+}
+
th {
padding: 6px 2px;
color: #eef;
@@ -392,7 +424,7 @@ h2 {
color: #fff;
text-shadow: 0px 0px 1px rgba(255, 255, 255, 0.5);
letter-spacing: 0.05em;
- background: #003 url('images/darkbluebg.png');
+ background: #003 url('images/titletile.png');
padding: 5px 10px 8px 10px;
wordwrap: none;
border: 1px solid #99f;
@@ -435,9 +467,9 @@ h4 {
font-size: 11pt;
}
-button {
+button, button:visited {
font: bold 9pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
- border: 1px outset #ddddc0;
+ border: 1px outset #77f;
padding: 1px 3px;
background: #bbf;
text-decoration: none;
@@ -450,12 +482,23 @@ button {
text-align: center;
vertical-align: middle;
min-width: 76px;
+ -moz-box-shadow: inset 0px 1px 1px 0px #55f;
+ background: #003;
+ color: #99f;
}
+button:hover {
+ border: 1px solid #f60;
+ -moz-box-shadow: inset 0px 1px 1px 0px #eef;
+ background: #001;
+ color: #f60;
+}
+
button:active {
border: 1px inset #f60;
background: #f60;
color: #fff;
+ -moz-box-shadow: inset 0px 0px 0px 0px #f60;
}
.underline {
@@ -488,9 +531,10 @@ sidebarlogo {
}
input {
- border: 1px outset #bbf;
- background: #bbf;
- color: #002;
+ border: 1px outset #55f;
+ -moz-box-shadow: inset 0px 1px 1px 0px #55f;
+ background: #003;
+ color: #99f;
margin: 5px;
font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
padding: 1px 2px;
@@ -502,9 +546,10 @@ input {
}
input:hover {
- background: #003;
+ background: #001;
color: #f60;
border: 1px solid #f60;
+ -moz-box-shadow: inset 0px 1px 1px 0px #eef;
}
input:active {
@@ -530,6 +575,7 @@ input[type=text] {
border-radius: 4px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
+ -moz-box-shadow: inset 1px 1px 1px 0px #000;
}
input[type=text]:active, input[type=text]:hover {
diff --git a/installer/resources/themes/console/dark/images/titletile.png b/installer/resources/themes/console/dark/images/titletile.png
new file mode 100644
index 0000000000000000000000000000000000000000..945acc5b981b768b8a64a6a9f7a8c969c17733ba
Binary files /dev/null and b/installer/resources/themes/console/dark/images/titletile.png differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 20d8c28cff690ca7bb6708cb51fca89ed1641e48..26f8b40c5c722bd8ef80fc536e309602ce3ac615 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -105,6 +105,19 @@ div.routersummary {
-moz-box-shadow: inset 0px 0px 1px 0px #002;
}
+div.routersummary input[type=text] {
+ text-align: right !important;
+}
+
+div.routersummary hr {
+ color: #eef;
+ background: #eef;
+ height: 2px;
+ border-bottom: 1px solid #eef;
+ margin: 8px -10px 7px -10px;
+ -moz-box-shadow: inset 0px 1px 1px 1px #001;
+}
+
div.warning {
margin: 5px 20px 10px 240px;
padding: 0px 25px 20px 75px;
@@ -226,6 +239,7 @@ div.configure {
border-radius: 4px;
border: 1px solid #000022;
-moz-box-shadow: inset 0px 0px 1px 0px #002;
+ min-width: 400px;
}
div.graphspanel {
@@ -237,9 +251,9 @@ div.graphspanel {
border-radius: 4px;
border: 1px solid #000022;
-moz-box-shadow: inset 0px 0px 1px 0px #002;
+ text-align: center !important;
}
-
div.graphspanel img {
border: 1px solid #003;
padding: 2px;
@@ -247,7 +261,7 @@ div.graphspanel img {
text-align: center !important;
background: #001;
-moz-box-shadow: inset 0px 0px 1px 1px #99f;
- opacity: 0.9;
+ opacity: 0.8;
}
div.graphspanel img:hover {
@@ -260,6 +274,10 @@ div.graphspanel img:hover {
opacity: 1;
}
+div.graphspanel form {
+ text-align: left;
+}
+
div.messages {
padding: 10px;
margin: 10px 0 20px 0;
@@ -301,6 +319,16 @@ table {
font: 7pt/130% "Lucida Sans Unicode", Verdana, Bitstream Vera Sans", Tahoma, Helvetica, sans-serif;
}
+table hr {
+ padding: 0px 0;
+ color: #99f;
+ background: #99f;
+ border: 0px solid #99f;
+ margin: 0px 0px;
+ height: 1px;
+ display: none;
+}
+
th {
padding: 6px 2px;
color: #000;
@@ -433,7 +461,7 @@ h2 {
font-size: 12pt;
color: #001;
letter-spacing: 0.05em;
- background: #ddf url('images/lightbluetile.png');
+ background: #ddf url('images/titletile.png');
text-shadow: 0px 0px 1px rgba(0, 0, 64, 0.5);
padding: 7px 10px;
wordwrap: none;
@@ -476,9 +504,9 @@ h4 {
button, button:visited {
font: bold 9pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
- border: 1px outset #ddddc0;
+ border: 1px outset #999;
padding: 1px 3px;
- background: #bbf !important;
+ background: #ddf !important;
text-decoration: none;
border-radius: 4px;
-moz-border-radius: 4px;
@@ -488,18 +516,22 @@ button, button:visited {
margin: 0 1px;
text-align: center;
min-width: 80px;
+ -moz-box-shadow: inset 0px 2px 8px 0px #fff;
+ color: #006;
}
button:hover{
border: 1px solid #f60;
background: #f60 !important;
color: #fff;
+ -moz-box-shadow: inset 0px 0px 0px 1px #fff;
}
button:active{
border: 1px solid #f60;
background: #001 !important;
color: #f60;
+ -moz-box-shadow: inset 0px 0px 0px 1px #f60;
}
.underline {
@@ -531,8 +563,8 @@ input {
}
input, input:visited {
- border: 1px outset #bbf;
- background: #bbf;
+ border: 1px outset #999;
+ background: #ddf;
color: #001;
margin: 5px;
font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
@@ -542,6 +574,9 @@ input, input:visited {
border-radius: 4px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
+ -moz-box-shadow: inset 0px 2px 8px 0px #fff;
+ color: #006;
+ opacity: 0.9;
}
@@ -549,7 +584,9 @@ input:hover {
background: #f60;
color: #fff;
border: 1px solid #f60;
- opacity: 0.9;
+ opacity: 1.0;
+ -moz-box-shadow: inset 0px 0px 0px 1px #fff;
+
}
input:active {
@@ -557,6 +594,7 @@ input:active {
color: #f60;
border: 1px solid #f60;
opacity: 1.0;
+ -moz-box-shadow: inset 0px 0px 0px 1px #f60;
}
input[type=text] {
@@ -595,6 +633,7 @@ select {
border-radius: 4px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
+ text-align: left !important;
}
textarea {
diff --git a/installer/resources/themes/console/light/images/lightbluetile.png b/installer/resources/themes/console/light/images/lightbluetile.png
index e7fc6c1f12ab57637c3c0858a74ad87643a76b28..53f9d54deaaa6cc333aca3c07e71848e26f5d2b0 100644
Binary files a/installer/resources/themes/console/light/images/lightbluetile.png and b/installer/resources/themes/console/light/images/lightbluetile.png differ
diff --git a/installer/resources/themes/console/light/images/titletile.png b/installer/resources/themes/console/light/images/titletile.png
new file mode 100644
index 0000000000000000000000000000000000000000..beb9552baa136d485fa1be4468e6d78652f23f10
Binary files /dev/null and b/installer/resources/themes/console/light/images/titletile.png differ
diff --git a/installer/resources/themes/console/snark.css b/installer/resources/themes/console/snark.css
index 4b6fbb2c3d7fb18e5299e889f47702661f9718c8..a5551156fc1615a2540680423c5aa1dcea56edf3 100644
--- a/installer/resources/themes/console/snark.css
+++ b/installer/resources/themes/console/snark.css
@@ -56,8 +56,8 @@ body {
font-size: 9pt;
font-weight: bold;
text-align: left;
- margin: 0 0 15px 0;
- padding: 0px;
+ margin: 0 0px 10px 0px;
+ padding: 0;
border-spacing: 0px;
-moz-border-radius: 4px 0 0 0;
-khtml-border-radius: 4px;
@@ -68,7 +68,7 @@ body {
background: #f40 url('../console/images/orangetile.png');
color: #531;
height: 64px;
- width: 100%;
+ width: auto;
}
pre {
@@ -95,7 +95,7 @@ th {
border-top: 1px outset #001;
border-bottom: 1px inset #001;
background: #f60 url('/themes/console/images/tabletitleorange.png') repeat-x;
- text-align: left;
+ text-align: right;
whitespace: nowrap;
}
@@ -107,7 +107,7 @@ th {
td {
padding: 5px;
- text-align: left;
+ text-align: right;
}
.snarkTorrentEven {
background-color: #fb1;
@@ -176,7 +176,7 @@ hr {
}
a:link{
- color: #830;
+ color: #930;
text-decoration: none;
font-weight: bold;
word-wrap: break-word;
@@ -189,7 +189,7 @@ a:visited{
}
a:hover{
- color: #f40;
+ color: #900;
font-weight: bold;
}