echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* SusiDNS: Remove .jsp suffixes

Browse Source
This commit is contained in:
zzz
2011-11-14 15:06:23 +00:00
parent 7f467dbdc8
commit 7aff01ea84
27 changed files with 133 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
View File

@ -1353,7 +1353,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"</head><body>\n" + "</head><body>\n" +
"<div class=logo>\n" + "<div class=logo>\n" +
"<a href=\"http://127.0.0.1:7657/\" title=\"" + _("Router Console") + "\"><img src=\"http://proxy.i2p/themes/console/images/i2plogo.png\" alt=\"I2P Router Console\" border=\"0\"></a><hr>\n" + "<a href=\"http://127.0.0.1:7657/\" title=\"" + _("Router Console") + "\"><img src=\"http://proxy.i2p/themes/console/images/i2plogo.png\" alt=\"I2P Router Console\" border=\"0\"></a><hr>\n" +
"<a href=\"http://127.0.0.1:7657/config\">" + _("Configuration") + "</a> <a href=\"http://127.0.0.1:7657/help.jsp\">" + _("Help") + "</a> <a href=\"http://127.0.0.1:7657/susidns/index.jsp\">" + _("Addressbook") + "</a>\n" + "<a href=\"http://127.0.0.1:7657/config\">" + _("Configuration") + "</a> <a href=\"http://127.0.0.1:7657/help.jsp\">" + _("Help") + "</a> <a href=\"http://127.0.0.1:7657/susidns/index\">" + _("Addressbook") + "</a>\n" +
"</div>" + "</div>" +
"<div class=warning id=warning>\n" + "<div class=warning id=warning>\n" +
"<h3>" + "<h3>" +

6
apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
View File

