Author: dbkr
Date: 2006-03-08 00:08:45 +0000 (Wed, 08 Mar 2006)
New Revision: 8192
Modified:
trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/clients/http/staticfiles/themes/aqua/theme.css
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/Version.java
Log:
506: Add activity information to the home page, along with hooks to Node to get
the information.
Modified: trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FproxyToadlet.java 2006-03-07
23:50:10 UTC (rev 8191)
+++ trunk/freenet/src/freenet/clients/http/FproxyToadlet.java 2006-03-08
00:08:45 UTC (rev 8192)
@@ -188,7 +188,7 @@
PproxyToadlet pproxy = new
PproxyToadlet(node.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS),
node.pluginManager);
server.register(pproxy, "/plugins/", true);
- WelcomeToadlet welcometoadlet = new
WelcomeToadlet(node.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS));
+ WelcomeToadlet welcometoadlet = new
WelcomeToadlet(node.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS),
node);
server.register(welcometoadlet, "/welcome/", true);
ConfigToadlet configtoadlet = new
ConfigToadlet(node.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS), node,
config);
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-03-07
23:50:10 UTC (rev 8191)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-03-08
00:08:45 UTC (rev 8192)
@@ -9,10 +9,14 @@
import freenet.support.MultiValueTable;
import freenet.support.SimpleFieldSet;
import freenet.node.Version;
+import freenet.node.Node;
public class WelcomeToadlet extends Toadlet {
- WelcomeToadlet(HighLevelSimpleClient client) {
+ Node node;
+
+ WelcomeToadlet(HighLevelSimpleClient client, Node n) {
super(client);
+ this.node = n;
}
public void handleGet(URI uri, ToadletContext ctx) throws
ToadletContextClosedException, IOException {
@@ -35,11 +39,18 @@
buf.append("<form action=\"/\" method=\"get\">\n");
buf.append("<div class=\"infobox\">\n");
buf.append("<h2>Fetch a Key</h2>\n");
- buf.append("Key: <input type=\"text\" size=\"100\"
name=\"key\"/>\n");
+ buf.append("Key: <input type=\"text\" size=\"80\"
name=\"key\"/>\n");
buf.append("<input type=\"submit\" value=\"Fetch\" />\n");
buf.append("</div>\n");
buf.append("</form>\n");
+ // Activity
+ buf.append("<ul id=\"activity\">\n"
+ + "<li>Inserts:
"+this.node.getNumInserts()+"</li>\n"
+ + "<li>Requests:
"+this.node.getNumRequests()+"</li>\n"
+ + "<li>Transferring Requests:
"+this.node.getNumTransferringRequests()+"</li>\n"
+ + "</ul>\n");
+
ctx.getPageMaker().makeTail(buf);
this.writeReply(ctx, 200, "text/html", "OK", buf.toString());
Modified:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/aqua/theme.css
===================================================================
--- trunk/freenet/src/freenet/clients/http/staticfiles/themes/aqua/theme.css
2006-03-07 23:50:10 UTC (rev 8191)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/themes/aqua/theme.css
2006-03-08 00:08:45 UTC (rev 8192)
@@ -97,3 +97,12 @@
color: #356ace;
font-weight: bold;
}
+
+#activity {
+ border: 1px solid #5e88d8;
+ padding: 5px;
+ margin-bottom: 10px;
+ display: table-cell;
+ list-style-position: inside;
+}
+
Modified:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
===================================================================
--- trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2006-03-07 23:50:10 UTC (rev 8191)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2006-03-08 00:08:45 UTC (rev 8192)
@@ -92,3 +92,12 @@
.currentthemeitem a {
font-weight: bold;
}
+
+#activity {
+ margin:0 0 5px 0;
+ padding:10px;
+ background-color:#f0f0f0;
+ border:1px solid #d0d0d0;
+ list-style-position: inside;
+}
+
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-03-07 23:50:10 UTC (rev
8191)
+++ trunk/freenet/src/freenet/node/Node.java 2006-03-08 00:08:45 UTC (rev
8192)
@@ -1781,6 +1781,18 @@
return sb.toString();
}
+ public int getNumInserts() {
+ return insertSenders.size();
+ }
+
+ public int getNumRequests() {
+ return requestSenders.size();
+ }
+
+ public int getNumTransferringRequests() {
+ return transferringRequestSenders.size();
+ }
+
/**
* @return Data String for freeviz.
*/
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-07 23:50:10 UTC (rev
8191)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-08 00:08:45 UTC (rev
8192)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 505;
+ private static final int buildNumber = 506;
/** Oldest build of Fred we will talk to */
private static final int lastGoodBuild = 475;
