Author: nextgens
Date: 2008-06-08 10:58:26 +0000 (Sun, 08 Jun 2008)
New Revision: 20261
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/PageMaker.java
trunk/freenet/src/freenet/l10n/freenet.l10n.de.properties
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
trunk/freenet/src/freenet/l10n/freenet.l10n.fr.properties
trunk/freenet/src/freenet/l10n/freenet.l10n.it.properties
trunk/freenet/src/freenet/l10n/freenet.l10n.zh-cn.properties
trunk/freenet/src/freenet/l10n/freenet.l10n.zh-tw.properties
Log:
First part of #2358: Stats page needs normal/advanced mode tabs
* Factor out the code I will reuse somewhere else to implement it
* Change a few strings in all translations from ConfigToadlet. to
PageMaker.
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-06-08
10:37:32 UTC (rev 20260)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-06-08
10:58:26 UTC (rev 20261)
@@ -29,8 +29,6 @@
public class ConfigToadlet extends Toadlet {
// If a setting has to be more than a meg, something is seriously wrong!
private static final int MAX_PARAM_VALUE_SIZE = 1024*1024;
- private static final int MODE_SIMPLE = 1;
- private static final int MODE_ADVANCED = 2;
private final Config config;
private final NodeClientCore core;
private final Node node;
@@ -142,30 +140,9 @@
contentNode.addChild(core.alerts.createSummary());
- // Mode can be changed by a link, not just by the default
+ int mode = ctx.getPageMaker().drawModeSelectionArray(core, req,
contentNode);
- int mode = core.isAdvancedModeEnabled() ? MODE_ADVANCED :
MODE_SIMPLE;
-
- if(req.isParameterSet("mode")) {
- mode = req.getIntParam("mode", mode);
- }
-
- // FIXME style this properly
- HTMLNode table = contentNode.addChild("table", "border", "1");
- HTMLNode row = table.addChild("tr");
- HTMLNode cell = row.addChild("td");
-
- if(mode != MODE_SIMPLE)
- cell.addChild("a", new String[] { "href", "title" },
new String[] { "/config/?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[] { "/config/?mode=2", l10n("modeAdvancedTooltip") },
l10n("modeAdvanced"));
- else
- cell.addChild("b", "title",
l10n("modeAdvancedTooltip"), l10n("modeAdvanced"));
-
- if(mode >= MODE_ADVANCED){
+ if(mode >= PageMaker.MODE_ADVANCED){
HTMLNode navigationBar =
ctx.getPageMaker().getInfobox("navbar", l10n("configNavTitle"));
HTMLNode navigationContent =
ctx.getPageMaker().getContentNode(navigationBar).addChild("ul");
if(!L10n.getSelectedLanguage().equals(L10n.FALLBACK_DEFAULT))
@@ -207,13 +184,13 @@
HTMLNode configGroupUlNode = new HTMLNode("ul",
"class", "config");
for(int j=0; j<o.length; j++){
- if(! (mode == MODE_SIMPLE && o[j].isExpert())){
+ if(! (mode == PageMaker.MODE_SIMPLE &&
o[j].isExpert())){
displayedConfigElements++;
String configName = o[j].getName();
HTMLNode configItemNode =
configGroupUlNode.addChild("li");
configItemNode.addChild("span", new
String[]{ "class", "title", "style" },
- new String[]{
"configshortdesc", L10n.getString("ConfigToadlet.defaultIs", new String[] {
"default" }, new String[] { o[j].getDefault() }) + (mode >= MODE_ADVANCED ? "
["+sc[i].getPrefix() + '.' + o[j].getName() + ']' : ""),
+ new String[]{
"configshortdesc", L10n.getString("ConfigToadlet.defaultIs", new String[] {
"default" }, new String[] { o[j].getDefault() }) + (mode >=
PageMaker.MODE_ADVANCED ? " ["+sc[i].getPrefix() + '.' + o[j].getName() + ']' :
""),
"cursor: help;"
}).addChild(L10n.getHTMLNode(o[j].getShortDesc()));
HTMLNode configItemValueNode =
configItemNode.addChild("span", "class", "config");
if(o[j].getValueString() == null){
Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-06-08
10:37:32 UTC (rev 20260)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-06-08
10:58:26 UTC (rev 20261)
@@ -16,8 +16,10 @@
import java.util.jar.JarFile;
import freenet.l10n.L10n;
+import freenet.node.NodeClientCore;
import freenet.support.HTMLNode;
import freenet.support.Logger;
+import freenet.support.api.HTTPRequest;
import freenet.support.io.FileUtil;
/** Simple class to output standard heads and tail for web interface pages.
@@ -258,4 +260,38 @@
return result;
}
+
+ public static final int MODE_SIMPLE = 1;
+ public static final int MODE_ADVANCED = 2;
+
+ protected int drawModeSelectionArray(NodeClientCore core, HTTPRequest
req, HTMLNode contentNode) {
+ // Mode can be changed by a link, not just by the default
+
+ int mode = core.isAdvancedModeEnabled() ? MODE_ADVANCED :
MODE_SIMPLE;
+
+ if(req.isParameterSet("mode")) {
+ mode = req.getIntParam("mode", mode);
+ }
+
+ // FIXME style this properly
+ HTMLNode table = contentNode.addChild("table", "border", "1");
+ HTMLNode row = table.addChild("tr");
+ HTMLNode cell = row.addChild("td");
+
+ if(mode != MODE_SIMPLE)
+ cell.addChild("a", new String[] { "href", "title" },
new String[] { "?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"));
+ else
+ cell.addChild("b", "title",
l10n("modeAdvancedTooltip"), l10n("modeAdvanced"));
+
+ return mode;
+ }
+
+ private static final String l10n(String string) {
+ return L10n.getString("PageMaker." + string);
+ }
}
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.de.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.de.properties 2008-06-08
10:37:32 UTC (rev 20260)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.de.properties 2008-06-08
10:58:26 UTC (rev 20261)
@@ -85,10 +85,10 @@
ConfigToadlet.fproxy=FProxy
ConfigToadlet.fullTitle=Freenet-Knoten-Konfiguration von ${name}
ConfigToadlet.logger=Logger
-ConfigToadlet.modeAdvanced=Erweiterte Einstellungen
-ConfigToadlet.modeAdvancedTooltip=Optionen, die nur erfahrene Freenet-Benutzer
und -Entwickler benutzen m?ssen
-ConfigToadlet.modeSimple=Einfache Einstellungen
-ConfigToadlet.modeSimpleTooltip=Optionen, die alle Benutzer kennen sollten
+PageMaker.modeAdvanced=Erweiterte Einstellungen
+PageMaker.modeAdvancedTooltip=Optionen, die nur erfahrene Freenet-Benutzer und
-Entwickler benutzen m?ssen
+PageMaker.modeSimple=Einfache Einstellungen
+PageMaker.modeSimpleTooltip=Optionen, die alle Benutzer kennen sollten
ConfigToadlet.node=Knoten
ConfigToadlet.pluginmanager=Plugin-Manager
ConfigToadlet.pluginmanager2=Plugin-Manager 2
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-06-08
10:37:32 UTC (rev 20260)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-06-08
10:58:26 UTC (rev 20261)
@@ -86,10 +86,10 @@
ConfigToadlet.fproxy=fproxy
ConfigToadlet.fullTitle=Freenet Node Configuration of ${name}
ConfigToadlet.logger=logger
-ConfigToadlet.modeSimple=Simple config options
-ConfigToadlet.modeSimpleTooltip=Config options that all users should know about
-ConfigToadlet.modeAdvanced=Advanced config options
-ConfigToadlet.modeAdvancedTooltip=Config options that only experienced freenet
users and developers will need to use
+PageMaker.modeSimple=Simple config options
+PageMaker.modeSimpleTooltip=Config options that all users should know about
+PageMaker.modeAdvanced=Advanced config options
+PageMaker.modeAdvancedTooltip=Config options that only experienced freenet
users and developers will need to use
ConfigToadlet.node=node
ConfigToadlet.node.load=node.load
ConfigToadlet.node.opennet=node.opennet
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.fr.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.fr.properties 2008-06-08
10:37:32 UTC (rev 20260)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.fr.properties 2008-06-08
10:58:26 UTC (rev 20261)
@@ -85,10 +85,10 @@
ConfigToadlet.fproxy=fproxy
ConfigToadlet.fullTitle=Configuration du noeud ${name}
ConfigToadlet.logger=enregistreur de logs
-ConfigToadlet.modeAdvanced=Options de configuration avanc?es
-ConfigToadlet.modeAdvancedTooltip=Options de configuration utiles uniquement
aux utilisateurs exp?riment?s et aux d?veloppeurs
-ConfigToadlet.modeSimple=Options de configuration simple
-ConfigToadlet.modeSimpleTooltip=Options de configuration utiles ? tous les
utilisateurs
+PageMaker.modeAdvanced=Options de configuration avanc?es
+PageMaker.modeAdvancedTooltip=Options de configuration utiles uniquement aux
utilisateurs exp?riment?s et aux d?veloppeurs
+PageMaker.modeSimple=Options de configuration simple
+PageMaker.modeSimpleTooltip=Options de configuration utiles ? tous les
utilisateurs
ConfigToadlet.node=noeud
ConfigToadlet.pluginmanager=gestionnaire de plugins
ConfigToadlet.pluginmanager2=gestionnaire de plugins 2
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.it.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.it.properties 2008-06-08
10:37:32 UTC (rev 20260)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.it.properties 2008-06-08
10:58:26 UTC (rev 20261)
@@ -87,10 +87,10 @@
ConfigToadlet.fullTitle=Configurazione del Nodo Freenet di ${name}
ConfigToadlet.homepage=Homepage del Nodo
ConfigToadlet.logger=log
-ConfigToadlet.modeAdvanced=Configurazione avanzata
-ConfigToadlet.modeAdvancedTooltip=Opzioni di configurazione che dovrebbero
usare solo gli utenti avanzati di Freenet e gli sviluppatori.
-ConfigToadlet.modeSimple=Configurazione Semplice
-ConfigToadlet.modeSimpleTooltip=Opzioni di configurazione che tutti gli utenti
dovrebbero conoscere.
+PageMaker.modeAdvanced=Configurazione avanzata
+PageMaker.modeAdvancedTooltip=Opzioni di configurazione che dovrebbero usare
solo gli utenti avanzati di Freenet e gli sviluppatori.
+PageMaker.modeSimple=Configurazione Semplice
+PageMaker.modeSimpleTooltip=Opzioni di configurazione che tutti gli utenti
dovrebbero conoscere.
ConfigToadlet.node=nodo
ConfigToadlet.pluginmanager=pluginmanager
ConfigToadlet.pluginmanager2=pluginmanager2
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.zh-cn.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.zh-cn.properties
2008-06-08 10:37:32 UTC (rev 20260)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.zh-cn.properties
2008-06-08 10:58:26 UTC (rev 20261)
@@ -53,8 +53,8 @@
ConfigToadlet.configNavTitle=????
ConfigToadlet.contributeTranslation=????????
ConfigToadlet.fullTitle=${name} ? Freenet ????
-ConfigToadlet.modeAdvanced=??????
-ConfigToadlet.modeSimple=??????
+PageMaker.modeAdvanced=??????
+PageMaker.modeSimple=??????
ConfigToadlet.possibilitiesTitle=??
ConfigToadlet.reset=??
ConfigToadlet.returnToNodeConfig=??????
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.zh-tw.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.zh-tw.properties
2008-06-08 10:37:32 UTC (rev 20260)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.zh-tw.properties
2008-06-08 10:58:26 UTC (rev 20261)
@@ -53,8 +53,8 @@
ConfigToadlet.configNavTitle=????
ConfigToadlet.contributeTranslation=????????
ConfigToadlet.fullTitle=${name} ? Freenet ????
-ConfigToadlet.modeAdvanced=??????
-ConfigToadlet.modeSimple=??????
+PageMaker.modeAdvanced=??????
+PageMaker.modeSimple=??????
ConfigToadlet.possibilitiesTitle=??
ConfigToadlet.reset=??
ConfigToadlet.returnToNodeConfig=??????
