Author: bombe
Date: 2006-06-01 23:05:36 +0000 (Thu, 01 Jun 2006)
New Revision: 8972
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/Spider.java
trunk/freenet/src/freenet/clients/http/staticfiles/themes/boxed/theme.css
Log:
add header for navigation box of spider page
add css for connections page
clean up connections page
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-06-01 20:43:26 UTC (rev 8971)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-06-01 23:05:36 UTC (rev 8972)
@@ -75,6 +75,67 @@
node.alerts.toSummaryHtml(buf);
+ /* node status values */
+ int bwlimitDelayTime = (int) node.getBwlimitDelayTime();
+ int nodeAveragePingTime = (int) node.getNodeAveragePingTime();
+
+ /* gather connection statistics */
+ int numberOfConnected = 0;
+ int numberOfBackedOff = 0;
+ int numberOfTooNew = 0;
+ int numberOfTooOld = 0;
+ int numberOfDisconnected = 0;
+ for (int peerIndex = 0, peerCount = peerNodes.length; peerIndex
< peerCount; peerIndex++) {
+ int peerStatus =
peerNodes[peerIndex].getPeerNodeStatus();
+ if (peerStatus == Node.PEER_NODE_STATUS_CONNECTED) {
+ numberOfConnected++;
+ } else if (peerStatus ==
Node.PEER_NODE_STATUS_DISCONNECTED) {
+ numberOfDisconnected++;
+ } else if (peerStatus ==
Node.PEER_NODE_STATUS_ROUTING_BACKED_OFF) {
+ numberOfBackedOff++;
+ } else if (peerStatus == Node.PEER_NODE_STATUS_TOO_NEW)
{
+ numberOfTooNew++;
+ } else if (peerStatus == Node.PEER_NODE_STATUS_TOO_OLD)
{
+ numberOfTooOld++;
+ }
+ }
+
+ buf.append("<table class=\"column\" width=\"100%\"><tr
valign=\"top\"><td class=\"first\" width=\"50%\">");
+
+ /* node status overview box */
+ buf.append("<div class=\"infobox\">");
+ buf.append("<div class=\"infobox-header\">Node status
overview</div>");
+ buf.append("<div class=\"infobox-content\">");
+ buf.append("bwlimitDelayTime: " + bwlimitDelayTime + "ms<br/>");
+ buf.append("nodeAveragePingTime: " + nodeAveragePingTime +
"ms<br/>");
+ buf.append("</div>");
+ buf.append("</div>\n");
+
+ buf.append("</td><td class=\"last\" width=\"50%\">");
+
+ buf.append("<div class=\"infobox\">");
+ buf.append("<div class=\"infobox-header\">Connection
statistics</div>");
+ buf.append("<div class=\"infobox-content\">");
+ if (numberOfConnected > 0) {
+ buf.append("<span class=\"peer_connected\">Connected: "
+ numberOfConnected + "</span><br/>");
+ }
+ if (numberOfDisconnected > 0) {
+ buf.append("<span
class=\"peer_disconnected\">Disconnected: " + numberOfDisconnected +
"</span><br/>");
+ }
+ if (numberOfBackedOff > 0) {
+ buf.append("<span class=\"peer_backedoff\">Backed off:
" + numberOfBackedOff + "</span><br/>");
+ }
+ if (numberOfTooNew > 0) {
+ buf.append("<span class=\"peer_too_new\">Too new: " +
numberOfTooNew + "</span><br/>");
+ }
+ if (numberOfTooOld > 0) {
+ buf.append("<span class=\"peer_too_old\">Too old: " +
numberOfTooOld + "</span><br/>");
+ }
+ buf.append("</div>");
+ buf.append("</div>\n");
+
+ buf.append("</td></tr></table>\n");
+
buf.append("<div class=\"infobox infobox-normal\">\n");
buf.append("<div class=\"infobox-header\">\n");
buf.append("My Connections");
@@ -85,10 +146,6 @@
buf.append("</div>\n");
buf.append("<div class=\"infobox-content\">\n");
buf.append("<form action=\".\" method=\"post\"
enctype=\"multipart/form-data\">\n");
- int bwlimitDelayTime = (int) node.getBwlimitDelayTime();
- int nodeAveragePingTime = (int) node.getNodeAveragePingTime();
- buf.append("bwlimitDelayTime: "+bwlimitDelayTime+"ms<br>\n");
- buf.append("nodeAveragePingTime:
"+nodeAveragePingTime+"ms<br>\n");
StringBuffer buf2 = new StringBuffer(1024);
buf2.append("<table class=\"darknet_connections\">\n");
buf2.append("<tr><th></th><th>Status</th><th>Name</th><th><span
title=\"Address:Port\" style=\"border-bottom:1px
dotted;cursor:help;\">Address</span></th><th>Version</th><th>Location</th><th><span
title=\"Temporarily disconnected. Other node busy? Wait time(s)
remaining/total\" style=\"border-bottom:1px
dotted;cursor:help;\">Backoff</span></th><th><span title=\"Number of minutes
since the node was last seen in this session\" style=\"border-bottom:1px
dotted;cursor:help;\">Idle</span></th></tr>\n");
@@ -100,11 +157,6 @@
buf.append(buf2);
}
else {
- int numberOfConnected = 0;
- int numberOfBackedOff = 0;
- int numberOfTooNew = 0;
- int numberOfTooOld = 0;
- int numberOfDisconnected = 0;
// Create array
Object[][] rows = new Object[peerNodes.length][];
@@ -166,23 +218,18 @@
int x = ((Integer) row[2]).intValue();
if(x == Node.PEER_NODE_STATUS_CONNECTED) {
row[2] = "<span
class=\"peer_connected\">CONNECTED</span>";
- numberOfConnected++;
}
else if(x ==
Node.PEER_NODE_STATUS_ROUTING_BACKED_OFF) {
row[2] = "<span
class=\"peer_backedoff\">BACKED OFF</span>";
- numberOfBackedOff++;
}
else if(x == Node.PEER_NODE_STATUS_TOO_NEW) {
row[2] = "<span
class=\"peer_too_new\">TOO NEW</span>";
- numberOfTooNew++;
}
else if(x == Node.PEER_NODE_STATUS_TOO_OLD) {
row[2] = "<span
class=\"peer_too_old\">TOO OLD</span>";
- numberOfTooOld++;
}
else if(x ==
Node.PEER_NODE_STATUS_DISCONNECTED) {
row[2] = "<span
class=\"peer_disconnected\">DISCONNECTED</span>";
- numberOfDisconnected++;
}
}
@@ -230,40 +277,6 @@
}
buf2.append("</table>\n");
//
- buf.append("<table class=\"darknet_connections\">\n");
- buf.append("<tr><td>");
- boolean separatorNeeded = false;
- if (numberOfConnected != 0) {
- buf.append("<span
class=\"peer_connected\">CONNECTED: " + numberOfConnected + "</span>");
- separatorNeeded = true;
- }
- if (numberOfBackedOff != 0) {
- if (separatorNeeded)
- buf.append(" | ");
- buf.append("<span
class=\"peer_backedoff\">BACKED OFF: " + numberOfBackedOff + "</span>");
- separatorNeeded = true;
- }
- if (numberOfTooNew != 0) {
- if (separatorNeeded)
- buf.append(" | ");
- buf.append("<span class=\"peer_too_new\">TOO
NEW: " + numberOfTooNew + "</span>");
- separatorNeeded = true;
- }
- if (numberOfTooOld != 0) {
- if (separatorNeeded)
- buf.append(" | ");
- buf.append("<span class=\"peer_too_old\">TOO
OLD: " + numberOfTooOld + "</span>");
- separatorNeeded = true;
- }
- if (numberOfDisconnected != 0) {
- if (separatorNeeded)
- buf.append(" | ");
- buf.append("<span
class=\"peer_disconnected\">DISCONNECTED: " + numberOfDisconnected + "</span>");
- separatorNeeded = true;
- }
- buf.append("</td></tr>\n");
- buf.append("</table>\n");
- //
buf.append(buf2);
//
buf.append("<input type=\"submit\" name=\"disconnect\"
value=\"Disconnect from selected peers\" />\n");
Modified: trunk/freenet/src/freenet/clients/http/Spider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Spider.java 2006-06-01 20:43:26 UTC
(rev 8971)
+++ trunk/freenet/src/freenet/clients/http/Spider.java 2006-06-01 23:05:36 UTC
(rev 8972)
@@ -358,7 +358,7 @@
private StringBuffer createNavbar(int running, int queued, int visited,
int failed) {
StringBuffer outputBuffer = new StringBuffer();
outputBuffer.append("<div class=\"infobox navbar\">");
- outputBuffer.append("<div class=\"infobox-content\">Page
navigation</div>");
+ outputBuffer.append("<div class=\"infobox-header\">Page
navigation</div>");
outputBuffer.append("<div class=\"infobox-content\"><ul>");
outputBuffer.append("<li><a href=\"#running\">Running
(").append(running).append(")</a></li>");
outputBuffer.append("<li><a href=\"#queued\">Queued
(").append(queued).append(")</a></li>");
Modified:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/boxed/theme.css
===================================================================
--- trunk/freenet/src/freenet/clients/http/staticfiles/themes/boxed/theme.css
2006-06-01 20:43:26 UTC (rev 8971)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/themes/boxed/theme.css
2006-06-01 23:05:36 UTC (rev 8972)
@@ -138,4 +138,23 @@
color: #f00;
}
+table.column {
+ table-layout: fixed;
+ width: 100%;
+ border-spacing: 0px;
+}
+
+table.column tr td {
+ padding-left: 10px;
+ padding-right: 10px;
+}
+
+table.column tr td.first {
+ padding-left: 0px;
+}
+
+table.column tr td.last {
+ padding-right: 0px;
+}
+
/* vim: set ts=4: sw=4: */
