diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index cc8742a7d..2c2394e76 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -23,7 +23,7 @@ " />

-

Keyring

+

Keyring

The router keyring is used to decrypt encrypted leaseSets. The keyring may contain keys for local or remote encrypted destinations.

@@ -36,7 +36,7 @@ if (prev != null) System.setProperty("net.i2p.router.web.ConfigKeyringHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigKeyringHandler.nonce", new java.util.Random().nextLong()+""); %> " /> -

Manual Keyring Addition

+

Manual Keyring Addition

Enter keys for encrypted remote destinations here. Keys for local destinations must be entered on the I2PTunnel page.

diff --git a/installer/resources/ahelper-conflict-header.ht b/installer/resources/ahelper-conflict-header.ht index 305512bbf..c41d81655 100644 --- a/installer/resources/ahelper-conflict-header.ht +++ b/installer/resources/ahelper-conflict-header.ht @@ -5,16 +5,17 @@ Connection: close Proxy-Connection: close -Destination key conflict +I2P Warning: Destination key conflict

+

Warning: Destination Key Conflict

The addresshelper link you followed specifies a different destination key than a host entry in your host database. Someone could be trying to impersonate another eepsite, diff --git a/installer/resources/dnf-header.ht b/installer/resources/dnf-header.ht index c3c1b9f5b..ca8a4ca6f 100644 --- a/installer/resources/dnf-header.ht +++ b/installer/resources/dnf-header.ht @@ -5,16 +5,17 @@ Connection: close Proxy-Connection: close -Eepsite not reachable +I2P Warning: Eepsite not reachable
+

Warning: Eeepsite Unreachable

The eepsite was not reachable. The eepsite is offline, there is network congestion, or your router is not yet well-integrated with peers. diff --git a/installer/resources/dnfb-header.ht b/installer/resources/dnfb-header.ht index 3e16430dc..93fc41e3b 100644 --- a/installer/resources/dnfb-header.ht +++ b/installer/resources/dnfb-header.ht @@ -5,16 +5,17 @@ Connection: close Proxy-Connection: close -Invalid eepsite destination +I2P Warning: Invalid eepsite destination
+

Warning: Invalid Destination

The eepsite destination specified was not valid, or was otherwise unreachable. Perhaps you pasted in the wrong BASE64 string or the link you are following is diff --git a/installer/resources/dnfh-header.ht b/installer/resources/dnfh-header.ht index c65d41021..a9dbc6540 100644 --- a/installer/resources/dnfh-header.ht +++ b/installer/resources/dnfh-header.ht @@ -5,22 +5,23 @@ Connection: close Proxy-Connection: close -Eepsite unknown +I2P Warning: Eepsite unknown
+

Warning: Eeepsite Not Found in Addressbook

The eepsite was not found in your router's addressbook. Check the link or find a BASE64 address. If you have the BASE64 address, paste it into your userhosts.txt using SusiDNS, -use a BASE64 address helper, or use a jump service link below. +use a BASE64 address helper, or use a jump service link below.

Seeing this page often? See the FAQ for help in adding some subscriptions -to your addressbook. -

Could not find the following destination:

+to your addressbook.
+Could not find the following destination:

diff --git a/installer/resources/dnfp-header.ht b/installer/resources/dnfp-header.ht index 3e26d8f16..399d1067d 100644 --- a/installer/resources/dnfp-header.ht +++ b/installer/resources/dnfp-header.ht @@ -5,16 +5,17 @@ Connection: close Proxy-Connection: close -Outproxy Not Found +I2P Warning: Outproxy Not Found
+

Warning: I2P Proxy Not Found

The WWW Outproxy was not found. It is offline, there is network congestion, or your router is not yet well-integrated with peers. diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index b1b624a50..360ed7c1e 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -25,16 +25,17 @@ pre { div.logo { float: left; - left: 10px; - top: 0px; - padding: 10px 10px 10px 14px; - text-align: left; + padding: 10px; + text-align: center; font-color: #fff; - border: 0px solid #f00; - margin: 0px; - background: #003; - display: none; - border-bottom: 1px solid #eef; + margin: 0 20px 0 20px; + border: 1px solid #99f; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + background: #003 url('images/darkbluebg.png'); + width: 175px; + -moz-box-shadow: inset 0px 0px 16px 0px #009; } div.toolbar { @@ -100,12 +101,12 @@ div.routersummary { } div.warning { - margin: 0 20px 10px 224px; - padding: 20px 25px 20px 75px; - background: #fff; + margin: 5px 20px 10px 240px; + padding: 0px 25px 20px 75px; + background: #005; border: 1px solid #d00; text-align: left; - color: inherit; + color: #fff; -moz-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; @@ -173,7 +174,7 @@ div.configure { -khtml-border-radius: 4px; border-radius: 4px; border: 1px solid #99f; - background: url(images/darkbluebg.png); + background: #003 url(images/darkbluebg.png); } div.messages { @@ -479,6 +480,14 @@ textarea { form {} .proxyfooter { + margin: 0 20px 10px 240px; + padding: 20px 25px 20px 75px; font-color: #f00; font-size: 7pt; -} \ No newline at end of file + text-align: right !important; + border-radius: 4px; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + border: 1px solid #001; + display: none; +} \ No newline at end of file diff --git a/installer/resources/themes/console/dark/images/errortriangle.png b/installer/resources/themes/console/dark/images/errortriangle.png new file mode 100644 index 000000000..f7bb3d394 Binary files /dev/null and b/installer/resources/themes/console/dark/images/errortriangle.png differ diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 728a85802..5691d8942 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -25,15 +25,17 @@ pre { div.logo { float: left; - padding: 10px 10px 10px 14px; + padding: 10px; text-align: center; font-color: #fff; - margin: 0 20px 0 14px; + margin: 0 20px 0 20px; border: 1px solid #002; -moz-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; background: #ddddff url('images/lightbluetile.png'); + width: 175px; + -moz-box-shadow: inset 0px 0px 16px 1px #eef; } div.toolbar { @@ -100,8 +102,8 @@ div.routersummary { } div.warning { - margin: 0 20px 10px 224px; - padding: 20px 25px 20px 75px; + margin: 5px 20px 10px 240px; + padding: 0px 25px 20px 75px; background: #fff; border: 1px solid #d00; text-align: left; @@ -485,7 +487,7 @@ textarea { form {} .proxyfooter { - margin: 0 20px 10px 224px; + margin: 0 20px 10px 240px; padding: 20px 25px 20px 75px; font-color: #f00; font-size: 7pt; @@ -494,4 +496,5 @@ form {} -moz-border-radius: 4px; -khtml-border-radius: 4px; border: 1px solid #001; + display: none; } \ No newline at end of file diff --git a/installer/resources/themes/console/light/images/errortriangle.png b/installer/resources/themes/console/light/images/errortriangle.png new file mode 100644 index 000000000..f7bb3d394 Binary files /dev/null and b/installer/resources/themes/console/light/images/errortriangle.png differ diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 8c1e82035..6d9b6bc65 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 = 14; + public final static long BUILD = 15; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;