Author: toad
Date: 2009-01-07 19:42:07 +0000 (Wed, 07 Jan 2009)
New Revision: 24968
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
trunk/freenet/src/freenet/clients/http/Toadlet.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
Log:
Fix some more links
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2009-01-07
19:35:47 UTC (rev 24967)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2009-01-07
19:42:07 UTC (rev 24968)
@@ -322,9 +322,9 @@
HTMLNode infobox =
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-normal",
l10n("possibilitiesTitle")));
HTMLNode content = ctx.getPageMaker().getContentNode(infobox);
- content.addChild("a", new String[]{"href", "title"}, new
String[]{".", l10n("shortTitle")}, l10n("returnToNodeConfig"));
+ content.addChild("a", new String[]{"href", "title"}, new
String[]{ctx.fixLink("/config/"), l10n("shortTitle")},
l10n("returnToNodeConfig"));
content.addChild("br");
- addHomepageLink(content);
+ addHomepageLink(content, ctx);
writeHTMLReply(ctx, 200, "OK", pageNode.generate());
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2009-01-07
19:35:47 UTC (rev 24967)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2009-01-07
19:42:07 UTC (rev 24968)
@@ -494,7 +494,7 @@
errorContent.addChild("br");
errorContent.addChild(ctx.getPageMaker().createBackLink(ctx, l10n("goBack")));
errorContent.addChild("br");
- addHomepageLink(errorContent);
+ addHomepageLink(errorContent, ctx);
this.writeHTMLReply(ctx, 400, l10n("invalidKeyTitle"),
pageNode.generate());
return;
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2009-01-07
19:35:47 UTC (rev 24967)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2009-01-07
19:42:07 UTC (rev 24968)
@@ -74,7 +74,7 @@
if (peernode_name == null) {
contentNode.addChild(createPeerInfobox("infobox-error",
l10n("peerNotFoundTitle"),
l10n("peerNotFoundWithHash",
- "hash",
input_hashcode_string)));
+ "hash",
input_hashcode_string), ctx));
this.writeHTMLReply(ctx, 200, "OK", pageNode
.generate());
return;
@@ -100,7 +100,7 @@
}
private static HTMLNode createPeerInfobox(String infoboxType,
- String header, String message) {
+ String header, String message, ToadletContext ctx) {
HTMLNode infobox = new HTMLNode("div", "class", "infobox "
+ infoboxType);
infobox.addChild("div", "class", "infobox-header", header);
@@ -108,7 +108,7 @@
"infobox-content");
infoboxContent.addChild("#", message);
HTMLNode list = infoboxContent.addChild("ul");
- Toadlet.addHomepageLink(list);
+ Toadlet.addHomepageLink(list, ctx);
list.addChild("li").addChild("a", new String[] { "href",
"title" },
new String[] { "/friends/",
l10n("returnToFriends") },
l10n("friends"));
@@ -153,7 +153,7 @@
filename = new File(fnam);
if(!(filename.exists() && filename.canRead())) {
peerTableInfobox.addChild("#",
l10n("noSuchFileOrCannotRead"));
-
Toadlet.addHomepageLink(peerTableInfobox);
+
Toadlet.addHomepageLink(peerTableInfobox, ctx);
this.writeHTMLReply(ctx, 400, "OK",
pageNode.generate());
return;
}
@@ -174,7 +174,7 @@
status =
pn.sendFileOffer(filename, message);
} catch (IOException e) {
peerTableInfobox.addChild("#", l10n("noSuchFileOrCannotRead"));
-
Toadlet.addHomepageLink(peerTableInfobox);
+
Toadlet.addHomepageLink(peerTableInfobox, ctx);
this.writeHTMLReply(ctx, 200, "OK", pageNode.generate());
return;
}
@@ -221,7 +221,7 @@
"n2ntm-message-text");
infoboxContent.addChild("#", message);
HTMLNode list = peerTableInfobox.addChild("ul");
- Toadlet.addHomepageLink(list);
+ Toadlet.addHomepageLink(list, ctx);
list.addChild("li").addChild("a", new String[] {
"href", "title" },
new String[] { "/friends/",
l10n("returnToFriends") },
l10n("friends"));
Modified: trunk/freenet/src/freenet/clients/http/Toadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Toadlet.java 2009-01-07 19:35:47 UTC
(rev 24967)
+++ trunk/freenet/src/freenet/clients/http/Toadlet.java 2009-01-07 19:42:07 UTC
(rev 24968)
@@ -228,7 +228,7 @@
infoboxContent.addChild("br");
infoboxContent.addChild("a", "href", ".",
l10n("returnToPrevPage"));
infoboxContent.addChild("br");
- addHomepageLink(infoboxContent);
+ addHomepageLink(infoboxContent, ctx);
writeHTMLReply(ctx, code, desc, pageNode.generate());
}
@@ -259,7 +259,7 @@
infoboxContent.addChild("pre", sw.toString());
infoboxContent.addChild("br");
infoboxContent.addChild("a", "href", ".",
l10n("returnToPrevPage"));
- addHomepageLink(infoboxContent);
+ addHomepageLink(infoboxContent, ctx);
writeHTMLReply(ctx, 500, desc, pageNode.generate());
}
@@ -276,8 +276,8 @@
writeHTMLReply(ctx, 500, "Internal Error", msg);
}
- protected static void addHomepageLink(HTMLNode content) {
- content.addChild("a", new String[]{"href", "title"}, new
String[]{"/", l10n("homepage")}, l10n("returnToNodeHomepage"));
+ protected static void addHomepageLink(HTMLNode content, ToadletContext
ctx) {
+ content.addChild("a", new String[]{"href", "title"}, new
String[]{ctx.fixLink("/"), l10n("homepage")}, l10n("returnToNodeHomepage"));
}
/**
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2009-01-07
19:35:47 UTC (rev 24967)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2009-01-07
19:42:07 UTC (rev 24968)
@@ -289,7 +289,7 @@
}
}
content.addChild("br");
- addHomepageLink(content);
+ addHomepageLink(content, ctx);
writeHTMLReply(ctx, 200, "OK", pageNode.generate());
request.freeParts();
@@ -344,7 +344,7 @@
}
content.addChild("br");
- addHomepageLink(content);
+ addHomepageLink(content, ctx);
writeHTMLReply(ctx, 200, "OK", pageNode.generate());
request.freeParts();
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
