Author: juiceman
Date: 2009-01-10 05:50:57 +0000 (Sat, 10 Jan 2009)
New Revision: 24998
Modified:
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/SimpleHelpToadlet.java
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Add some separation to the Navbar, also reorder it a bit.
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2009-01-09
23:21:25 UTC (rev 24997)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2009-01-10
05:50:57 UTC (rev 24998)
@@ -755,6 +755,10 @@
UserAlertsToadlet alerts = new UserAlertsToadlet(client, node,
core);
server.register(alerts, "/alerts/", true,
"FProxyToadlet.alertsTitle", "FProxyToadlet.alerts", true, null);
+
+ QueueToadlet queueToadlet = new QueueToadlet(core,
core.getFCPServer(), client);
+ server.register(queueToadlet, "/queue/", true,
"FProxyToadlet.queueTitle", "FProxyToadlet.queue", false, queueToadlet);
+ queueToadlet.loadCompletedIdentifiers();
PproxyToadlet pproxy = new PproxyToadlet(client, node, core);
server.register(pproxy, "/plugins/", true,
"FProxyToadlet.pluginsTitle", "FProxyToadlet.plugins", true, null);
@@ -762,30 +766,18 @@
WelcomeToadlet welcometoadlet = new WelcomeToadlet(client,
core, node, bookmarks);
server.register(welcometoadlet, "/welcome/", true, false);
- ConfigToadlet configtoadlet = new ConfigToadlet(client, config,
node, core);
- server.register(configtoadlet, "/config/", true,
"FProxyToadlet.configTitle", "FProxyToadlet.config", true, null);
-
SymlinkerToadlet symlinkToadlet = new SymlinkerToadlet(client,
node);
server.register(symlinkToadlet, "/sl/", true, false);
DarknetConnectionsToadlet friendsToadlet = new
DarknetConnectionsToadlet(node, core, client);
-// server.register(friendsToadlet, "/darknet/", true,
l10n("friendsTitle"), l10n("friends"), true);
server.register(friendsToadlet, "/friends/", true,
"FProxyToadlet.friendsTitle", "FProxyToadlet.friends", true, null);
OpennetConnectionsToadlet opennetToadlet = new
OpennetConnectionsToadlet(node, core, client);
-// server.register(opennetToadlet, "/opennet/", true,
l10n("opennetTitle"), l10n("opennet"), true, opennetToadlet);
server.register(opennetToadlet, "/strangers/", true,
"FProxyToadlet.opennetTitle", "FProxyToadlet.opennet", true, opennetToadlet);
N2NTMToadlet n2ntmToadlet = new N2NTMToadlet(node, core,
client);
server.register(n2ntmToadlet, "/send_n2ntm/", true, true);
-
- QueueToadlet queueToadlet = new QueueToadlet(core,
core.getFCPServer(), client);
- server.register(queueToadlet, "/queue/", true,
"FProxyToadlet.queueTitle", "FProxyToadlet.queue", false, queueToadlet);
- queueToadlet.loadCompletedIdentifiers();
-
- StatisticsToadlet statisticsToadlet = new
StatisticsToadlet(node, core, client);
- server.register(statisticsToadlet, "/stats/", true,
"FProxyToadlet.statsTitle", "FProxyToadlet.stats", true, null);
-
+
LocalFileInsertToadlet localFileInsertToadlet = new
LocalFileInsertToadlet(core, client);
server.register(localFileInsertToadlet, "/files/", true, false);
@@ -794,10 +786,10 @@
BrowserTestToadlet browsertTestToadlet = new
BrowserTestToadlet(client, core);
server.register(browsertTestToadlet, "/test/", true, false);
+
+ StatisticsToadlet statisticsToadlet = new
StatisticsToadlet(node, core, client);
+ server.register(statisticsToadlet, "/stats/", true,
"FProxyToadlet.statsTitle", "FProxyToadlet.stats", true, null);
- SimpleHelpToadlet simpleHelpToadlet = new
SimpleHelpToadlet(client, core);
- server.register(simpleHelpToadlet, "/help/", true, false);
-
ConnectivityToadlet connectivityToadlet = new
ConnectivityToadlet(client, node, core);
server.register(connectivityToadlet, "/connectivity/", true,
"ConnectivityToadlet.connectivityTitle", "ConnectivityToadlet.connectivity",
true, null);
@@ -807,6 +799,12 @@
FirstTimeWizardToadlet firstTimeWizardToadlet = new
FirstTimeWizardToadlet(client, node, core);
server.register(firstTimeWizardToadlet,
FirstTimeWizardToadlet.TOADLET_URL, true, false);
+ ConfigToadlet configtoadlet = new ConfigToadlet(client, config,
node, core);
+ server.register(configtoadlet, "/config/", true,
"FProxyToadlet.configTitle", "FProxyToadlet.config", true, null);
+
+ SimpleHelpToadlet simpleHelpToadlet = new
SimpleHelpToadlet(client, core);
+ server.register(simpleHelpToadlet, "/help/", true, false);
+
}
/**
Modified: trunk/freenet/src/freenet/clients/http/SimpleHelpToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleHelpToadlet.java
2009-01-09 23:21:25 UTC (rev 24997)
+++ trunk/freenet/src/freenet/clients/http/SimpleHelpToadlet.java
2009-01-10 05:50:57 UTC (rev 24998)
@@ -30,7 +30,7 @@
- HTMLNode pageNode = ctx.getPageMaker().getPageNode("Freenet " +
L10n.getString("SimpleHelpToadlet.help"), ctx);
+ HTMLNode pageNode = ctx.getPageMaker().getPageNode("Freenet " +
L10n.getString("FProxyToadlet.help"), ctx);
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
if(ctx.isAllowedFullAccess())
Modified:
trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
===================================================================
--- trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2009-01-09 23:21:25 UTC (rev 24997)
+++ trunk/freenet/src/freenet/clients/http/staticfiles/themes/clean/theme.css
2009-01-10 05:50:57 UTC (rev 24998)
@@ -87,14 +87,17 @@
}
#navbar ul {
- margin: 0 0 0 30px;
+ margin: 0 0 0 10px;
padding: 0;
}
#navbar li {
- margin: 0;
- padding: 0;
+ padding-left: 3px;
+ padding-right: 3px;
list-style-type: none;
+ margin-top: 2px;
+ margin-bottom: 2px;
+ border: 2px outset #d0d0d0;
}
#navbar a {
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2009-01-09
23:21:25 UTC (rev 24997)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2009-01-10
05:50:57 UTC (rev 24998)
@@ -331,6 +331,7 @@
FProxyToadlet.friendsTitle=Connections to friends
FProxyToadlet.goBack=Go back
FProxyToadlet.goBackToPrev=Go back to the previous page
+FProxyToadlet.help=Help
FProxyToadlet.invalidKeyTitle=Invalid Key
FProxyToadlet.invalidKeyWithReason=Invalid key: ${reason}
FProxyToadlet.largeFile=Large file
@@ -1124,7 +1125,6 @@
SimpleHelpToadlet.definitionsTitle=Definitions
SimpleHelpToadlet.descriptionText=This page should provide basic info for you
to get started with Freenet. There are many other places for more in-depth
information such as the offical Freenet website http://freenetproject.org, the
offical wiki http://wiki.freenetproject.org or various in-Freenet Freesites.
SimpleHelpToadlet.descriptionTitle=Description
-SimpleHelpToadlet.help=Help
SimpleToadletServer.advancedMode=Enable Advanced Mode?
SimpleToadletServer.advancedModeLong=Enables display of advanced options and
information in the web interface by default. This setting should be turned to
false in most cases.
SimpleToadletServer.allowedFullAccess=Hosts having a full access to FProxy
(read warning)
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
