From cb0147a79858d27f23ea00f8a500b2b64325ae88 Mon Sep 17 00:00:00 2001 From: str4d Date: Sun, 1 May 2016 03:24:25 +0000 Subject: [PATCH] Collate help topics under /help --- .../i2p/router/web/SummaryBarRenderer.java | 2 +- apps/routerconsole/jsp/confignet.jsp | 91 ------------------- apps/routerconsole/jsp/help-sidebar.jsi | 32 +++---- apps/routerconsole/jsp/help.jsi | 10 +- apps/routerconsole/jsp/help.jsp | 15 +-- .../router/transport/TransportManager.java | 3 +- 6 files changed, 33 insertions(+), 120 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index 6ab4128159..f27a12b375 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -330,7 +330,7 @@ class SummaryBarRenderer { public String renderNetworkReachabilityHTML() { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(512); - buf.append("

") .append(_t("Network")) diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp index 7ff829bc18..11b3bcc89d 100644 --- a/apps/routerconsole/jsp/confignet.jsp +++ b/apps/routerconsole/jsp/confignet.jsp @@ -165,103 +165,12 @@ -

<%=intl._t("Configuration Help")%>

-
-

- <%=intl._t("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP.")%> -

- <%=intl._t("If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you.")%> - <%=intl._t("If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic.")%> - <%=intl._t("Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm.")%> - <%=intl._t("Certain firewalls such as symmetric NATs may not work well with I2P.")%> -

<% /******** *********/ %> -

- <%=intl._t("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%> - <%=intl._t("UPnP support is beta, and may not work for any number of reasons")%>: -

-
    -
  • <%=intl._t("No UPnP-compatible device present")%> -
  • <%=intl._t("UPnP disabled on the device")%> -
  • <%=intl._t("Software firewall interference with UPnP")%> -
  • <%=intl._t("Bugs in the device's UPnP implementation")%> -
  • <%=intl._t("Multiple firewall/routers in the internet connection path")%> -
  • <%=intl._t("UPnP device change, reset, or address change")%> -
-

<%=intl._t("Review the UPnP status here.")%> -<%=intl._t("UPnP may be enabled or disabled above, but a change requires a router restart to take effect.")%>

-

<%=intl._t("Hostnames entered above will be published in the network database.")%> - <%=intl._t("They are not private.")%> - <%=intl._t("Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1.")%> - <%=intl._t("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%> - <%=intl._t("When in doubt, leave the settings at the defaults.")%> -

-
-

<%=intl._t("Reachability Help")%>

-
-

- <%=intl._t("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP.")%> - <%=intl._t("If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers.")%> - <%=intl._t("If there is an error, the logs may also help diagnose the problem.")%> -

- -
<% /********