diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index c371624db8f83513865dc8880fb768e290ceab8b..7cd93751146b05796b427190f2476321cd134c34 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -27,7 +27,7 @@
<input type="hidden" name="action" value="blah" />
<h3>Bandwidth limiter</h3><p>
<b>I2P will work best if you configure your rates to match the speed of your internet connection.</b>
- </p><p>
+ </p>
<div class="wideload"><table><tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBps In
</td><td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)</td>
<!-- let's keep this simple...
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index b9bcaed8a6d2c039d45d7fc4a65042130b6a505e..560073b542e5e406aa5be255100f555d1858ba7c 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -249,7 +249,7 @@ div.warning h3 {
div.main {
margin: 0px 0px 0px 195px;
- padding: 15px 15px 15px 15px;
+ padding: 15px;
background: #eef;
border: 5px solid #bbf;
border-top: 0;
@@ -392,7 +392,7 @@ h1 {
h2 {
font-size: 14pt;
- padding: 10px;
+ padding: 0px 10px 10px 10px;
border-bottom: 5px solid #bbf;
border-top: 0px solid #bbf;
letter-spacing: 0.04em;
@@ -414,9 +414,9 @@ h3 {
table {
border-collapse: collapse;
border: 5px solid #bbf;
- margin: 5px 0px;
+ margin: 0 0 5px 0;
cell-padding: 1px;
- font-size: 7pt;
+ font-size: 7.5pt;
background: #fff;
width: 100%;
}
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 4832e708fc177330ce94475d883eb7fc097ff9f9..c7f2f5c5dd99058c912def9e9ee67471ca1eb9d3 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -205,7 +205,7 @@ div.routersummarytr:nth-child(odd) {
div.warning {
margin: 5px 20px 10px 240px;
- padding: 0px 25px 20px 75px;
+ padding: 5px 25px 20px 75px;
background: #005;
border: 1px solid #99f;
text-align: left;
@@ -268,11 +268,12 @@ div.main textarea {
}
div.news {
- margin: 0px 15px 20px 220px;
+ margin: 15px 15px 15px 220px;
padding: 20px 30px 20px 30px;
border: 1px solid #99f;
background: #004;
- background: url("images/darkbluetile.png");
+ background-image: -moz-linear-gradient(top, bottom, from(#003), to(#005), color-stop(30%, #003), color-stop(100%, #001));
+/* background: #003 url("images/darkbluetile.png");*/
color: #eef;
border-radius: 4px;
-moz-border-radius: 4px;
@@ -542,7 +543,8 @@ h1 {
letter-spacing: 0.15em;
text-shadow: 0px 0px 3px rgba(255, 255, 255, 0.8);
white-space: normal;
- background: #004 url('images/darkbluebg.png');
+ background: #002 //url('images/darkbluebg.png');
+ background-image: -moz-linear-gradient(top, bottom, from(#001), to(#003), color-stop(30%, #001), color-stop(100%, #001));
-moz-box-shadow: inset 0px 0px 1px 0px #eef;
-khtml-box-shadow: inset 0px 0px 1px 0px #eef;
box-shadow: inset 0px 0px 1px 0px #eef;
@@ -558,7 +560,8 @@ h2 {
color: #fff;
text-shadow: 0px 0px 1px rgba(255, 255, 255, 0.5);
letter-spacing: 0.05em;
- background: #003 url('images/titletile.png');
+ background: #002; // url('images/darkbluebg.png');
+ background-image: -moz-linear-gradient(top, bottom, from(#001), to(#003), color-stop(30%, #001), color-stop(100%, #001));
padding: 5px 10px 8px 10px;
wordwrap: none;
border: 1px solid #99f;
@@ -590,7 +593,7 @@ h3 {
border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
-khtml-border-radius: 0 4px 4px 0;
- background: #007;
+ background: #002;
/* background: url(images/lightbluebg.png);*/
}
@@ -795,7 +798,7 @@ form {}
.joblog {
margin: 15px 0 15px 0;
- padding: 20px !important;
+ padding: 5px 20px 10px 20px !important;
border: 1px solid #99f;
background-color: #004;
background: url("images/darkbluebg.png");
diff --git a/installer/resources/themes/console/images/i2psnark.png b/installer/resources/themes/console/images/i2psnark.png
deleted file mode 100644
index 63fddb10799a9ad2394efbf065a182906ff234a2..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/console/images/i2psnark.png and /dev/null differ
diff --git a/installer/resources/themes/console/images/olivegreentile.png b/installer/resources/themes/console/images/olivegreentile.png
deleted file mode 100644
index e63010c9d6d355a991044d2fd0f659c229900843..0000000000000000000000000000000000000000
Binary files a/installer/resources/themes/console/images/olivegreentile.png and /dev/null differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 71c33841fde8dffb5688f0e4d54955e9df11310b..54fb76c0caad53508c93851c37cc24512b414e33 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -268,7 +268,7 @@ div.main textarea {
div.news {
margin: 0px 15px 10px 220px;
- padding: 20px 30px 20px 30px;
+ padding: 10px 25px 15px 25px;
border: 1px solid #003;
color: #410;
border-radius: 4px;
@@ -346,7 +346,7 @@ div.confignav {
}
div.configure {
- padding: 0 15px 0px 15px !important;
+ padding: 5px 15px 0px 15px !important;
margin: 0px 0px 15px 0;
background: #ddf url('images/lightbluetile.png');
-moz-border-radius: 4px;
@@ -595,7 +595,7 @@ h2 {
border-radius: 4px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
- margin: 15px 0px 10px 0 !important;
+ margin: 15px 0px 5px 0 !important;
-moz-box-shadow: inset 0px 0px 1px 0px #002;
word-wrap: break-word;
}
@@ -612,7 +612,7 @@ h3 {
border: 1px solid #002;
border-left: 5px solid #002;
padding: 3px 5px 3px 5px;
- margin: 10px 0 15px 0;
+ margin: 15px 0 15px 0;
border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
-khtml-border-radius: 0 4px 4px 0;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index f6a1a31ef14cb67b421ab201bcec6bca47b51116..491b823a7ba3e5bd0493c0ec97bb813bdf74b439 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -1065,7 +1065,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
if (countryList.size() > 0) {
Collections.sort(countryList);
buf.append("<table>\n");
- buf.append("<tr><th>Country</th><th>Count</th></tr>\n");
+ buf.append("<tr><th align=\"left\">Country</th><th>Count</th></tr>\n");
for (String country : countryList) {
int num = countries.count(country);
buf.append("<tr><td><img height=\"11\" width=\"16\" alt=\"").append(country.toUpperCase()).append("\"");