@ -14,14 +14,14 @@ import org.mortbay.jetty.servlet.WebApplicationHandler;
* Convert foo.jsp to foo_xx.jsp for language xx. * Convert foo.jsp to foo_xx.jsp for language xx.
* This is appropriate for jsps with large amounts of text. * This is appropriate for jsps with large amounts of text.
* *
* Also, as of 0.8.2, rewrite "/" and "/index.html" to "/index.jsp",x * Also, as of 0.8.2, rewrite "/" and "/index.html" to "/index.jsp",
* and "/foo" to "/foo.jsp". * and "/foo" to "/foo.jsp".
* *
* @author zzz * @author zzz
*/ */
public class LocaleWebAppHandler extends WebApplicationHandler public class LocaleWebAppHandler extends WebApplicationHandler
{ {
private I2PAppContext _context; private final I2PAppContext _context;
public LocaleWebAppHandler(I2PAppContext ctx) { public LocaleWebAppHandler(I2PAppContext ctx) {
super(); super();
@ -32,7 +32,7 @@ public class LocaleWebAppHandler extends WebApplicationHandler
* Handle foo.jsp by converting to foo_xx.jsp * Handle foo.jsp by converting to foo_xx.jsp
* for language xx, where xx is the language for the default locale, * for language xx, where xx is the language for the default locale,
* or as specified in the routerconsole.lang property. * or as specified in the routerconsole.lang property.
* Unless language==="en". * Unless language == "en".
*/ */
@Override @Override
public void handle(String pathInContext, public void handle(String pathInContext,

2
apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
View File

@ -63,7 +63,7 @@ public class SummaryBarRenderer {
"<hr><table>" + "<hr><table>" +
"<tr><td><a href=\"/susidns/index.jsp\" target=\"_blank\" title=\"") "<tr><td><a href=\"/susidns/index\" target=\"_blank\" title=\"")
.append(_("Manage your I2P hosts file here (I2P domain name resolution)")) .append(_("Manage your I2P hosts file here (I2P domain name resolution)"))
.append("\">") .append("\">")
.append(_("Addressbook")) .append(_("Addressbook"))

28
apps/susidns/src/WEB-INF/web-template.xml
View File

@ -14,4 +14,32 @@
<welcome-file>index.html</welcome-file> <welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file> <welcome-file>index.jsp</welcome-file>
</welcome-file-list> </welcome-file-list>
<!-- non-.jsp URLs -->
<servlet-mapping>
<servlet-name>i2p.susi.dns.jsp.config_jsp</servlet-name>
<url-pattern>/config</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>i2p.susi.dns.jsp.subscriptions_jsp</servlet-name>
<url-pattern>/subscriptions</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>i2p.susi.dns.jsp.addressbook_jsp</servlet-name>
<url-pattern>/addressbook</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>i2p.susi.dns.jsp.details_jsp</servlet-name>
<url-pattern>/details</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>i2p.susi.dns.jsp.index_jsp</servlet-name>
<url-pattern>/index</url-pattern>
</servlet-mapping>
</web-app> </web-app>

4
apps/susidns/src/index.html
View File

@ -1,11 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html> <html>
<head> <head>
<meta http-equiv="refresh" content="0;url=index.jsp" /> <meta http-equiv="refresh" content="0;url=index" />
<title>susidns</title> <title>susidns</title>
</head> </head>
<body> <body>
<a href="index.jsp">Enter</a> <a href="index">Enter</a>
</body> </body>
</html> </html>

4
apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
View File

@ -259,7 +259,7 @@ public class AddressbookBean
if (getBeginInt() > 0) { if (getBeginInt() > 0) {
int newBegin = Math.max(0, getBeginInt() - DISPLAY_SIZE); int newBegin = Math.max(0, getBeginInt() - DISPLAY_SIZE);
int newEnd = Math.max(0, getBeginInt() - 1); int newEnd = Math.max(0, getBeginInt() - 1);
message += " <a href=\"addressbook.jsp?book=" + getBook() + filterArg + message += " <a href=\"addressbook?book=" + getBook() + filterArg +
"&amp;begin=" + newBegin + "&amp;end=" + newEnd + "\">" + newBegin + "&amp;begin=" + newBegin + "&amp;end=" + newEnd + "\">" + newBegin +
'-' + newEnd + "</a> | "; '-' + newEnd + "</a> | ";
} }
@ -267,7 +267,7 @@ public class AddressbookBean
if (getEndInt() < resultCount - 1) { if (getEndInt() < resultCount - 1) {
int newBegin = Math.min(resultCount - 1, getEndInt() + 1); int newBegin = Math.min(resultCount - 1, getEndInt() + 1);
int newEnd = Math.min(resultCount, getEndInt() + DISPLAY_SIZE); int newEnd = Math.min(resultCount, getEndInt() + DISPLAY_SIZE);
message += " | <a href=\"addressbook.jsp?book=" + getBook() + filterArg + message += " | <a href=\"addressbook?book=" + getBook() + filterArg +
"&amp;begin=" + newBegin + "&amp;end=" + newEnd + "\">" + newBegin + "&amp;begin=" + newBegin + "&amp;end=" + newEnd + "\">" + newBegin +
'-' + newEnd + "</a>"; '-' + newEnd + "</a>";
} }

84
apps/susidns/src/jsp/addressbook.jsp
View File

@ -49,19 +49,19 @@
<body> <body>
<div class="page"> <div class="page">
<div id="logo"> <div id="logo">
<a href="index.jsp"><img src="images/logo.png" alt="" title="<%=intl._("Overview")%>" border="0"/></a> <a href="index"><img src="images/logo.png" alt="" title="<%=intl._("Overview")%>" border="0"/></a>
</div> </div>
<hr> <hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("Address books")%>: <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> | <a href="addressbook?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> | <a href="addressbook?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> | <a href="addressbook?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> * <a href="addressbook?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> *
<a href="subscriptions.jsp"><%=intl._("Subscriptions")%></a> * <a href="subscriptions"><%=intl._("Subscriptions")%></a> *
<a href="config.jsp"><%=intl._("Configuration")%></a> * <a href="config"><%=intl._("Configuration")%></a> *
<a href="index.jsp"><%=intl._("Overview")%></a> <a href="index"><%=intl._("Overview")%></a>
</p> </p>
</div> </div>
<hr> <hr>
@ -77,43 +77,43 @@ ${book.loadBookMessages}
<c:if test="${book.notEmpty}"> <c:if test="${book.notEmpty}">
<div id="filter"> <div id="filter">
<p><%=intl._("Filter")%>: <p><%=intl._("Filter")%>:
<a href="addressbook.jsp?filter=a&amp;begin=0&amp;end=99">a</a> <a href="addressbook?filter=a&amp;begin=0&amp;end=99">a</a>
<a href="addressbook.jsp?filter=b&amp;begin=0&amp;end=99">b</a> <a href="addressbook?filter=b&amp;begin=0&amp;end=99">b</a>
<a href="addressbook.jsp?filter=c&amp;begin=0&amp;end=99">c</a> <a href="addressbook?filter=c&amp;begin=0&amp;end=99">c</a>
<a href="addressbook.jsp?filter=d&amp;begin=0&amp;end=99">d</a> <a href="addressbook?filter=d&amp;begin=0&amp;end=99">d</a>
<a href="addressbook.jsp?filter=e&amp;begin=0&amp;end=99">e</a> <a href="addressbook?filter=e&amp;begin=0&amp;end=99">e</a>
<a href="addressbook.jsp?filter=f&amp;begin=0&amp;end=99">f</a> <a href="addressbook?filter=f&amp;begin=0&amp;end=99">f</a>
<a href="addressbook.jsp?filter=g&amp;begin=0&amp;end=99">g</a> <a href="addressbook?filter=g&amp;begin=0&amp;end=99">g</a>
<a href="addressbook.jsp?filter=h&amp;begin=0&amp;end=99">h</a> <a href="addressbook?filter=h&amp;begin=0&amp;end=99">h</a>
<a href="addressbook.jsp?filter=i&amp;begin=0&amp;end=99">i</a> <a href="addressbook?filter=i&amp;begin=0&amp;end=99">i</a>
<a href="addressbook.jsp?filter=j&amp;begin=0&amp;end=99">j</a> <a href="addressbook?filter=j&amp;begin=0&amp;end=99">j</a>
<a href="addressbook.jsp?filter=k&amp;begin=0&amp;end=99">k</a> <a href="addressbook?filter=k&amp;begin=0&amp;end=99">k</a>
<a href="addressbook.jsp?filter=l&amp;begin=0&amp;end=99">l</a> <a href="addressbook?filter=l&amp;begin=0&amp;end=99">l</a>
<a href="addressbook.jsp?filter=m&amp;begin=0&amp;end=99">m</a> <a href="addressbook?filter=m&amp;begin=0&amp;end=99">m</a>
<a href="addressbook.jsp?filter=n&amp;begin=0&amp;end=99">n</a> <a href="addressbook?filter=n&amp;begin=0&amp;end=99">n</a>
<a href="addressbook.jsp?filter=o&amp;begin=0&amp;end=99">o</a> <a href="addressbook?filter=o&amp;begin=0&amp;end=99">o</a>
<a href="addressbook.jsp?filter=p&amp;begin=0&amp;end=99">p</a> <a href="addressbook?filter=p&amp;begin=0&amp;end=99">p</a>
<a href="addressbook.jsp?filter=q&amp;begin=0&amp;end=99">q</a> <a href="addressbook?filter=q&amp;begin=0&amp;end=99">q</a>
<a href="addressbook.jsp?filter=r&amp;begin=0&amp;end=99">r</a> <a href="addressbook?filter=r&amp;begin=0&amp;end=99">r</a>
<a href="addressbook.jsp?filter=s&amp;begin=0&amp;end=99">s</a> <a href="addressbook?filter=s&amp;begin=0&amp;end=99">s</a>
<a href="addressbook.jsp?filter=t&amp;begin=0&amp;end=99">t</a> <a href="addressbook?filter=t&amp;begin=0&amp;end=99">t</a>
<a href="addressbook.jsp?filter=u&amp;begin=0&amp;end=99">u</a> <a href="addressbook?filter=u&amp;begin=0&amp;end=99">u</a>
<a href="addressbook.jsp?filter=v&amp;begin=0&amp;end=99">v</a> <a href="addressbook?filter=v&amp;begin=0&amp;end=99">v</a>
<a href="addressbook.jsp?filter=w&amp;begin=0&amp;end=99">w</a> <a href="addressbook?filter=w&amp;begin=0&amp;end=99">w</a>
<a href="addressbook.jsp?filter=x&amp;begin=0&amp;end=99">x</a> <a href="addressbook?filter=x&amp;begin=0&amp;end=99">x</a>
<a href="addressbook.jsp?filter=y&amp;begin=0&amp;end=99">y</a> <a href="addressbook?filter=y&amp;begin=0&amp;end=99">y</a>
<a href="addressbook.jsp?filter=z&amp;begin=0&amp;end=99">z</a> <a href="addressbook?filter=z&amp;begin=0&amp;end=99">z</a>
<a href="addressbook.jsp?filter=0-9&amp;begin=0&amp;end=99">0-9</a> <a href="addressbook?filter=0-9&amp;begin=0&amp;end=99">0-9</a>
<a href="addressbook.jsp?filter=xn--&amp;begin=0&amp;end=99"><%=intl._("other")%></a> <a href="addressbook?filter=xn--&amp;begin=0&amp;end=99"><%=intl._("other")%></a>
<a href="addressbook.jsp?filter=none&amp;begin=0&amp;end=99"><%=intl._("all")%></a></p> <a href="addressbook?filter=none&amp;begin=0&amp;end=99"><%=intl._("all")%></a></p>
<c:if test="${book.hasFilter}"> <c:if test="${book.hasFilter}">
<p><%=intl._("Current filter")%>: ${book.filter} <p><%=intl._("Current filter")%>: ${book.filter}
(<a href="addressbook.jsp?filter=none&amp;begin=0&amp;end=99"><%=intl._("clear filter")%></a>)</p> (<a href="addressbook?filter=none&amp;begin=0&amp;end=99"><%=intl._("clear filter")%></a>)</p>
</c:if> </c:if>
</div> </div>
<div id="search"> <div id="search">
<form method="POST" action="addressbook.jsp"> <form method="POST" action="addressbook">
<input type="hidden" name="begin" value="0"> <input type="hidden" name="begin" value="0">
<input type="hidden" name="end" value="99"> <input type="hidden" name="end" value="99">
<table><tr> <table><tr>
@ -129,7 +129,7 @@ ${book.loadBookMessages}
String susiNonce = book.getSerial(); String susiNonce = book.getSerial();
%> %>
<c:if test="${book.notEmpty}"> <c:if test="${book.notEmpty}">
<form method="POST" action="addressbook.jsp"> <form method="POST" action="addressbook">
<input type="hidden" name="serial" value="<%=susiNonce%>"> <input type="hidden" name="serial" value="<%=susiNonce%>">
<input type="hidden" name="begin" value="0"> <input type="hidden" name="begin" value="0">
<input type="hidden" name="end" value="99"> <input type="hidden" name="end" value="99">
@ -156,7 +156,7 @@ ${book.loadBookMessages}
</td><td class="names"> </td><td class="names">
<span class="addrhlpr"><a href="http://${addr.b32}/" title="<%=intl._("Base 32 address")%>">b32</a></span> <span class="addrhlpr"><a href="http://${addr.b32}/" title="<%=intl._("Base 32 address")%>">b32</a></span>
</td><td class="names"> </td><td class="names">
<span class="addrhlpr"><a href="details.jsp?h=${addr.name}" title="<%=intl._("More information on this entry")%>"><%=intl._("details")%></a></span> <span class="addrhlpr"><a href="details?h=${addr.name}" title="<%=intl._("More information on this entry")%>"><%=intl._("details")%></a></span>
</td> </td>
<td class="destinations"><textarea rows="1" style="height: 3em;" cols="40" wrap="off" readonly="readonly" name="dest_${addr.name}" >${addr.destination}</textarea></td> <td class="destinations"><textarea rows="1" style="height: 3em;" cols="40" wrap="off" readonly="readonly" name="dest_${addr.name}" >${addr.destination}</textarea></td>
</tr> </tr>
@ -181,7 +181,7 @@ ${book.loadBookMessages}
</div> </div>
</c:if> </c:if>
<form method="POST" action="addressbook.jsp"> <form method="POST" action="addressbook">
<input type="hidden" name="serial" value="<%=susiNonce%>"> <input type="hidden" name="serial" value="<%=susiNonce%>">
<input type="hidden" name="begin" value="0"> <input type="hidden" name="begin" value="0">
<input type="hidden" name="end" value="99"> <input type="hidden" name="end" value="99">

16
apps/susidns/src/jsp/config.jsp
View File

@ -45,25 +45,25 @@
<body> <body>
<div class="page"> <div class="page">
<div id="logo"> <div id="logo">
<a href="index.jsp"><img src="images/logo.png" alt="" title="<%=intl._("Overview")%>" border="0"/></a> <a href="index"><img src="images/logo.png" alt="" title="<%=intl._("Overview")%>" border="0"/></a>
</div><hr> </div><hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("Address books")%>: <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private"><%=intl._("private")%></a> | <a href="addressbook?book=private"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master"><%=intl._("master")%></a> | <a href="addressbook?book=master"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router"><%=intl._("router")%></a> | <a href="addressbook?book=router"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published"><%=intl._("published")%></a> * <a href="addressbook?book=published"><%=intl._("published")%></a> *
<a href="subscriptions.jsp"><%=intl._("Subscriptions")%></a> * <a href="subscriptions"><%=intl._("Subscriptions")%></a> *
<%=intl._("Configuration")%> * <%=intl._("Configuration")%> *
<a href="index.jsp"><%=intl._("Overview")%></a> <a href="index"><%=intl._("Overview")%></a>
</p> </p>
</div><hr> </div><hr>
<div id="headline"> <div id="headline">
<h3>${cfg.fileName}</h3> <h3>${cfg.fileName}</h3>
</div> </div>
<div id="messages">${cfg.messages}</div> <div id="messages">${cfg.messages}</div>
<form method="POST" action="config.jsp"> <form method="POST" action="config">
<div id="config"> <div id="config">
<input type="hidden" name="serial" value="${cfg.serial}" > <input type="hidden" name="serial" value="${cfg.serial}" >
<textarea name="config" rows="10" cols="80">${cfg.config}</textarea> <textarea name="config" rows="10" cols="80">${cfg.config}</textarea>

18
apps/susidns/src/jsp/details.jsp
View File

@ -43,19 +43,19 @@
<body> <body>
<div class="page"> <div class="page">
<div id="logo"> <div id="logo">
<a href="index.jsp"><img src="images/logo.png" alt="" title="<%=intl._("Overview")%>" border="0"/></a> <a href="index"><img src="images/logo.png" alt="" title="<%=intl._("Overview")%>" border="0"/></a>
</div> </div>
<hr> <hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("Address books")%>: <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> | <a href="addressbook?book=private&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> | <a href="addressbook?book=master&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> | <a href="addressbook?book=router&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> * <a href="addressbook?book=published&amp;filter=none&amp;begin=0&amp;end=99"><%=intl._("published")%></a> *
<a href="subscriptions.jsp"><%=intl._("Subscriptions")%></a> * <a href="subscriptions"><%=intl._("Subscriptions")%></a> *
<a href="config.jsp"><%=intl._("Configuration")%></a> * <a href="config"><%=intl._("Configuration")%></a> *
<a href="index.jsp"><%=intl._("Overview")%></a> <a href="index"><%=intl._("Overview")%></a>
</p> </p>
</div> </div>
<hr> <hr>
@ -123,7 +123,7 @@
</tr></table> </tr></table>
</div> </div>
<div id="buttons"> <div id="buttons">
<form method="POST" action="addressbook.jsp"> <form method="POST" action="addressbook">
<p class="buttons"> <p class="buttons">
<input type="hidden" name="serial" value="${book.serial}"> <input type="hidden" name="serial" value="${book.serial}">
<input type="hidden" name="begin" value="0"> <input type="hidden" name="begin" value="0">

14
apps/susidns/src/jsp/index.jsp
View File

@ -49,12 +49,12 @@
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("Address books")%>: <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private"><%=intl._("private")%></a> | <a href="addressbook?book=private"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master"><%=intl._("master")%></a> | <a href="addressbook?book=master"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router"><%=intl._("router")%></a> | <a href="addressbook?book=router"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published"><%=intl._("published")%></a> * <a href="addressbook?book=published"><%=intl._("published")%></a> *
<a href="subscriptions.jsp"><%=intl._("Subscriptions")%></a> * <a href="subscriptions"><%=intl._("Subscriptions")%></a> *
<a href="config.jsp"><%=intl._("Configuration")%></a> * <a href="config"><%=intl._("Configuration")%></a> *
<%=intl._("Overview")%> <%=intl._("Overview")%>
</p> </p>
</div> </div>
@ -67,7 +67,7 @@
</p> </p>
<p> <p>
<%=intl._("In the default configuration, the address book is only subscribed to www.i2p2.i2p.")%> <%=intl._("In the default configuration, the address book is only subscribed to www.i2p2.i2p.")%>
<%=intl._("Subscribing to additional sites is easy, just add them to your <a href=\"subscriptions.jsp\">subscriptions</a> file.")%> <%=intl._("Subscribing to additional sites is easy, just add them to your <a href=\"subscriptions\">subscriptions</a> file.")%>
</p> </p>
<p> <p>
<%=intl._("For more information on naming in I2P, see <a href=\"http://www.i2p2.i2p/naming.html\">the overview on www.i2p2.i2p</a>.")%> <%=intl._("For more information on naming in I2P, see <a href=\"http://www.i2p2.i2p/naming.html\">the overview on www.i2p2.i2p</a>.")%>

16
apps/susidns/src/jsp/subscriptions.jsp
View File

@ -45,25 +45,25 @@
<body> <body>
<div class="page"> <div class="page">
<div id="logo"> <div id="logo">
<a href="index.jsp"><img src="images/logo.png" alt="" title="<%=intl._("Overview")%>" border="0"/></a> <a href="index"><img src="images/logo.png" alt="" title="<%=intl._("Overview")%>" border="0"/></a>
</div><hr> </div><hr>
<div id="navi"> <div id="navi">
<p> <p>
<%=intl._("Address books")%>: <%=intl._("Address books")%>:
<a href="addressbook.jsp?book=private"><%=intl._("private")%></a> | <a href="addressbook?book=private"><%=intl._("private")%></a> |
<a href="addressbook.jsp?book=master"><%=intl._("master")%></a> | <a href="addressbook?book=master"><%=intl._("master")%></a> |
<a href="addressbook.jsp?book=router"><%=intl._("router")%></a> | <a href="addressbook?book=router"><%=intl._("router")%></a> |
<a href="addressbook.jsp?book=published"><%=intl._("published")%></a> * <a href="addressbook?book=published"><%=intl._("published")%></a> *
<%=intl._("Subscriptions")%> * <%=intl._("Subscriptions")%> *
<a href="config.jsp"><%=intl._("Configuration")%></a> * <a href="config"><%=intl._("Configuration")%></a> *
<a href="index.jsp"><%=intl._("Overview")%></a> <a href="index"><%=intl._("Overview")%></a>
</p> </p>
</div><hr> </div><hr>
<div id="headline"> <div id="headline">
<h3>${subs.fileName}</h3> <h3>${subs.fileName}</h3>
</div> </div>
<div id="messages">${subs.messages}</div> <div id="messages">${subs.messages}</div>
<form method="POST" action="subscriptions.jsp"> <form method="POST" action="subscriptions">
<div id="content"> <div id="content">
<input type="hidden" name="serial" value="${subs.serial}" > <input type="hidden" name="serial" value="${subs.serial}" >
<textarea name="content" rows="10" cols="80">${subs.content}</textarea> <textarea name="content" rows="10" cols="80">${subs.content}</textarea>

6
history.txt
View File

@ -1,3 +1,9 @@
2011-11-14 zzz
* Console: Remove % chart at bottom of tunnels.jsp
* Profiles: Only use same-country metric for countries with
lots of I2P users
* SusiDNS: Remove .jsp suffixes
2011-11-12 zzz 2011-11-12 zzz
* Installer: Fix Ukrainian translation (ticket #550) thx rndnick * Installer: Fix Ukrainian translation (ticket #550) thx rndnick

2
installer/resources/proxy/denied-header_fr.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Console routeur I2P"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Console routeur I2P" border="0"></a><hr> <a href="http://127.0.0.1:7657/index.jsp" title="Console routeur I2P"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Console routeur I2P" 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">Aide</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Carnet d'adresse</a> <a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Aide</a> <a href="http://127.0.0.1:7657/susidns/index">Carnet d'adresse</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Avertissement I2P: Requête refusée</h3> <h3>Avertissement I2P: Requête refusée</h3>

2
installer/resources/proxy/dnf-header.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <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><hr> <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/index.jsp">Addressbook</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/index">Addressbook</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Warning: Eepsite Unreachable</h3> <h3>Warning: Eepsite Unreachable</h3>

2
installer/resources/proxy/dnf-header_de.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr> <a href="http://127.0.0.1:7657/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
<a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Adressbuch</a> <a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/index">Adressbuch</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Warnung: Eepseite unerreichbar</h3> <h3>Warnung: Eepseite unerreichbar</h3>

2
installer/resources/proxy/dnf-header_fr.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Console routeur I2P"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Console routeur I2P" border="0"></a><hr> <a href="http://127.0.0.1:7657/index.jsp" title="Console routeur I2P"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Console routeur I2P" 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">Aide</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Carnet d'adresse</a> <a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Aide</a> <a href="http://127.0.0.1:7657/susidns/index">Carnet d'adresse</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Avertissement I2P: site eep non joignable</h3> <h3>Avertissement I2P: site eep non joignable</h3>

2
installer/resources/proxy/dnf-header_nl.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <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><hr> <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">Configuratie</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Adresboek</a> <a href="http://127.0.0.1:7657/config.jsp">Configuratie</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/index">Adresboek</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Waarschuwing: Eepsite Onbereikbaar</h3> <h3>Waarschuwing: Eepsite Onbereikbaar</h3>

2
installer/resources/proxy/dnf-header_ru.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Консоль маршрутизатора"><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/index.jsp" title="Консоль маршрутизатора"><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">Настройки</a> <a href="http://127.0.0.1:7657/help.jsp">Справка</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Адресная книга</a> <a href="http://127.0.0.1:7657/config.jsp">Настройки</a> <a href="http://127.0.0.1:7657/help.jsp">Справка</a> <a href="http://127.0.0.1:7657/susidns/index">Адресная книга</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>

2
installer/resources/proxy/dnf-header_zh.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <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><hr> <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">设置</a> <a href="http://127.0.0.1:7657/help.jsp">帮助</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">地址簿</a> <a href="http://127.0.0.1:7657/config.jsp">设置</a> <a href="http://127.0.0.1:7657/help.jsp">帮助</a> <a href="http://127.0.0.1:7657/susidns/index">地址簿</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>警告: 匿名站点不可达</h3> <h3>警告: 匿名站点不可达</h3>

2
installer/resources/proxy/dnfb-header_fr.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Console routeur I2P"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Console routeur I2P" border="0"></a><hr> <a href="http://127.0.0.1:7657/index.jsp" title="Console routeur I2P"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Console routeur I2P" 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">Aide</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Carnet d'adresse</a> <a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Aide</a> <a href="http://127.0.0.1:7657/susidns/index">Carnet d'adresse</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Avertissement I2P: destination eep site incorrecte</h3> <h3>Avertissement I2P: destination eep site incorrecte</h3>

2
installer/resources/proxy/dnfh-header.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <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><hr> <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/index.jsp">Addressbook</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/index">Addressbook</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Warning: Eepsite Not Found in Addressbook</h3> <h3>Warning: Eepsite Not Found in Addressbook</h3>

2
installer/resources/proxy/dnfh-header_de.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr> <a href="http://127.0.0.1:7657/index.jsp" title="Routerkonsole"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="I2P-Routerkonsole" border="0"></a><hr>
<a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Adressbuch</a> <a href="http://127.0.0.1:7657/config.jsp">Einstellungen</a> <a href="http://127.0.0.1:7657/help.jsp">Hilfe</a> <a href="http://127.0.0.1:7657/susidns/index">Adressbuch</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Warnung: Eepseite nicht im Adressbuch gefunden</h3> <h3>Warnung: Eepseite nicht im Adressbuch gefunden</h3>

2
installer/resources/proxy/dnfh-header_fr.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Console routeur I2P"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Console routeur I2P" border="0"></a><hr> <a href="http://127.0.0.1:7657/index.jsp" title="Console routeur I2P"><img src="http://proxy.i2p/themes/console/images/i2plogo.png" alt="Console routeur I2P" 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">Aide</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Carnet d'adresse</a> <a href="http://127.0.0.1:7657/config.jsp">Configuration</a> <a href="http://127.0.0.1:7657/help.jsp">Aide</a> <a href="http://127.0.0.1:7657/susidns/index">Carnet d'adresse</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Avertissement I2P: site eep non trouvé dans le carnet d'adresses</h3> <h3>Avertissement I2P: site eep non trouvé dans le carnet d'adresses</h3>

2
installer/resources/proxy/dnfh-header_nl.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <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><hr> <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">Configuratie</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Adresboek</a> <a href="http://127.0.0.1:7657/config.jsp">Configuratie</a> <a href="http://127.0.0.1:7657/help.jsp">Help</a> <a href="http://127.0.0.1:7657/susidns/index">Adresboek</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>Waarschuwing: Eepsite Niet Gevonden in Adresboek</h3> <h3>Waarschuwing: Eepsite Niet Gevonden in Adresboek</h3>

2
installer/resources/proxy/dnfh-header_ru.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <div class=logo>
<a href="http://127.0.0.1:7657/index.jsp" title="Консоль маршрутизатора"><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/index.jsp" title="Консоль маршрутизатора"><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">Настройки</a> <a href="http://127.0.0.1:7657/help.jsp">Справка</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">Адресная книга</a> <a href="http://127.0.0.1:7657/config.jsp">Настройки</a> <a href="http://127.0.0.1:7657/help.jsp">Справка</a> <a href="http://127.0.0.1:7657/susidns/index">Адресная книга</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>

2
installer/resources/proxy/dnfh-header_zh.ht
View File

@ -12,7 +12,7 @@ Proxy-Connection: close
<body> <body>
<div class=logo> <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><hr> <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">设置</a> <a href="http://127.0.0.1:7657/help.jsp">帮助</a> <a href="http://127.0.0.1:7657/susidns/index.jsp">地址簿</a> <a href="http://127.0.0.1:7657/config.jsp">设置</a> <a href="http://127.0.0.1:7657/help.jsp">帮助</a> <a href="http://127.0.0.1:7657/susidns/index">地址簿</a>
</div> </div>
<div class=warning id=warning> <div class=warning id=warning>
<h3>警告: 地址簿中的找不到此站点</h3> <h3>警告: 地址簿中的找不到此站点</h3>

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

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 2; public final static long BUILD = 3;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";