I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Proxy Error visual enhancements, mostly. And a version bump we go, to -15!

Browse Source
This commit is contained in:
z3d
2009-07-18 23:39:03 +00:00
parent 748203f4e7
commit 6340fbb3d4
11 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/jsp/configkeyring.jsp
View File

@ -23,7 +23,7 @@
<jsp:setProperty name="keyringhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<div class="configure">
<p>
<h2>Keyring</h2>
<h3>Keyring</h3>
The router keyring is used to decrypt encrypted leaseSets.
The keyring may contain keys for local or remote encrypted destinations.
<p><jsp:getProperty name="keyringhelper" property="summary" />
@ -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()+""); %>
<input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigKeyringHandler.nonce")%>" />
<h2>Manual Keyring Addition</h2>
<h3>Manual Keyring Addition</h3>
Enter keys for encrypted remote destinations here.
Keys for local destinations must be entered on the <a href="i2ptunnel/index.jsp">I2PTunnel page</a>.
<p>

5
installer/resources/ahelper-conflict-header.ht
View File

@ -5,16 +5,17 @@ Connection: close
Proxy-Connection: close
<html><head>
<title>Destination key conflict</title>
<title>I2P Warning: Destination key conflict</title>
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><br />
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
<a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Addressbook</a>
</div>
<div class=warning id=warning>
<h3>Warning: Destination Key Conflict</h3>
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,

5
installer/resources/dnf-header.ht
View File

@ -5,16 +5,17 @@ Connection: close
Proxy-Connection: close
<html><head>
<title>Eepsite not reachable</title>
<title>I2P Warning: Eepsite not reachable</title>
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><br />
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
<a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Addressbook</a>
</div>
<div class=warning id=warning>
<h3>Warning: Eeepsite Unreachable</h3>
The eepsite was not reachable.
The eepsite is offline, there is network congestion,
or your router is not yet well-integrated with peers.

5
installer/resources/dnfb-header.ht
View File

@ -5,16 +5,17 @@ Connection: close
Proxy-Connection: close
<html><head>
<title>Invalid eepsite destination</title>
<title>I2P Warning: Invalid eepsite destination</title>
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><br />
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
<a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Addressbook</a>
</div>
<div class=warning id=warning>
<h3>Warning: Invalid Destination</h3>
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

13
installer/resources/dnfh-header.ht
View File

@ -5,22 +5,23 @@ Connection: close
Proxy-Connection: close
<html><head>
<title>Eepsite unknown</title>
<title>I2P Warning: Eepsite unknown</title>
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><br />
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><hr>
<a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Addressbook</a>
</div>
<div class=warning id=warning>
<h3>Warning: Eeepsite Not Found in Addressbook</h3>
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
<a href="http://127.0.0.1:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
use a BASE64 address helper, or use a jump service link below.
use a BASE64 address helper, or use a jump service link below.<br><br>
Seeing this page often? See <a href="http://www.i2p2.i2p/faq.html#subscriptions">the FAQ</a>
for help in <a href="http://127.0.0.1:7657/susidns/config.jsp">adding some subscriptions</a>
to your addressbook.
<BR><BR>Could not find the following destination:<BR><BR>
to your addressbook.<hr>
<b>Could not find the following destination:</b><BR><BR>

5
installer/resources/dnfp-header.ht
View File

@ -5,16 +5,17 @@ Connection: close
Proxy-Connection: close
<html><head>
<title>Outproxy Not Found</title>
<title>I2P Warning: Outproxy Not Found</title>
<link rel="shortcut icon" href="http://proxy.i2p/themes/console/images/favicon.ico" />
<link href="http://proxy.i2p/themes/console/default/console.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Router Console"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P Router Console" border="0"/></a><br />
[<a href="http://127.0.0.1:7657/config.jsp">configuration</a> | <a href="http://127.0.0.1:7657/help.jsp">help</a>]
<a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/">Addressbook</a>
</div>
<div class=warning id=warning>
<h3>Warning: I2P Proxy Not Found</h3>
The WWW Outproxy was not found.
It is offline, there is network congestion,
or your router is not yet well-integrated with peers.

39
installer/resources/themes/console/dark/console.css
View File

@ -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;
}
text-align: right !important;
border-radius: 4px;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
border: 1px solid #001;
display: none;
}

BIN
installer/resources/themes/console/dark/images/errortriangle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

13
installer/resources/themes/console/light/console.css
View File

@ -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;
}

BIN
installer/resources/themes/console/light/images/errortriangle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -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;