Author: toad
Date: 2007-03-31 16:17:09 +0000 (Sat, 31 Mar 2007)
New Revision: 12477
Modified:
trunk/freenet/src/freenet/clients/http/BrowserTestToadlet.java
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
Don't show alerts summary if won't show the actual alerts anyway
Modified: trunk/freenet/src/freenet/clients/http/BrowserTestToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/BrowserTestToadlet.java
2007-03-31 16:10:23 UTC (rev 12476)
+++ trunk/freenet/src/freenet/clients/http/BrowserTestToadlet.java
2007-03-31 16:17:09 UTC (rev 12477)
@@ -186,7 +186,8 @@
HTMLNode pageNode = ctx.getPageMaker().getPageNode("Freenet
browser testing tool", ctx);
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
- contentNode.addChild(core.alerts.createSummary());
+ if(ctx.isAllowedFullAccess())
+ contentNode.addChild(core.alerts.createSummary());
// #### Test MIME inline
HTMLNode mimeAutodetectBox =
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-warning", "MIME
Inline"));
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-03-31
16:10:23 UTC (rev 12476)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-03-31
16:17:09 UTC (rev 12477)
@@ -117,7 +117,8 @@
HTMLNode pageNode = ctx.getPageMaker().getPageNode("Freenet
Node Configuration of " + node.getMyName(), ctx);
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
- contentNode.addChild(core.alerts.createSummary());
+ if(ctx.isAllowedFullAccess())
+ contentNode.addChild(core.alerts.createSummary());
if(advancedModeEnabled){
HTMLNode navigationBar =
ctx.getPageMaker().getInfobox("navbar", "Configuration Navigation");
HTMLNode navigationContent =
ctx.getPageMaker().getContentNode(navigationBar).addChild("ul");
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-03-31 16:10:23 UTC (rev 12476)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-03-31 16:17:09 UTC (rev 12477)
@@ -150,7 +150,8 @@
// FIXME! We need some nice images
long now = System.currentTimeMillis();
- contentNode.addChild(core.alerts.createSummary());
+ if(ctx.isAllowedFullAccess())
+ contentNode.addChild(core.alerts.createSummary());
if(peerNodeStatuses.length>0){
Modified: trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2007-03-31 16:10:23 UTC (rev 12476)
+++ trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2007-03-31 16:17:09 UTC (rev 12477)
@@ -58,7 +58,8 @@
HTMLNode pageNode = pageMaker.getPageNode("Listing of " +
currentPath.getAbsolutePath(), toadletContext);
HTMLNode contentNode = pageMaker.getContentNode(pageNode);
- contentNode.addChild(core.alerts.createSummary());
+ if(toadletContext.isAllowedFullAccess())
+ contentNode.addChild(core.alerts.createSummary());
HTMLNode infoboxDiv = contentNode.addChild("div", "class",
"infobox");
infoboxDiv.addChild("div", "class", "infobox-header",
"Directory Listing: " + currentPath.getAbsolutePath());
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2007-03-31
16:10:23 UTC (rev 12476)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2007-03-31
16:17:09 UTC (rev 12477)
@@ -302,7 +302,8 @@
PageMaker pageMaker = context.getPageMaker();
HTMLNode pageNode = pageMaker.getPageNode(header, context);
HTMLNode contentNode = pageMaker.getContentNode(pageNode);
- contentNode.addChild(core.alerts.createSummary());
+ if(context.isAllowedFullAccess())
+ contentNode.addChild(core.alerts.createSummary());
HTMLNode infobox =
contentNode.addChild(pageMaker.getInfobox("infobox-error", header));
HTMLNode infoboxContent = pageMaker.getContentNode(infobox);
infoboxContent.addChild("#", message);
@@ -371,7 +372,8 @@
HTMLNode pageNode = pageMaker.getPageNode("Global queue
of " + core.getMyName(), ctx);
HTMLNode contentNode =
pageMaker.getContentNode(pageNode);
/* add alert summary box */
- contentNode.addChild(core.alerts.createSummary());
+ if(ctx.isAllowedFullAccess())
+
contentNode.addChild(core.alerts.createSummary());
HTMLNode infobox =
contentNode.addChild(pageMaker.getInfobox("infobox-information", "Global queue
is empty"));
HTMLNode infoboxContent =
pageMaker.getContentNode(infobox);
infoboxContent.addChild("#", "There is no task queued
on the global queue at the moment.");
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2007-03-31 16:10:23 UTC (rev 12476)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2007-03-31 16:17:09 UTC (rev 12477)
@@ -141,7 +141,8 @@
// FIXME! We need some nice images
long now = System.currentTimeMillis();
- contentNode.addChild(core.alerts.createSummary());
+ if(ctx.isAllowedFullAccess())
+ contentNode.addChild(core.alerts.createSummary());
double swaps = (double)node.getSwaps();
double noSwaps = (double)node.getNoSwaps();
