Author: toad
Date: 2009-01-06 20:59:32 +0000 (Tue, 06 Jan 2009)
New Revision: 24936
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/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.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:
Fix some links in generated content, including in PageMaker and its callers.
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2009-01-06
20:48:30 UTC (rev 24935)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2009-01-06
20:59:32 UTC (rev 24936)
@@ -352,7 +352,7 @@
contentNode.addChild(core.alerts.createSummary());
- final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, req, contentNode,
MODE_SECURITY_LEVELS, "SecurityLevels.title", "SecurityLevels.tooltip");
+ final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, ctx, req, contentNode,
MODE_SECURITY_LEVELS, "SecurityLevels.title", "SecurityLevels.tooltip",
"/config/");
if(mode == MODE_SECURITY_LEVELS) {
drawSecurityLevelsPage(contentNode, ctx);
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2009-01-06 20:48:30 UTC (rev 24935)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2009-01-06 20:59:32 UTC (rev 24936)
@@ -236,8 +236,8 @@
long now = System.currentTimeMillis();
if(ctx.isAllowedFullAccess())
- contentNode.addChild(core.alerts.createSummary());
- final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, request, contentNode);
+ contentNode.addChild(core.alerts.createSummary(ctx));
+ final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, ctx, request, contentNode,
getURL());
if(peerNodeStatuses.length>0){
@@ -476,6 +476,8 @@
this.writeHTMLReply(ctx, 200, "OK", pageNode.generate());
}
+ protected abstract String getURL();
+
protected abstract boolean acceptRefPosts();
/** Where to redirect to if there is an error */
Modified: trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
2009-01-06 20:48:30 UTC (rev 24935)
+++ trunk/freenet/src/freenet/clients/http/ConnectivityToadlet.java
2009-01-06 20:59:32 UTC (rev 24936)
@@ -64,8 +64,8 @@
/* add alert summary box */
if(ctx.isAllowedFullAccess())
- contentNode.addChild(core.alerts.createSummary());
- final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, request, contentNode);
+ contentNode.addChild(core.alerts.createSummary(ctx));
+ final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, ctx, request, contentNode,
"/connectivity/");
// Add connection type box.
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2009-01-06 20:48:30 UTC (rev 24935)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2009-01-06 20:59:32 UTC (rev 24936)
@@ -424,4 +424,9 @@
return null;
}
+ @Override
+ protected String getURL() {
+ return "/friends/";
+ }
+
}
Modified: trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
2009-01-06 20:48:30 UTC (rev 24935)
+++ trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
2009-01-06 20:59:32 UTC (rev 24936)
@@ -145,5 +145,10 @@
}
}};
}
+
+ @Override
+ protected String getURL() {
+ return "/strangers/";
+ }
}
Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java 2009-01-06
20:48:30 UTC (rev 24935)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java 2009-01-06
20:59:32 UTC (rev 24936)
@@ -146,12 +146,12 @@
headNode.addChild("meta", new String[] { "http-equiv",
"content" }, new String[] { "Content-Type", "text/html; charset=utf-8" });
headNode.addChild("title", title + " - Freenet");
if(override == null)
- headNode.addChild("link", new String[] { "rel", "href",
"type", "title" }, new String[] { "stylesheet", "/static/themes/" + theme.code
+ "/theme.css", "text/css", theme.code });
+ headNode.addChild("link", new String[] { "rel", "href",
"type", "title" }, new String[] { "stylesheet", ctx.fixLink("/static/themes/" +
theme.code + "/theme.css"), "text/css", theme.code });
else
headNode.addChild(getOverrideContent());
for (THEME t: THEME.values()) {
String themeName = t.code;
- headNode.addChild("link", new String[] { "rel", "href",
"type", "media", "title" }, new String[] { "alternate stylesheet",
"/static/themes/" + themeName + "/theme.css", "text/css", "screen", themeName
});
+ headNode.addChild("link", new String[] { "rel", "href",
"type", "media", "title" }, new String[] { "alternate stylesheet",
ctx.fixLink("/static/themes/" + themeName + "/theme.css"), "text/css",
"screen", themeName });
}
HTMLNode bodyNode = htmlNode.addChild("body");
@@ -168,9 +168,9 @@
String navigationPath =
navigationLinks.get(navigationLink);
HTMLNode listItem = navbarUl.addChild("li");
if (plugin != null)
- listItem.addChild("a", new String[] {
"href", "title" }, new String[] { navigationPath,
plugin.getString(navigationTitle) }, plugin.getString(navigationLink));
+ listItem.addChild("a", new String[] {
"href", "title" }, new String[] { ctx.fixLink(navigationPath),
plugin.getString(navigationTitle) }, plugin.getString(navigationLink));
else
- listItem.addChild("a", new String[] {
"href", "title" }, new String[] { navigationPath,
L10n.getString(navigationTitle) }, L10n.getString(navigationLink));
+ listItem.addChild("a", new String[] {
"href", "title" }, new String[] { ctx.fixLink(navigationPath),
L10n.getString(navigationTitle) }, L10n.getString(navigationLink));
}
}
HTMLNode contentDiv = pageDiv.addChild("div", "id", "content");
@@ -254,11 +254,11 @@
return result;
}
- protected int drawModeSelectionArray(NodeClientCore core, HTTPRequest
req, HTMLNode contentNode) {
- return drawModeSelectionArray(core, req, contentNode, -1, null,
null);
+ protected int drawModeSelectionArray(NodeClientCore core, LinkFixer
fixer, HTTPRequest req, HTMLNode contentNode, String baseURL) {
+ return drawModeSelectionArray(core, fixer, req, contentNode,
-1, null, null, baseURL);
}
- protected int drawModeSelectionArray(NodeClientCore core, HTTPRequest
req, HTMLNode contentNode, int alternateMode, String alternateModeTitleKey,
String alternateModeTooltipKey) {
+ protected int drawModeSelectionArray(NodeClientCore core, LinkFixer
fixer, HTTPRequest req, HTMLNode contentNode, int alternateMode, String
alternateModeTitleKey, String alternateModeTooltipKey, String baseURL) {
// Mode can be changed by a link, not just by the default
int mode = core.isAdvancedModeEnabled() ? MODE_ADVANCED :
MODE_SIMPLE;
@@ -274,19 +274,19 @@
if(alternateMode > -1) {
if(mode != alternateMode)
- cell.addChild("a", new String[] { "href",
"title" }, new String[] { "?mode="+alternateMode,
L10n.getString(alternateModeTooltipKey) },
L10n.getString(alternateModeTitleKey));
+ cell.addChild("a", new String[] { "href",
"title" }, new String[] { fixer.fixLink(baseURL+"?mode="+alternateMode),
L10n.getString(alternateModeTooltipKey) },
L10n.getString(alternateModeTitleKey));
else
cell.addChild("b", "title",
L10n.getString(alternateModeTooltipKey), L10n.getString(alternateModeTitleKey));
cell = row.addChild("td");
}
if(mode != MODE_SIMPLE)
- cell.addChild("a", new String[] { "href", "title" },
new String[] { "?mode=1", l10n("modeSimpleTooltip") }, l10n("modeSimple"));
+ cell.addChild("a", new String[] { "href", "title" },
new String[] { fixer.fixLink(baseURL+"?mode=1"), l10n("modeSimpleTooltip") },
l10n("modeSimple"));
else
cell.addChild("b", "title", l10n("modeSimpleTooltip"),
l10n("modeSimple"));
cell = row.addChild("td");
if(mode != MODE_ADVANCED)
- cell.addChild("a", new String[] { "href", "title" },
new String[] { "?mode=2", l10n("modeAdvancedTooltip") }, l10n("modeAdvanced"));
+ cell.addChild("a", new String[] { "href", "title" },
new String[] { fixer.fixLink(baseURL+"?mode=2"), l10n("modeAdvancedTooltip") },
l10n("modeAdvanced"));
else
cell.addChild("b", "title",
l10n("modeAdvancedTooltip"), l10n("modeAdvanced"));
return mode;
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2009-01-06
20:48:30 UTC (rev 24935)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2009-01-06
20:59:32 UTC (rev 24936)
@@ -520,7 +520,7 @@
String mimeType =
clientGet.getMIMEType();
String
requestedMimeType = request.getParam("type", null);
String forceString =
request.getParam("force");
-
FProxyToadlet.handleDownload(ctx, data, ctx.getBucketFactory(), mimeType,
requestedMimeType, forceString, request.isParameterSet("forcedownload"),
"/queue/", key, "", "/queue/", false, ctx, core);
+
FProxyToadlet.handleDownload(ctx, data, ctx.getBucketFactory(), mimeType,
requestedMimeType, forceString, request.isParameterSet("forcedownload"),
"/queue/", uri, "", "/queue/", false, ctx, core);
return;
}
}
@@ -673,8 +673,8 @@
/* add alert summary box */
if(ctx.isAllowedFullAccess())
- contentNode.addChild(core.alerts.createSummary());
- final int mode = pageMaker.drawModeSelectionArray(core,
request, contentNode);
+ contentNode.addChild(core.alerts.createSummary(ctx));
+ final int mode = pageMaker.drawModeSelectionArray(core, ctx,
request, contentNode, "/queue/");
/* 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
2009-01-06 20:48:30 UTC (rev 24935)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2009-01-06 20:59:32 UTC (rev 24936)
@@ -150,8 +150,8 @@
final long nodeUptimeSeconds = (now - node.startupTime) / 1000;
if(ctx.isAllowedFullAccess())
- contentNode.addChild(core.alerts.createSummary());
- final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, request, contentNode);
+ contentNode.addChild(core.alerts.createSummary(ctx));
+ final int mode =
ctx.getPageMaker().drawModeSelectionArray(core, ctx, request, contentNode,
"/stats/");
double swaps = node.getSwaps();
double noSwaps = node.getNoSwaps();
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
