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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-11-19 13:12:42 +0000 (Mon, 19 Nov 2007)
New Revision: 15820

Modified:
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
WelcomeToadlet: move the "fetch a key" box below bookmarks

Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-11-19 
13:10:47 UTC (rev 15819)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2007-11-19 
13:12:42 UTC (rev 15820)
@@ -514,15 +514,6 @@
                if(ctx.isAllowedFullAccess())
                        contentNode.addChild(core.alerts.createAlerts());

-               // Fetch-a-key box
-               HTMLNode fetchKeyBox = 
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-normal", 
l10n("fetchKeyLabel")));
-               HTMLNode fetchKeyContent = 
ctx.getPageMaker().getContentNode(fetchKeyBox);
-               fetchKeyContent.addAttribute("id", "keyfetchbox");
-               HTMLNode fetchKeyForm = fetchKeyContent.addChild("form", new 
String[] { "action", "method" }, new String[] { "/", "get" }).addChild("div");
-               fetchKeyForm.addChild("#", l10n("keyRequestLabel")+' ');
-               fetchKeyForm.addChild("input", new String[] { "type", "size", 
"name" }, new String[] { "text", "80", "key" });
-               fetchKeyForm.addChild("input", new String[] { "type", "value" 
}, new String[] { "submit", l10n("fetch") });
-
                // Bookmarks
                HTMLNode bookmarkBox = contentNode.addChild("div", "class", 
"infobox infobox-normal");
                HTMLNode bookmarkBoxHeader = bookmarkBox.addChild("div", 
"class", "infobox-header");
@@ -537,6 +528,15 @@
                HTMLNode bookmarksList = bookmarkBoxContent.addChild("ul", 
"id", "bookmarks");
                addCategoryToList(bookmarkManager.getMainCategory(), 
bookmarksList);

+               // Fetch-a-key box
+               HTMLNode fetchKeyBox = 
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-normal", 
l10n("fetchKeyLabel")));
+               HTMLNode fetchKeyContent = 
ctx.getPageMaker().getContentNode(fetchKeyBox);
+               fetchKeyContent.addAttribute("id", "keyfetchbox");
+               HTMLNode fetchKeyForm = fetchKeyContent.addChild("form", new 
String[] { "action", "method" }, new String[] { "/", "get" }).addChild("div");
+               fetchKeyForm.addChild("#", l10n("keyRequestLabel")+' ');
+               fetchKeyForm.addChild("input", new String[] { "type", "size", 
"name" }, new String[] { "text", "80", "key" });
+               fetchKeyForm.addChild("input", new String[] { "type", "value" 
}, new String[] { "submit", l10n("fetch") });
+
                // Version info and Quit Form
                HTMLNode versionBox = 
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-information", 
l10n("versionHeader")));
                HTMLNode versionContent = 
ctx.getPageMaker().getContentNode(versionBox);