From f95100a1ffb161ce208b102b86183083ff398a91 Mon Sep 17 00:00:00 2001 From: str4d Date: Mon, 23 May 2016 11:02:10 +0000 Subject: [PATCH] Update links, add tooltips etc. --- .../net/i2p/router/web/BanlistRenderer.java | 4 ++-- .../src/net/i2p/router/web/GraphHelper.java | 4 +++- .../src/net/i2p/router/web/NetDbRenderer.java | 14 ++++++++++---- .../src/net/i2p/router/web/SummaryHelper.java | 2 +- .../src/net/i2p/router/web/SybilRenderer.java | 2 +- .../net/i2p/router/web/TunnelRenderer.java | 4 ++-- apps/routerconsole/jsp/config.jsp | 5 +---- apps/routerconsole/jsp/configadvanced.jsp | 2 +- apps/routerconsole/jsp/configlogging.jsp | 2 +- apps/routerconsole/jsp/confignet.jsp | 19 +++++++++---------- apps/routerconsole/jsp/configservice.jsp | 4 +--- apps/routerconsole/jsp/configstats.jsp | 2 +- apps/routerconsole/jsp/help.jsp | 2 +- apps/routerconsole/jsp/home.jsp | 2 +- apps/routerconsole/jsp/logs.jsp | 2 +- apps/susidns/src/jsp/addressbook.jsp | 4 ++-- 16 files changed, 38 insertions(+), 36 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java index 0cf6c8744..9d37b6dbc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/BanlistRenderer.java @@ -78,8 +78,8 @@ class BanlistRenderer { buf.append(_t(entry.cause)); } if (!key.equals(Hash.FAKE_HASH)) { - buf.append(" (").append(_t("unban now")).append(")"); + buf.append(" [").append(_t("unban now")).append("]"); } buf.append("\n"); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java index 8deb80b1d..9c44c06eb 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -322,6 +322,8 @@ public class GraphHelper extends FormHandler { _out.write(""); _out.write("

" + _t("All times are UTC.") + "

\n"); + + _out.write("

" + _t("Return to main graphs page") + "

\n"); } catch (IOException ioe) { ioe.printStackTrace(); } @@ -353,7 +355,7 @@ public class GraphHelper extends FormHandler { // So just use the "shared/console nonce". String nonce = CSSHelper.getNonce(); try { - _out.write("

" + _t("Configure Graph Display") + " [" + _t("Select Stats") + "]

"); + _out.write("

" + _t("Configure Graph Display") + " [" + _t("Select Stats") + "]

"); _out.write("
\n" + "\n" + "\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java index 081db5490..e4f4a33b7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -152,7 +152,9 @@ class NetDbRenderer { buf.append("\n"); } buf.append("") - .append("\n") + .append("\n") .append("\n"); if (debug) { buf.append("\n") @@ -217,7 +219,8 @@ class NetDbRenderer { buf.append("").append(b32).append(""); String host = _context.namingService().reverseLookup(dest); if (host == null) { - buf.append(""); } } else { @@ -230,7 +233,8 @@ class NetDbRenderer { buf.append("").append(dest.toBase64().substring(0, 6)).append("") .append("\n") .append("\n") - .append(""); } } @@ -478,7 +482,9 @@ class NetDbRenderer { } else { buf.append("" + _t("Peer info for") + ": ").append(hash).append("\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index 9d2ad5199..a81a637c0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -820,7 +820,7 @@ public class SummaryHelper extends HelperBase { public String getFirewallAndReseedStatus() { StringBuilder buf = new StringBuilder(256); if (showFirewallWarning()) { - buf.append("

") .append(_t("Check network connection and NAT/firewall")) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SybilRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SybilRenderer.java index b30d3a382..652767842 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SybilRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SybilRenderer.java @@ -768,7 +768,7 @@ class SybilRenderer { } else { buf.append("

\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java index 55b124e74..88aa523cb 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java @@ -33,7 +33,7 @@ class TunnelRenderer { } public void renderStatusHTML(Writer out) throws IOException { - out.write("

" + _t("Exploratory tunnels") + " (" + _t("configure") + ")

\n"); + out.write("

" + _t("Exploratory tunnels") + " [" + _t("configure") + "]

\n"); renderPool(out, _context.tunnelManager().getInboundExploratoryPool(), _context.tunnelManager().getOutboundExploratoryPool()); List destinations = null; @@ -57,7 +57,7 @@ class TunnelRenderer { out.write("

" + _t("Client tunnels for") + ' ' + DataHelper.escapeHTML(_t(name))); if (isLocal) - out.write(" (" + _t("configure") + ")

\n"); + out.write(" [" + _t("configure") + "]\n"); else out.write(" (" + _t("dead") + ")\n"); renderPool(out, in, outPool); diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 44c1f10c1..c7cbac7e4 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -25,7 +25,7 @@ -

<%=intl._t("Bandwidth limiter")%>

+

<%=intl._t("Bandwidth Limiter")%> [<%=intl._t("Advanced Network Configuration")%>]

Leaseset SummaryConfigure Floodfill Participation
[") + .append(_t("Configure Floodfill Participation")) + .append("]
Total Leasesets:").append(leases.size()).append("
Published (RAP) Leasesets:").append(netdb.getKnownLeaseSets()).append("
").append("").append("").append(_t("Add to local addressbook")).append("
").append(b32).append("").append(_t("Add to local addressbook")).append(""); if (!full) { - buf.append("").append(_t("Full entry")).append(""); + buf.append("[").append(_t("Full entry")).append("]"); } } buf.append("
" + _t("Router") + ": ").append(hash).append("\n"); if (!full) { - buf.append("").append(_t("Full entry")).append(""); + buf.append("[").append(_t("Full entry")).append("]"); } buf.append(" "); buf.append("
-
<%=intl._t("I2P will work best if you configure your rates to match the speed of your internet connection.")%> @@ -76,9 +76,6 @@ out.print(intl._t("The higher the share bandwidth the more you improve your anonymity and help the network.")); } %>
- <%=intl._t("Advanced network configuration page")%> -
" > " > diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index a235bb3ab..2af2d4d84 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -56,7 +56,7 @@
-

<%=intl._t("Advanced I2P Configuration")%>

+

<%=intl._t("Advanced I2P Configuration")%> [Additional Options]

<% if (advancedhelper.isAdvanced()) { %>
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index a899eb53a..5a0902944 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -22,7 +22,7 @@ -

<%=intl._t("Configure I2P Logging Options")%>

+

<%=intl._t("Configure I2P Logging Options")%> " href="/logs">[<%=intl._t("View Logs")%>]

<%=intl._t("Log file")%>: " value="" > diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp index 923dbccc5..5079d8b1d 100644 --- a/apps/routerconsole/jsp/confignet.jsp +++ b/apps/routerconsole/jsp/confignet.jsp @@ -22,27 +22,21 @@ -

<%=intl._t("IP and Transport Configuration")%>

+

<%=intl._t("IP and Transport Configuration")%> " href="/help#configurationhelp">[<%=intl._t("Configuration Help")%>]

- - - - + @@ -106,6 +100,11 @@ + + + +%> <% } // end iterating over required groups for the current stat %> diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp index b420456bc..a84dc39ae 100644 --- a/apps/routerconsole/jsp/help.jsp +++ b/apps/routerconsole/jsp/help.jsp @@ -29,7 +29,7 @@ -

View the full change log

+

View the full change log

diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp index a0b5344e5..a71bdcc49 100644 --- a/apps/routerconsole/jsp/home.jsp +++ b/apps/routerconsole/jsp/home.jsp @@ -97,7 +97,7 @@ if (homehelper.shouldShowSearch()) { %>
- +
- <%=intl._t("The default settings will work for most people.")%> - <%=intl._t("There is help below.")%> + <%=intl._t("The default settings will work for most people.")%> <%=intl._t("Changing these settings will restart your router.")%>
- <%=intl._t("Do not reveal your port numbers to anyone as they can be used to discover your ip address.")%> -
<%=intl._t("UPnP Configuration")%><%=intl._t("UPnP Configuration")%> [<%=intl._t("UPnP Status")%>]
> - <%=intl._t("Enable UPnP to open firewall ports")%> - <%=intl._t("UPnP status")%> + <%=intl._t("Enable UPnP to open firewall ports")%>
<%=intl._t("UDP Configuration")%>
+ <%=intl._t("Do not reveal your port numbers to anyone as they can be used to discover your ip address.")%> +
<%=intl._t("UDP port:")%> diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index 772323c13..5e631b87d 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -68,12 +68,10 @@ <%=intl._t("You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat.")%>

<% } %> -

<%=intl._t("Debugging")%>

+

<%=intl._t("Debugging")%> [<%=intl._t("View the job queue")%>]

<% if (System.getProperty("wrapper.version") != null) { %>

<%=intl._t("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to wrapper.log.")%>

-

- <%=intl._t("View the job queue")%>

<% } %>
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index 0b20c1133..c44de0bca 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -110,7 +110,7 @@ Warning - Log with care, stat file grows without limit.
} // shouldShowLog -%>
<%=intl._t("Graph")%>"><%=intl._t("Graph")%>
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index 11eec9cbd..006e1fdb4 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -64,7 +64,7 @@
-

<%=intl._t("Router Logs")%> (<%=intl._t("configure")%>)

+

<%=intl._t("Router Logs")%> " href="configlogging">[<%=intl._t("Configure")%>]

diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index eb940a187..5521c5252 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -112,8 +112,8 @@ ${book.loadBookMessages} <%=intl._t("other")%> <%=intl._t("all")%>

-

<%=intl._t("Current filter")%>: ${book.filter} -(<%=intl._t("clear filter")%>)

+

<%=intl._t("Current filter")%>: ${book.filter} +<%=intl._t("clear filter")%>