Author: toad
Date: 2007-05-03 23:01:06 +0000 (Thu, 03 May 2007)
New Revision: 13143
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.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
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Coalesce logic and strings for return-to-node-homepage links
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-05-03
22:52:05 UTC (rev 13142)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2007-05-03
23:01:06 UTC (rev 13143)
@@ -101,7 +101,7 @@
HTMLNode content = ctx.getPageMaker().getContentNode(infobox);
content.addChild("a", new String[]{"href", "title"}, new
String[]{".", l10n("shortTitle")}, l10n("returnToNodeConfig"));
content.addChild("br");
- content.addChild("a", new String[]{"href", "title"}, new
String[]{"/", l10n("homepage")}, l10n("returnToNodeHomepage"));
+ addHomepageLink(content);
writeReply(ctx, 200, "text/html", "OK", pageNode.generate());
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2007-05-03
22:52:05 UTC (rev 13142)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2007-05-03
23:01:06 UTC (rev 13143)
@@ -105,7 +105,7 @@
HTMLNode infoboxContent = infobox.addChild("div", "class",
"infobox-content");
infoboxContent.addChild("#", message);
HTMLNode list = infoboxContent.addChild("ul");
- list.addChild("li").addChild("a", new String[] { "href", "title" },
new String[] { "/", l10n("returnToNodeHomepage") }, l10n("homepage"));
+ Toadlet.addHomepageLink(list);
list.addChild("li").addChild("a", new String[] { "href", "title" },
new String[] { "/darknet/", l10n("returnToFriends") }, l10n("friends"));
return infobox;
}
@@ -189,7 +189,7 @@
HTMLNode infoboxContent =
peerTableInfobox.addChild("div", "class", "n2ntm-message-text");
infoboxContent.addChild("#", message);
HTMLNode list = peerTableInfobox.addChild("ul");
- list.addChild("li").addChild("a", new String[] {
"href", "title" }, new String[] { "/", l10n("returnToNodeHomepage") },
l10n("homepage"));
+ Toadlet.addHomepageLink(list);
list.addChild("li").addChild("a", new String[] {
"href", "title" }, new String[] { "/darknet/", l10n("returnToFriends") },
l10n("friends"));
this.writeReply(ctx, 200, "text/html", "OK",
pageNode.generate());
return;
Modified: trunk/freenet/src/freenet/clients/http/Toadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Toadlet.java 2007-05-03 22:52:05 UTC
(rev 13142)
+++ trunk/freenet/src/freenet/clients/http/Toadlet.java 2007-05-03 23:01:06 UTC
(rev 13143)
@@ -92,7 +92,7 @@
return L10n.getString("Toadlet."+key, new String[] { pattern },
new String[] { value });
}
- private String l10n(String key) {
+ private static String l10n(String key) {
return L10n.getString("Toadlet."+key);
}
@@ -217,7 +217,7 @@
infoboxContent.addChild(message);
infoboxContent.addChild("br");
infoboxContent.addChild("a", "href", ".",
l10n("returnToPrevPage"));
- infoboxContent.addChild("a", "href", "/",
l10n("returnToNodeHomepage"));
+ addHomepageLink(infoboxContent);
writeReply(ctx, code, "text/html; charset=UTF-8", desc,
pageNode.generate());
}
@@ -248,7 +248,7 @@
infoboxContent.addChild("pre", sw.toString());
infoboxContent.addChild("br");
infoboxContent.addChild("a", "href", ".",
l10n("returnToPrevPage"));
- infoboxContent.addChild("a", "href", "/",
l10n("returnToNodeHomepage"));
+ addHomepageLink(infoboxContent);
writeReply(ctx, 500, "text/html; charset=UTF-8", desc,
pageNode.generate());
}
@@ -265,6 +265,10 @@
writeReply(ctx, 500, "text/html", "Internal Error", msg);
}
+ protected static void addHomepageLink(HTMLNode content) {
+ content.addChild("a", new String[]{"href", "title"}, new
String[]{"/", l10n("homepage")}, l10n("returnToNodeHomepage"));
+ }
+
/**
* Get the client impl. DO NOT call the blocking methods on it!!
* Just use it for configuration etc.
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2007-05-03
22:52:05 UTC (rev 13142)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2007-05-03
23:01:06 UTC (rev 13143)
@@ -372,10 +372,6 @@
}
}
- private void addHomepageLink(HTMLNode content) {
- content.addChild("a", new String[] { "href", "title" }, new
String[] { "/", L10n.getString("Toadlet.returnToNodeHomepage") },
L10n.getString("Toadlet.nodeHomepage"));
- }
-
private void finInputBoxRow(HTMLNode table, String name, String label,
String message) {
HTMLNode row = table.addChild("tr");
HTMLNode cell = row.addChild("td");
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-05-03
22:52:05 UTC (rev 13142)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2007-05-03
23:01:06 UTC (rev 13143)
@@ -11,7 +11,6 @@
Toadlet.returnToPrevPage=Return to the previous page
Toadlet.cancel=Cancel
Toadlet.nodeHomepage=Node Homepage
-Toadlet.returnToHomepage=Return to node homepage
ToadletContextImpl.methodNotAllowed=HTTP Method Not Allowed
ToadletContextImpl.noSuchToadlet=No Toadlet of that name
ToadletContextImpl.uriParseErrorTitle=URI Parse Error
@@ -63,7 +62,6 @@
ConfigToadlet.shortTitle=Configuration
ConfigToadlet.returnToNodeConfig=Return to node configuration
ConfigToadlet.homepage=Node Homepage
-ConfigToadlet.returnToNodeHomepage=Return to node homepage
ConfigToadlet.fullTitle=Freenet Node Configuration of ${name}
ConfigToadlet.configNavTitle=Configuration Navigation
ConfigToadlet.title=Freenet Node Configuration
@@ -222,7 +220,6 @@
N2NTMToadlet.sendMessageShort=Send message
N2NTMToadlet.peerNotFoundTitle=Peer not found
N2NTMToadlet.peerNotFoundWithHash=The peer with the hash code
\u201c${hash}\u201d could not be found.
-N2NTMToadlet.returnToNodeHomepage=Return to node homepage
N2NTMToadlet.homepage=Homepage
N2NTMToadlet.returnToFriends=Return to friends list
N2NTMToadlet.friends=Friends
