From c4e2019657eef8e2cb2b478125d26ac8d1eacaab Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 17 Apr 2013 17:06:34 +0000 Subject: [PATCH] * SusiDNS: Set target=_top in all external links to break out of console iframe --- .../susidns/src/java/src/i2p/susi/dns/AddressBean.java | 2 +- apps/susidns/src/jsp/addressbook.jsp | 6 +++--- apps/susidns/src/jsp/config.jsp | 2 +- apps/susidns/src/jsp/details.jsp | 10 +++++----- apps/susidns/src/jsp/index.jsp | 4 ++-- apps/susidns/src/jsp/subscriptions.jsp | 4 ++-- history.txt | 2 ++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java index 3f3e537b72..24289f903e 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java @@ -187,7 +187,7 @@ public class AddressBean public String getSource() { String rv = getProp("s"); if (rv.startsWith("http://")) - rv = "" + rv + ""; + rv = "" + rv + ""; return rv; } diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index 38cc7bf860..374caeb716 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -155,9 +155,9 @@ ${book.loadBookMessages} "> -${addr.displayName} +${addr.displayName} -">b32 +">b32 "><%=intl._("details")%> @@ -204,7 +204,7 @@ ${book.loadBookMessages} diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp index d0978416e5..03cc9b0a32 100644 --- a/apps/susidns/src/jsp/config.jsp +++ b/apps/susidns/src/jsp/config.jsp @@ -137,7 +137,7 @@ diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp index 59978810e0..2c657f7c23 100644 --- a/apps/susidns/src/jsp/details.jsp +++ b/apps/susidns/src/jsp/details.jsp @@ -83,25 +83,25 @@ - + <% if (addr.isIDN()) { %> - + <% } %> - + - + @@ -145,7 +145,7 @@ %> diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index 20bf151045..f42b435346 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -74,7 +74,7 @@ <%=intl._("Subscribing to additional sites is easy, just add them to your subscriptions file.")%>

-<%=intl._("For more information on naming in I2P, see the overview on www.i2p2.i2p.")%> +<%=intl._("For more information on naming in I2P, see the overview on www.i2p2.i2p.")%>

<%=intl._("How does the addressbook application work?")%>

@@ -90,7 +90,7 @@

diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index b0f66ac7b8..88807125d9 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -83,12 +83,12 @@ <%=intl._("Those URLs refer to published hosts.txt files.")%> <%=intl._("The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently.")%> <%=intl._("So it is a good idea to add additional subscriptions to sites that have the latest addresses.")%> -<%=intl._("See the FAQ for a list of subscription URLs.")%> +<%=intl._("See the FAQ for a list of subscription URLs.")%>

diff --git a/history.txt b/history.txt index 0f7d4d1ed4..1637bdb3c2 100644 --- a/history.txt +++ b/history.txt @@ -1,5 +1,7 @@ 2013-04-17 zzz * Console: Better handling of missing font for graphing (ticket #915) + * i2ptunnel: Fix default form action (ticket #882) + * SusiDNS: Set target=_top in all external links to break out of console iframe * Systray: Better detection of 64-bit Windows (tickets #756, #912) 2013-04-16 zzz diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fecba78d69..a6204817e3 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 = 7; + public final static long BUILD = 8; /** for example "-test" */ public final static String EXTRA = "";
<%=intl._("Host Name")%><%=addr.getDisplayName()%><%=addr.getDisplayName()%>
<%=intl._("Encoded Name")%><%=addr.getName()%><%=addr.getName()%>
<%=intl._("Base 32 Address")%><%=b32%><%=b32%>
<%=intl._("Base 64 Hash")%> <%=addr.getB64()%>
<%=intl._("Address Helper")%><%=intl._("link")%><%=intl._("link")%>
<%=intl._("Public Key")%> <%=intl._("ElGamal 2048 bit")%>