Author: nextgens
Date: 2008-06-08 11:20:19 +0000 (Sun, 08 Jun 2008)
New Revision: 20262
Modified:
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
Last part of #2358: Stats page needs normal/advanced mode tabs
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-06-08 10:58:26 UTC (rev 20261)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-06-08 11:20:19 UTC (rev 20262)
@@ -163,7 +163,6 @@
return;
}
- final boolean advancedModeEnabled =
node.isAdvancedModeEnabled();
final boolean fProxyJavascriptEnabled =
node.isFProxyJavascriptEnabled();
boolean drawMessageTypes =
path.endsWith("displaymessagetypes.html");
@@ -189,7 +188,7 @@
int numberOfSimpleConnected = numberOfConnected +
numberOfRoutingBackedOff;
int numberOfNotConnected = numberOfTooNew + numberOfTooOld +
numberOfDisconnected + numberOfNeverConnected + numberOfDisabled +
numberOfBursting + numberOfListening + numberOfListenOnly +
numberOfClockProblem + numberOfConnError;
String titleCountString = null;
- if(advancedModeEnabled) {
+ if(node.isAdvancedModeEnabled()) {
titleCountString = "(" + numberOfConnected + '/' +
numberOfRoutingBackedOff + '/' + numberOfTooNew + '/' + numberOfTooOld + '/' +
numberOfRoutingDisabled + '/' + numberOfNotConnected + ')';
} else {
titleCountString = (numberOfNotConnected +
numberOfSimpleConnected)>0 ? String.valueOf(numberOfSimpleConnected) : "";
@@ -201,6 +200,7 @@
// FIXME! We need some nice images
long now = System.currentTimeMillis();
+ int mode = ctx.getPageMaker().drawModeSelectionArray(core,
request, contentNode);
if(ctx.isAllowedFullAccess())
contentNode.addChild(core.alerts.createSummary());
@@ -226,7 +226,7 @@
HTMLNode nextTableCell =
overviewTableRow.addChild("td", "class", "first");
/* node status overview box */
- if(advancedModeEnabled) {
+ if(mode >= PageMaker.MODE_ADVANCED) {
HTMLNode overviewInfobox =
nextTableCell.addChild("div", "class", "infobox");
overviewInfobox.addChild("div", "class",
"infobox-header", "Node status overview");
HTMLNode overviewInfoboxContent =
overviewInfobox.addChild("div", "class", "infobox-content");
@@ -251,21 +251,21 @@
activityInfobox.addChild("div", "class",
"infobox-header", l10n("activityTitle"));
HTMLNode activityInfoboxContent =
activityInfobox.addChild("div", "class", "infobox-content");
HTMLNode activityList =
StatisticsToadlet.drawActivity(activityInfoboxContent, node);
- if (advancedModeEnabled && activityList != null) {
+ if ((mode >= PageMaker.MODE_ADVANCED) && (activityList
!= null)) {
if (numARKFetchers > 0) {
activityList.addChild("li",
"ARK\u00a0Fetch\u00a0Requests:\u00a0" + numARKFetchers);
}
- StatisticsToadlet.drawBandwidth(activityList,
node, nodeUptimeSeconds, advancedModeEnabled);
+ StatisticsToadlet.drawBandwidth(activityList,
node, nodeUptimeSeconds, mode >= PageMaker.MODE_ADVANCED);
}
- nextTableCell = advancedModeEnabled ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
+ nextTableCell = (mode >= PageMaker.MODE_ADVANCED) ?
overviewTableRow.addChild("td") : overviewTableRow.addChild("td", "class",
"last");
// Peer statistics box
HTMLNode peerStatsInfobox =
nextTableCell.addChild("div", "class", "infobox");
- StatisticsToadlet.drawPeerStatsBox(peerStatsInfobox,
advancedModeEnabled, numberOfConnected, numberOfRoutingBackedOff,
numberOfTooNew, numberOfTooOld, numberOfDisconnected, numberOfNeverConnected,
numberOfDisabled, numberOfBursting, numberOfListening, numberOfListenOnly, 0,
0, numberOfRoutingDisabled, numberOfClockProblem, numberOfConnError,
numberOfDisconnecting);
+ StatisticsToadlet.drawPeerStatsBox(peerStatsInfobox,
mode >= PageMaker.MODE_ADVANCED, numberOfConnected, numberOfRoutingBackedOff,
numberOfTooNew, numberOfTooOld, numberOfDisconnected, numberOfNeverConnected,
numberOfDisabled, numberOfBursting, numberOfListening, numberOfListenOnly, 0,
0, numberOfRoutingDisabled, numberOfClockProblem, numberOfConnError,
numberOfDisconnecting);
// Peer routing backoff reason box
- if(advancedModeEnabled) {
+ if(mode >= PageMaker.MODE_ADVANCED) {
nextTableCell = overviewTableRow.addChild("td",
"class", "last");
HTMLNode backoffReasonInfobox =
nextTableCell.addChild("div", "class", "infobox");
backoffReasonInfobox.addChild("div", "class",
"infobox-header", "Peer backoff reasons");
@@ -322,7 +322,7 @@
HTMLNode peerTableInfobox = contentNode.addChild("div",
"class", "infobox infobox-normal");
HTMLNode peerTableInfoboxHeader =
peerTableInfobox.addChild("div", "class", "infobox-header");
peerTableInfoboxHeader.addChild("#",
getPeerListTitle());
- if (advancedModeEnabled) {
+ if (mode >= PageMaker.MODE_ADVANCED) {
if (!path.endsWith("displaymessagetypes.html"))
{
peerTableInfoboxHeader.addChild("#", "
");
peerTableInfoboxHeader.addChild("a",
"href", "displaymessagetypes.html", "(more detailed)");
@@ -348,11 +348,11 @@
peerTableHeaderRow.addChild("th").addChild("a",
"href", sortString(isReversed, "status")).addChild("#", l10n("statusTitle"));
if(hasNameColumn())
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"name")).addChild("span", new String[] { "title", "style" }, new String[] {
l10n("nameClickToMessage"), "border-bottom: 1px dotted; cursor: help;" },
l10n("nameTitle"));
- if (advancedModeEnabled) {
+ if (mode >= PageMaker.MODE_ADVANCED) {
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"address")).addChild("span", new String[] { "title", "style" }, new String[] {
l10n("ipAddress"), "border-bottom: 1px dotted; cursor: help;" },
l10n("ipAddressTitle"));
}
peerTableHeaderRow.addChild("th").addChild("a",
"href", sortString(isReversed, "version")).addChild("#", l10n("versionTitle"));
- if (advancedModeEnabled) {
+ if (mode >= PageMaker.MODE_ADVANCED) {
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"location")).addChild("#", "Location");
peerTableHeaderRow.addChild("th").addChild("span", new String[] { "title",
"style" }, new String[] { "Other node busy? Display: Percentage of time the
node is overloaded, Current wait time remaining (0=not overloaded)/total/last
overload reason", "border-bottom: 1px dotted; cursor: help;" }, "Backoff");
@@ -362,7 +362,7 @@
if(hasPrivateNoteColumn())
peerTableHeaderRow.addChild("th").addChild("a", "href", sortString(isReversed,
"privnote")).addChild("span", new String[] { "title", "style" }, new String[] {
l10n("privateNote"), "border-bottom: 1px dotted; cursor: help;" },
l10n("privateNoteTitle"));
- if(advancedModeEnabled) {
+ if(mode >= PageMaker.MODE_ADVANCED) {
peerTableHeaderRow.addChild("th",
"%\u00a0Time Routable");
peerTableHeaderRow.addChild("th",
"Total\u00a0Traffic\u00a0(in/out/resent)");
peerTableHeaderRow.addChild("th",
"Congestion\u00a0Control");
@@ -370,7 +370,7 @@
peerTableHeaderRow.addChild("th",
"Reported\u00a0Uptime");
}
- SimpleColumn[] endCols =
endColumnHeaders(advancedModeEnabled);
+ SimpleColumn[] endCols = endColumnHeaders(mode
>= PageMaker.MODE_ADVANCED);
if(endCols != null) {
for(int i=0;i<endCols.length;i++) {
SimpleColumn col = endCols[i];
@@ -385,19 +385,19 @@
for (int peerIndex = 0, peerCount =
peerNodeStatuses.length; peerIndex < peerCount; peerIndex++) {
PeerNodeStatus peerNodeStatus =
peerNodeStatuses[peerIndex];
- drawRow(peerTable, peerNodeStatus,
advancedModeEnabled, fProxyJavascriptEnabled, now, path, enablePeerActions,
endCols, drawMessageTypes);
+ drawRow(peerTable, peerNodeStatus, mode
>= PageMaker.MODE_ADVANCED, fProxyJavascriptEnabled, now, path,
enablePeerActions, endCols, drawMessageTypes);
}
if(peerForm != null) {
- drawPeerActionSelectBox(peerForm,
advancedModeEnabled);
+ drawPeerActionSelectBox(peerForm, mode
>= PageMaker.MODE_ADVANCED);
}
}
// END PEER TABLE
}
// our reference
- if(shouldDrawNoderefBox(advancedModeEnabled)) {
+ if(shouldDrawNoderefBox(mode >= PageMaker.MODE_ADVANCED)) {
drawAddPeerBox(contentNode, ctx);
drawNoderefBox(contentNode, ctx);
}
Modified: trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
2008-06-08 10:58:26 UTC (rev 20261)
+++ trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
2008-06-08 11:20:19 UTC (rev 20262)
@@ -60,6 +60,7 @@
HTMLNode pageNode =
pageMaker.getPageNode(L10n.getString("ConnectivityToadlet.title", new String[]{
"nodeName" }, new String[]{ core.getMyName() }), ctx);
HTMLNode contentNode = pageMaker.getContentNode(pageNode);
+ int mode = ctx.getPageMaker().drawModeSelectionArray(core,
request, contentNode);
/* add alert summary box */
if(ctx.isAllowedFullAccess())
contentNode.addChild(core.alerts.createSummary());
@@ -84,7 +85,7 @@
row.addChild("td",
AddressTracker.statusString(tracker.getPortForwardStatus()));
}
- if(node.isAdvancedModeEnabled()) {
+ if(mode >= PageMaker.MODE_ADVANCED) {
// One box per port
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-06-08
10:58:26 UTC (rev 20261)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-06-08
11:20:19 UTC (rev 20262)
@@ -607,11 +607,12 @@
L10n.getString("QueueToadlet.title", new
String[]{ "nodeName" }, new String[]{ core.getMyName() }), ctx);
HTMLNode contentNode = pageMaker.getContentNode(pageNode);
+ int mode = pageMaker.drawModeSelectionArray(core, request,
contentNode);
/* add alert summary box */
if(ctx.isAllowedFullAccess())
contentNode.addChild(core.alerts.createSummary());
/* add file insert box */
- contentNode.addChild(createInsertBox(pageMaker, ctx,
core.isAdvancedModeEnabled()));
+ contentNode.addChild(createInsertBox(pageMaker, ctx, mode >=
PageMaker.MODE_ADVANCED));
/* navigation bar */
HTMLNode navigationBar = pageMaker.getInfobox("navbar",
L10n.getString("QueueToadlet.requestNavigation"));
@@ -672,7 +673,7 @@
L10n.getString("QueueToadlet.priority6")
};
- boolean advancedModeEnabled = core.isAdvancedModeEnabled();
+ boolean advancedModeEnabled = (mode >= PageMaker.MODE_ADVANCED);
HTMLNode legendBox =
contentNode.addChild(pageMaker.getInfobox("legend",
L10n.getString("QueueToadlet.legend")));
HTMLNode legendContent = pageMaker.getContentNode(legendBox);
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-06-08 10:58:26 UTC (rev 20261)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-06-08 11:20:19 UTC (rev 20262)
@@ -125,8 +125,6 @@
super.sendErrorPage(ctx, 403,
L10n.getString("Toadlet.unauthorizedTitle"),
L10n.getString("Toadlet.unauthorized"));
return;
}
-
- final boolean advancedModeEnabled =
node.isAdvancedModeEnabled();
final SubConfig nodeConfig = node.config.get("node");
/* gather connection statistics */
@@ -167,6 +165,7 @@
final long now = System.currentTimeMillis();
final long nodeUptimeSeconds = (now - node.startupTime) / 1000;
+ final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, request, contentNode);
if(ctx.isAllowedFullAccess())
contentNode.addChild(core.alerts.createSummary());
@@ -204,7 +203,7 @@
logsList.addChild("li").addChild("a", new String[]{
"href", "target"}, new String[]{ "/?latestlog", "_new"}, l10n("getLogs"));
logsList.addChild("li").addChild("a", "href",
TranslationToadlet.TOADLET_URL+"?getOverrideTranlationFile").addChild("#",
L10n.getString("TranslationToadlet.downloadTranslationsFile"));
- if(advancedModeEnabled) {
+ if(mode >= PageMaker.MODE_ADVANCED) {
// store size box
HTMLNode storeSizeInfobox =
nextTableCell.addChild("div", "class", "infobox");
@@ -237,16 +236,16 @@
}
}
- if(advancedModeEnabled || numberOfConnected +
numberOfRoutingBackedOff > 0) {
+ if(mode >= PageMaker.MODE_ADVANCED || numberOfConnected +
numberOfRoutingBackedOff > 0) {
// Activity box
nextTableCell = overviewTableRow.addChild("td",
"class", "last");
HTMLNode activityInfobox =
nextTableCell.addChild("div", "class", "infobox");
- drawActivityBox(activityInfobox, advancedModeEnabled);
+ drawActivityBox(activityInfobox, mode >=
PageMaker.MODE_ADVANCED);
/* node status overview box */
- if(advancedModeEnabled) {
+ if(mode >= PageMaker.MODE_ADVANCED) {
HTMLNode overviewInfobox =
nextTableCell.addChild("div", "class", "infobox");
drawOverviewBox(overviewInfobox,
nodeUptimeSeconds, now, swaps, noSwaps);
}
@@ -254,7 +253,7 @@
// Peer statistics box
HTMLNode peerStatsInfobox =
nextTableCell.addChild("div", "class", "infobox");
- drawPeerStatsBox(peerStatsInfobox, advancedModeEnabled,
numberOfConnected, numberOfRoutingBackedOff,
+ drawPeerStatsBox(peerStatsInfobox, mode >=
PageMaker.MODE_ADVANCED, numberOfConnected, numberOfRoutingBackedOff,
numberOfTooNew, numberOfTooOld,
numberOfDisconnected, numberOfNeverConnected, numberOfDisabled,
numberOfBursting, numberOfListening,
numberOfListenOnly, numberOfSeedServers, numberOfSeedClients,
numberOfRoutingDisabled,
numberOfClockProblem, numberOfConnError, numberOfDisconnecting);
@@ -262,10 +261,10 @@
// Bandwidth box
HTMLNode bandwidthInfobox =
nextTableCell.addChild("div", "class", "infobox");
- drawBandwidthBox(bandwidthInfobox, nodeUptimeSeconds,
advancedModeEnabled);
+ drawBandwidthBox(bandwidthInfobox, nodeUptimeSeconds,
mode >= PageMaker.MODE_ADVANCED);
}
- if(advancedModeEnabled) {
+ if(mode >= PageMaker.MODE_ADVANCED) {
// Peer routing backoff reason box
HTMLNode backoffReasonInfobox =
nextTableCell.addChild("div", "class", "infobox");
