Author: toad
Date: 2009-01-07 21:52:10 +0000 (Wed, 07 Jan 2009)
New Revision: 24970
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
Log:
Fix lots of links
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2009-01-07 19:59:47 UTC (rev 24969)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2009-01-07 21:52:10 UTC (rev 24970)
@@ -71,7 +71,7 @@
@Override
protected void drawNameColumn(HTMLNode peerRow, PeerNodeStatus
peerNodeStatus) {
// name column
- peerRow.addChild("td", "class", "peer-name").addChild("a",
"href", "/send_n2ntm/?peernode_hashcode=" + peerNodeStatus.hashCode(),
((DarknetPeerNodeStatus)peerNodeStatus).getName());
+ peerRow.addChild("td", "class", "peer-name").addChild("a",
"href", container.fixLink("/send_n2ntm/?peernode_hashcode=" +
peerNodeStatus.hashCode()), ((DarknetPeerNodeStatus)peerNodeStatus).getName());
}
@Override
Modified: trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
2009-01-07 19:59:47 UTC (rev 24969)
+++ trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
2009-01-07 21:52:10 UTC (rev 24970)
@@ -290,7 +290,7 @@
congratzInfoboxHeader.addChild("#", l10n("congratz"));
congratzInfoboxContent.addChild("p",
l10n("congratzLong"));
- congratzInfoboxContent.addChild("a", "href",
"?step="+WIZARD_STEP.FINAL,
L10n.getString("FirstTimeWizardToadlet.continueEnd"));
+ congratzInfoboxContent.addChild("a", "href",
container.fixLink("?step="+WIZARD_STEP.FINAL),
L10n.getString("FirstTimeWizardToadlet.continueEnd"));
this.writeHTMLReply(ctx, 200, "OK",
pageNode.generate());
return;
@@ -316,10 +316,10 @@
HTMLNode firstParagraph = welcomeInfoboxContent.addChild("p");
firstParagraph.addChild("#", l10n("welcomeInfoboxContent1"));
HTMLNode secondParagraph = welcomeInfoboxContent.addChild("p");
- secondParagraph.addChild("a", "href",
"?step="+WIZARD_STEP.SECURITY_NETWORK).addChild("#",
L10n.getString("FirstTimeWizardToadlet.clickContinue"));
+ secondParagraph.addChild("a", "href",
container.fixLink("?step="+WIZARD_STEP.SECURITY_NETWORK)).addChild("#",
L10n.getString("FirstTimeWizardToadlet.clickContinue"));
HTMLNode thirdParagraph = welcomeInfoboxContent.addChild("p");
- thirdParagraph.addChild("a", "href",
"?step="+WIZARD_STEP.FINAL).addChild("#", l10n("skipWizard"));
+ thirdParagraph.addChild("a", "href",
container.fixLink("?step="+WIZARD_STEP.FINAL)).addChild("#",
l10n("skipWizard"));
this.writeHTMLReply(ctx, 200, "OK", pageNode.generate());
}
Modified: trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2009-01-07 19:59:47 UTC (rev 24969)
+++ trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2009-01-07 21:52:10 UTC (rev 24970)
@@ -107,7 +107,7 @@
HTMLNode rootRow = listingTable.addChild("tr");
rootRow.addChild("td");
HTMLNode rootLinkCellNode =
rootRow.addChild("td");
- rootLinkCellNode.addChild("a", "href", "?path="
+ URLEncoder.encode(currentRoot.getCanonicalPath(),false)+extra,
currentRoot.getCanonicalPath());
+ rootLinkCellNode.addChild("a", "href",
container.fixLink("?path=" +
URLEncoder.encode(currentRoot.getCanonicalPath(),false)+extra),
currentRoot.getCanonicalPath());
rootRow.addChild("td");
}
/* add back link */
@@ -115,7 +115,7 @@
HTMLNode backlinkRow =
listingTable.addChild("tr");
backlinkRow.addChild("td");
HTMLNode backlinkCellNode =
backlinkRow.addChild("td");
- backlinkCellNode.addChild("a", "href", "?path="
+ URLEncoder.encode(currentPath.getParent(),false)+extra, "..");
+ backlinkCellNode.addChild("a", "href",
container.fixLink("?path=" +
URLEncoder.encode(currentPath.getParent(),false)+extra), "..");
backlinkRow.addChild("td");
}
for (int fileIndex = 0, fileCount = files.length;
fileIndex < fileCount; fileIndex++) {
@@ -130,7 +130,7 @@
if(furi != null)
formNode.addChild("input", new String[] { "type", "name", "value" }, new
String[] { "hidden", "key", furi.toASCIIString() });
HTMLNode directoryCellNode =
fileRow.addChild("td");
- directoryCellNode.addChild("a",
"href", "?path=" +
URLEncoder.encode(currentFile.getAbsolutePath(),false)+extra,
currentFile.getName());
+ directoryCellNode.addChild("a",
"href", container.fixLink("?path=" +
URLEncoder.encode(currentFile.getAbsolutePath(),false)+extra),
currentFile.getName());
} else {
fileRow.addChild("td");
fileRow.addChild("td", "class",
"unreadable-file", currentFile.getName());
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2009-01-07
19:59:47 UTC (rev 24969)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2009-01-07
21:52:10 UTC (rev 24970)
@@ -110,7 +110,7 @@
HTMLNode list = infoboxContent.addChild("ul");
Toadlet.addHomepageLink(list, ctx);
list.addChild("li").addChild("a", new String[] { "href",
"title" },
- new String[] { "/friends/",
l10n("returnToFriends") },
+ new String[] { ctx.fixLink("/friends/"),
l10n("returnToFriends") },
l10n("friends"));
return infobox;
}
@@ -223,7 +223,7 @@
HTMLNode list = peerTableInfobox.addChild("ul");
Toadlet.addHomepageLink(list, container);
list.addChild("li").addChild("a", new String[] {
"href", "title" },
- new String[] { "/friends/",
l10n("returnToFriends") },
+ new String[] {
container.fixLink("/friends/"), l10n("returnToFriends") },
l10n("friends"));
this.writeHTMLReply(ctx, 200, "OK",
pageNode.generate());
return;
Modified: trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2009-01-07
19:59:47 UTC (rev 24969)
+++ trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2009-01-07
21:52:10 UTC (rev 24970)
@@ -174,7 +174,7 @@
HTMLNode infoboxContent =
infobox.addChild("div", "class", "infobox-content");
infoboxContent.addChild("#",
l10n("pluginUnloadedWithName", "name", pluginThreadName));
infoboxContent.addChild("br");
- infoboxContent.addChild("a", "href",
"/plugins/", l10n("returnToPluginPage"));
+ infoboxContent.addChild("a", "href",
container.fixLink("/plugins/"), l10n("returnToPluginPage"));
writeHTMLReply(ctx, 200, "OK",
pageNode.generate());
return;
}if (request.getPartAsString("unload",
MAX_PLUGIN_NAME_LENGTH).length() > 0) {
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2009-01-07
19:59:47 UTC (rev 24969)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2009-01-07
21:52:10 UTC (rev 24970)
@@ -477,7 +477,7 @@
HTMLNode infoboxContent = pageMaker.getContentNode(infobox);
infoboxContent.addChild("#", message);
if(returnToQueuePage)
- infoboxContent.addChild("div").addChildren(new
HTMLNode[] { new HTMLNode("#", "Return to "), new HTMLNode("a", "href",
"/queue/", "queue page"), new HTMLNode("#", ".") });
+ infoboxContent.addChild("div").addChildren(new
HTMLNode[] { new HTMLNode("#", "Return to "), new HTMLNode("a", "href",
container.fixLink("/queue/"), "queue page"), new HTMLNode("#", ".") });
writeHTMLReply(context, 400, "Bad request",
pageNode.generate());
}
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2009-01-07 19:59:47 UTC (rev 24969)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2009-01-07 21:52:10 UTC (rev 24970)
@@ -184,8 +184,8 @@
// Get logs
HTMLNode logsList = statGatheringContent.addChild("ul");
if(nodeConfig.config.get("logger").getBoolean("enabled"))
- logsList.addChild("li").addChild("a", new String[]{
"href", "target"}, new String[]{ "/?latestlog", "_blank"}, l10n("getLogs"));
- logsList.addChild("li").addChild("a", "href",
TranslationToadlet.TOADLET_URL+"?getOverrideTranlationFile").addChild("#",
L10n.getString("TranslationToadlet.downloadTranslationsFile"));
+ logsList.addChild("li").addChild("a", new String[]{
"href", "target"}, new String[]{ container.fixLink("/?latestlog"), "_blank"},
l10n("getLogs"));
+ logsList.addChild("li").addChild("a", "href",
container.fixLink(TranslationToadlet.TOADLET_URL+"?getOverrideTranlationFile")).addChild("#",
L10n.getString("TranslationToadlet.downloadTranslationsFile"));
if(mode >= PageMaker.MODE_ADVANCED) {
// store size box
Modified: trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
2009-01-07 19:59:47 UTC (rev 24969)
+++ trunk/freenet/src/freenet/clients/http/TranslationToadlet.java
2009-01-07 21:52:10 UTC (rev 24970)
@@ -79,11 +79,11 @@
);
HTMLNode footer = translationNode.addChild("div",
"class", "warning");
- footer.addChild("a", "href",
TOADLET_URL+"?getOverrideTranlationFile").addChild("#",
l10n("downloadTranslationsFile"));
+ footer.addChild("a", "href",
container.fixLink(TOADLET_URL+"?getOverrideTranlationFile")).addChild("#",
l10n("downloadTranslationsFile"));
footer.addChild("%", " ");
- footer.addChild("a", "href",
TOADLET_URL+"?translate="+key+ (showEverything ? "" :
"&toTranslateOnly")).addChild("#", l10n("reEdit"));
+ footer.addChild("a", "href",
container.fixLink(TOADLET_URL+"?translate="+key+ (showEverything ? "" :
"&toTranslateOnly"))).addChild("#", l10n("reEdit"));
footer.addChild("%", " ");
- footer.addChild("a", "href", TOADLET_URL +
(showEverything ? "" : "?toTranslateOnly")).addChild("#",
l10n("returnToTranslations"));
+ footer.addChild("a", "href",
container.fixLink(TOADLET_URL + (showEverything ? "" :
"?toTranslateOnly"))).addChild("#", l10n("returnToTranslations"));
this.writeHTMLReply(ctx, 200, "OK",
pageNode.generate());
return;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
