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

Create 'Diagnostics' Sidebar section to delineate config and non-config items in the sidebar. Rename 'I2P Internals' to 'I2P Configuration.' Move items to categorically appropriate sidebar sections. Fix slight awk on /home.

Browse Source
This commit is contained in:
idk
2021-04-10 14:58:08 -04:00
parent f0e606cc46
commit ba745f3a8f
2 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ public class HomeHelper extends HelperBase {
return "";
}
StringBuilder buf = new StringBuilder(1380);
buf.append(topWrap(_t("Network Information and Developer Information")));
buf.append(topWrap(_t("Network and Developer Information")));
buf.append(table);
buf.append(bottomWrap);
return buf.toString();

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

@@ -33,7 +33,7 @@ import net.i2p.util.SystemVersion;
class SummaryBarRenderer {
static final String ALL_SECTIONS[] =
{"HelpAndFAQ", "I2PServices", "I2PInternals", "RouterInfo", "ShortRouterInfo", "AdvancedRouterInfo", "MemoryBar", "NetworkReachability",
{"HelpAndFAQ", "I2PServices", "I2PInternals", "I2PDiagnostics", "RouterInfo", "ShortRouterInfo", "AdvancedRouterInfo", "MemoryBar", "NetworkReachability",
"UpdateStatus", "RestartStatus", "Peers", "PeersAdvanced", "FirewallAndReseedStatus", "Bandwidth", "BandwidthGraph", "Tunnels",
"Congestion", "TunnelStatus", "Destinations", "NewsHeadings", "Advanced" };
static final Map<String, String> SECTION_NAMES;
@@ -42,7 +42,8 @@ class SummaryBarRenderer {
Map<String, String> aMap = new HashMap<String, String>();
aMap.put("HelpAndFAQ", _x("Help &amp; FAQ"));
aMap.put("I2PServices", _x("I2P Services"));
aMap.put("I2PInternals", _x("I2P Internals"));
aMap.put("I2PInternals", _x("I2P Configuration"));
aMap.put("I2PDiagnostics", _x("I2P Diagnostics"));
aMap.put("RouterInfo", _x("Router Information"));
aMap.put("ShortRouterInfo", _x("Router Information (brief)"));
aMap.put("AdvancedRouterInfo", _x("Router Information (advanced)"));
@@ -96,6 +97,8 @@ class SummaryBarRenderer {
buf.append(renderI2PServicesHTML());
else if ("I2PInternals".equals(section))
buf.append(renderI2PInternalsHTML());
else if ("I2PDiagnostics".equals(section))
buf.append(renderI2PDiagnosticsHTML());
else if ("Advanced".equals(section))
buf.append(renderAdvancedHTML());
else if ("RouterInfo".equals(section) || "General".equals(section)) // Backwards-compatibility
@@ -187,15 +190,6 @@ class SummaryBarRenderer {
.append("</a>\n");
svcs.put(tx, rbuf.toString());
tx = _t("Setup");
rbuf.setLength(0);
rbuf.append("<a href=\"/welcome\" target=\"_top\" title=\"")
.append(_t("New Install Wizard"))
.append("\">")
.append(nbsp(tx))
.append("</a>\n");
svcs.put(tx, rbuf.toString());
tx = _t("Sidebar");
rbuf.setLength(0);
rbuf.append("<a href=\"/help#sidebarhelp\" target=\"_top\" title=\"")
@@ -341,7 +335,7 @@ class SummaryBarRenderer {
buf.append("<h3><a href=\"/config\" target=\"_top\" title=\"")
.append(_t("Configure I2P Router"))
.append("\">")
.append(_t("I2P Internals"))
.append(_t("I2P Configuration"))
.append("</a></h3><hr class=\"b\">\n" +
"<table id=\"sb_internals\"><tr><td>\n");
@@ -360,11 +354,11 @@ class SummaryBarRenderer {
svcs.put(tx, rbuf.toString());
}
if (!StatSummarizer.isDisabled(_context)) {
String tx = _t("Graphs");
if (pm.isRegistered(PortMapper.SVC_I2PTUNNEL)) {
String tx = _t("Hidden Services Manager");
rbuf.setLength(0);
rbuf.append("<a href=\"/graphs\" target=\"_top\" title=\"")
.append(_t("Graph router performance"))
rbuf.append("<a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"")
.append(_t("Local Tunnels"))
.append("\">")
.append(nbsp(tx))
.append("</a>\n");
@@ -380,18 +374,62 @@ class SummaryBarRenderer {
.append("</a>\n");
svcs.put(tx, rbuf.toString());
if (pm.isRegistered(PortMapper.SVC_I2PTUNNEL)) {
tx = _t("Hidden Services Manager");
tx = _t("Settings");
rbuf.setLength(0);
rbuf.append("<a href=\"/config\" target=\"_top\" title=\"")
.append(_t("New Install Wizard"))
.append("\">")
.append(nbsp(tx))
.append("</a>\n");
svcs.put(tx, rbuf.toString());
tx = _t("Setup");
rbuf.setLength(0);
rbuf.append("<a href=\"/welcome\" target=\"_top\" title=\"")
.append(_t("New Install Wizard"))
.append("\">")
.append(nbsp(tx))
.append("</a>\n");
svcs.put(tx, rbuf.toString());
for (String row : svcs.values()) {
buf.append(row);
}
buf.append("</td></tr></table>\n");
return buf.toString();
}
/**
* Renders html for section containing logging, peer information, non-configuration "Admin" elements.
* @since 0.9.50 separates config from non config elements in "I2P Internals"
*/
public String renderI2PDiagnosticsHTML() {
StringBuilder buf = new StringBuilder(512);
buf.append("<h3><a href=\"/config\" target=\"_top\" title=\"")
.append(_t("Configure I2P Router"))
.append("\">")
.append(_t("Diagnostics"))
.append("</a></h3><hr class=\"b\">\n" +
"<table id=\"sb_internals\"><tr><td>\n");
// Store all items in map so they are sorted by translated name, then output
Map<String, String> svcs = new TreeMap<String, String>(Collator.getInstance());
StringBuilder rbuf = new StringBuilder(128);
if (!StatSummarizer.isDisabled(_context)) {
String tx = _t("Graphs");
rbuf.setLength(0);
rbuf.append("<a href=\"/i2ptunnelmgr\" target=\"_top\" title=\"")
.append(_t("Local Tunnels"))
rbuf.append("<a href=\"/graphs\" target=\"_top\" title=\"")
.append(_t("Graph router performance"))
.append("\">")
.append(nbsp(tx))
.append("</a>\n");
svcs.put(tx, rbuf.toString());
}
tx = _t("Logs");
String tx = _t("Logs");
rbuf.setLength(0);
rbuf.append("<a href=\"/logs\" target=\"_top\" title=\"")
.append(_t("Health Report"))