[freenet-cvs] r15436 - trunk/freenet/src/freenet/clients/http

[bo...@freenetproject.org]

Author: bombe
Date: 2007-10-08 11:51:49 +0000 (Mon, 08 Oct 2007)
New Revision: 15436

Modified:
   trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
   trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
Log:
fix toadlets with boxed layout

Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java      
2007-10-06 18:05:48 UTC (rev 15435)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java      
2007-10-08 11:51:49 UTC (rev 15436)
@@ -676,11 +676,12 @@
                L10n.addL10nSubstitution(headerReferenceInfobox, 
"DarknetConnectionsToadlet.myReferenceHeader",
                                new String[] { "linkref", "/linkref", 
"linktext", "/linktext" },
                                new String[] { "<a href=\"myref.fref\">", 
"</a>", "<a href=\"myref.txt\">", "</a>" });
-               HTMLNode warningSentence = 
headerReferenceInfobox.addChild("pre");
+               HTMLNode referenceInfoboxContent = 
referenceInfobox.addChild("div", "class", "infobox-content");
+               HTMLNode warningSentence = 
referenceInfoboxContent.addChild("p");
                L10n.addL10nSubstitution(warningSentence, 
"DarknetConnectionsToadlet.referenceCopyWarning",
                                new String[] { "bold", "/bold" },
                                new String[] { "<b>", "</b>" });
-               referenceInfobox.addChild("div", "class", 
"infobox-content").addChild("pre", "id", "reference", getNoderef().toString() + 
'\n');
+               referenceInfoboxContent.addChild("pre", "id", "reference", 
getNoderef().toString() + '\n');
        }

        protected abstract String getPageTitle(String titleCountString, String 
myName);

Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-10-06 18:05:48 UTC (rev 15435)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java       
2007-10-08 11:51:49 UTC (rev 15436)
@@ -166,16 +166,17 @@

                // Statistic gathering box
                HTMLNode statGatheringBox =  
nextTableCell.addChild(ctx.getPageMaker().getInfobox("Statistic gathering"));
+               HTMLNode statGatheringContent = 
ctx.getPageMaker().getContentNode(statGatheringBox);
                // Generate a Thread-Dump
                if(node.isUsingWrapper()){
-                       HTMLNode threadDumpForm = 
ctx.addFormChild(statGatheringBox, "/", "threadDumpForm");
+                       HTMLNode threadDumpForm = 
ctx.addFormChild(statGatheringContent, "/", "threadDumpForm");
                        threadDumpForm.addChild("input", new String[] { "type", 
"name", "value" }, new String[] { "submit", "getThreadDump", 
l10n("threadDumpButton")});
                }
                // BDB statistics dump 
-               HTMLNode JEStatsForm = ctx.addFormChild(statGatheringBox, "/", 
"JEStatsForm");
+               HTMLNode JEStatsForm = ctx.addFormChild(statGatheringContent, 
"/", "JEStatsForm");
                JEStatsForm.addChild("input", new String[] { "type", "name", 
"value" }, new String[] { "submit", "getJEStatsDump", l10n("jeDumpButton")});
                // Get logs
-               HTMLNode logsList = statGatheringBox.addChild("ul");
+               HTMLNode logsList = statGatheringContent.addChild("ul");
                if(nodeConfig.config.get("logger").getBoolean("enabled"))
                        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"));
@@ -278,14 +279,14 @@
                        nextTableCell = overviewTableRow.addChild("td", 
"class", "first");
                        HTMLNode peerCircleInfobox = 
nextTableCell.addChild("div", "class", "infobox");
                        peerCircleInfobox.addChild("div", "class", 
"infobox-header", "Peer\u00a0Location\u00a0Distribution (w/pReject)");
-                       HTMLNode peerCircleTable = 
peerCircleInfobox.addChild("table");
+                       HTMLNode peerCircleTable = 
peerCircleInfobox.addChild("div", "class", "infobox-content").addChild("table");
                        addPeerCircle(peerCircleTable);
                        nextTableCell = overviewTableRow.addChild("td");

                        // node distribution box
                        HTMLNode nodeCircleInfobox = 
nextTableCell.addChild("div", "class", "infobox");
                        nodeCircleInfobox.addChild("div", "class", 
"infobox-header", "Node\u00a0Location\u00a0Distribution (w/Swap\u00a0Age)");
-                       HTMLNode nodeCircleTable = 
nodeCircleInfobox.addChild("table");
+                       HTMLNode nodeCircleTable = 
nodeCircleInfobox.addChild("div", "class", "infobox-content").addChild("table");
                        addNodeCircle(nodeCircleTable);
                }

@@ -298,7 +299,7 @@
                        return;
                HTMLNode rejectReasonsInfobox = nextTableCell.addChild("div", 
"class", "infobox");
                rejectReasonsInfobox.addChild("div", "class", "infobox-header", 
"Preemptive Rejection Reasons");
-               rejectReasonsInfobox.addChild(rejectReasonsTable);
+               rejectReasonsInfobox.addChild("div", "class", 
"infobox-content").addChild(rejectReasonsTable);
        }

        private void drawNodeVersionBox(HTMLNode versionInfobox) {