Author: nextgens
Date: 2008-06-08 11:39:18 +0000 (Sun, 08 Jun 2008)
New Revision: 20263
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
trunk/freenet/src/freenet/clients/http/PageMaker.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
The mode-selection array should be right after the alerts summary, not before
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-06-08
11:20:19 UTC (rev 20262)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-06-08
11:39:18 UTC (rev 20263)
@@ -140,7 +140,7 @@
contentNode.addChild(core.alerts.createSummary());
- int mode = ctx.getPageMaker().drawModeSelectionArray(core, req,
contentNode);
+ final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, req, contentNode);
if(mode >= PageMaker.MODE_ADVANCED){
HTMLNode navigationBar =
ctx.getPageMaker().getInfobox("navbar", l10n("configNavTitle"));
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-06-08 11:20:19 UTC (rev 20262)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-06-08 11:39:18 UTC (rev 20263)
@@ -200,9 +200,9 @@
// 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());
+ final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, request, contentNode);
if(peerNodeStatuses.length>0){
Modified: trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
2008-06-08 11:20:19 UTC (rev 20262)
+++ trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
2008-06-08 11:39:18 UTC (rev 20263)
@@ -60,10 +60,10 @@
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());
+ final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, request, contentNode);
// Add connection type box.
Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-06-08
11:20:19 UTC (rev 20262)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-06-08
11:39:18 UTC (rev 20263)
@@ -27,6 +27,8 @@
public final class PageMaker {
public static final String DEFAULT_THEME = "clean";
+ public static final int MODE_SIMPLE = 1;
+ public static final int MODE_ADVANCED = 2;
private String theme;
private File override;
private final List navigationLinkTexts = new ArrayList();
@@ -261,9 +263,6 @@
return result;
}
- public static final int MODE_SIMPLE = 1;
- public static final int MODE_ADVANCED = 2;
-
protected int drawModeSelectionArray(NodeClientCore core, HTTPRequest
req, HTMLNode contentNode) {
// Mode can be changed by a link, not just by the default
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-06-08
11:20:19 UTC (rev 20262)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-06-08
11:39:18 UTC (rev 20263)
@@ -607,10 +607,10 @@
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());
+ final int mode = pageMaker.drawModeSelectionArray(core,
request, contentNode);
/* add file insert box */
contentNode.addChild(createInsertBox(pageMaker, ctx, mode >=
PageMaker.MODE_ADVANCED));
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-06-08 11:20:19 UTC (rev 20262)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-06-08 11:39:18 UTC (rev 20263)
@@ -165,9 +165,9 @@
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());
+ final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, request, contentNode);
double swaps = (double)node.getSwaps();
double noSwaps = (double)node.getNoSwaps();
