From 6340fbb3d4b87b21c8475323ddbaea9bce058990 Mon Sep 17 00:00:00 2001 From: z3d Date: Sat, 18 Jul 2009 23:39:03 +0000 Subject: [PATCH] Proxy Error visual enhancements, mostly. And a version bump we go, to -15! --- apps/routerconsole/jsp/configkeyring.jsp | 4 +- .../resources/ahelper-conflict-header.ht | 5 ++- installer/resources/dnf-header.ht | 5 ++- installer/resources/dnfb-header.ht | 5 ++- installer/resources/dnfh-header.ht | 13 +++--- installer/resources/dnfp-header.ht | 5 ++- .../resources/themes/console/dark/console.css | 39 +++++++++++------- .../console/dark/images/errortriangle.png | Bin 0 -> 2100 bytes .../themes/console/light/console.css | 13 +++--- .../console/light/images/errortriangle.png | Bin 0 -> 2100 bytes .../src/net/i2p/router/RouterVersion.java | 2 +- 11 files changed, 54 insertions(+), 37 deletions(-) create mode 100644 installer/resources/themes/console/dark/images/errortriangle.png create mode 100644 installer/resources/themes/console/light/images/errortriangle.png 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 0000000000000000000000000000000000000000..f7bb3d3945d7a87ace916d2d90759e724de240a6 GIT binary patch literal 2100 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