From 2a92be59460f156510d0ac1abef48a8119fa970e Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 5 Apr 2010 13:34:45 +0000 Subject: [PATCH] * Console: - More HTML transitional fixes - Standardize on 'save' to the right of 'cancel' --- apps/routerconsole/jsp/config.jsp | 57 +++++++++++-------- apps/routerconsole/jsp/configadvanced.jsp | 10 ++-- apps/routerconsole/jsp/configkeyring.jsp | 12 ++-- apps/routerconsole/jsp/configlogging.jsp | 16 +++--- apps/routerconsole/jsp/configstats.jsp | 21 ++++--- apps/routerconsole/jsp/configtunnels.jsp | 9 ++- apps/routerconsole/jsp/configui.jsp | 3 +- history.txt | 7 +++ .../src/net/i2p/router/RouterVersion.java | 2 +- 9 files changed, 80 insertions(+), 57 deletions(-) diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index edd02bba6b..3374cc07a0 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -24,12 +24,12 @@ <% String prev = System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce"); if (prev != null) System.setProperty("net.i2p.router.web.ConfigNetHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigNetHandler.nonce", new java.util.Random().nextLong()+""); %> - " /> - + " > +

<%=intl._("Bandwidth limiter")%>

<%=intl._("I2P will work best if you configure your rates to match the speed of your internet connection.")%>

-

" /> +

<% /******** @@ -40,7 +40,7 @@ --> *********/ %> - <% /******** @@ -76,7 +76,10 @@ } %>
-" /> " />
+" > +" > + +<% /******** +*********/ %>

<%=intl._("IP and Transport Configuration")%>

<%=intl._("The default settings will work for most people.")%> <%=intl._("There is help below.")%>

<%=intl._("UPnP Configuration")%>:
- /> + > <%=intl._("Enable UPnP to open firewall ports")%> - <%=intl._("UPnP status")%>

<%=intl._("IP Configuration")%>:
<%=intl._("Externally reachable hostname or IP address")%>:
- /> + > <%=intl._("Use all auto-detect methods")%>
- /> + > <%=intl._("Disable UPnP IP address detection")%>
- /> + > <%=intl._("Ignore local interface IP address")%>
- /> + > <%=intl._("Use SSU IP address detection only")%>
- /> + > <%=intl._("Specify hostname or IP")%>: - " /> + " > <% String[] ips = nethelper.getAddresses(); if (ips.length > 0) { out.print(intl._("or") + " /> + > <%=intl._("Hidden mode - do not publish IP")%> <%=intl._("(prevents participating traffic)")%>

<%=intl._("Action when IP changes")%>:
- /> + > <%=intl._("Laptop mode - Change router identity and UDP port when IP changes for enhanced anonymity")%> (<%=intl._("Experimental")%>)

<%=intl._("UDP Configuration:")%>
<%=intl._("UDP port:")%> - " />
+ " >
<% /******** +*********/ %> diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index d015df0b31..727bb08467 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -27,12 +27,12 @@ <% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce"); if (prev != null) System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce", new java.util.Random().nextLong()+""); %> - " /> - + " > +

<%=intl._("Advanced I2P Configuration")%>


- " /> - " />
- <%=intl._("NOTE")%>: <%=intl._("Some changes may require a restart to take effect.")%> + " > + " > +
<%=intl._("NOTE")%>: <%=intl._("Some changes may require a restart to take effect.")%>
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index 038b2c778a..dc265ba1b5 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -29,7 +29,7 @@ <% String prev = System.getProperty("net.i2p.router.web.ConfigKeyringHandler.nonce"); if (prev != null) System.setProperty("net.i2p.router.web.ConfigKeyringHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigKeyringHandler.nonce", new java.util.Random().nextLong()+""); %> - " /> + " >

<%=intl._("Manual Keyring Addition")%>

<%=intl._("Enter keys for encrypted remote destinations here.")%> <%=intl._("Keys for local destinations must be entered on the")%> <%=intl._("I2PTunnel page")%>. @@ -40,8 +40,10 @@

- + - -
" > <%=intl._("KBps In")%> ()
" /> + " > <%=intl._("KBps Out")%> ()
<%=intl._("Encryption Key")%>:
" /> - " /> " />

+ 		+" > +" > +" > +

diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index c2f3a7ba5f..3de8d95bee 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -23,24 +23,24 @@ <% String prev = System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce"); if (prev != null) System.setProperty("net.i2p.router.web.ConfigLoggingHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigLoggingHandler.nonce", new java.util.Random().nextLong()+""); %> - " /> - + " > +

<%=intl._("Configure I2P Logging Options")%>

- - - - + @@ -48,6 +48,6 @@
<%=intl._("Logging filename")%>:" /> + " >
<%=intl._("(the symbol '@' will be replaced during log rotation)")%>
<%=intl._("Log record format")%>:" /> + " >
<%=intl._("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%>
<%=intl._("Log date format")%>:" /> + " >
<%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%>
<%=intl._("Max log file size")%>:" />
" >
<%=intl._("Default log level")%>:
<%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%>
- " /> - " /> + " > + " >
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index 1c1158407a..20db1726cb 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -69,14 +69,14 @@ function toggleAll(category) <% String prev = System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce"); if (prev != null) System.setProperty("net.i2p.router.web.ConfigStatsHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigStatsHandler.nonce", new java.util.Random().nextLong()+""); %> - - " /> + + " >

<%=intl._("Configure I2P Stat Collection")%>

<%=intl._("Enable full stats?")%> checked="true" <% } %>/> + if (statshelper.getIsFull()) { %>checked="true" <% } %> > (<%=intl._("change requires restart to take effect")%>)
- <%=intl._("Stat file")%>:
+ <%=intl._("Stat file")%>:
<%=intl._("Filter")%>: (<%=intl._("toggle all")%>)

@@ -96,17 +96,20 @@ function toggleAll(category) + if (statshelper.getCurrentIsLogged()) { %>checked="true" <% } %> > + if (statshelper.getCurrentIsGraphed()) { %>checked="true" <% } %> ><% } %><% } // end iterating over all stats %> - + - + +
checked="true" <% } %>/> <% if (statshelper.getCurrentCanBeGraphed()) { %> checked="true" <% } %>/><% } %> <%=statshelper.getCurrentStatName()%>:
<%=statshelper.getCurrentStatDescription()%>
<%=intl._("Advanced filter")%>: -
" />" />
+" > +" > +

diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp index 269f2186e0..d505b741a9 100644 --- a/apps/routerconsole/jsp/configtunnels.jsp +++ b/apps/routerconsole/jsp/configtunnels.jsp @@ -33,11 +33,14 @@ <% String prev = System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce"); if (prev != null) System.setProperty("net.i2p.router.web.ConfigTunnelsHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce", new java.util.Random().nextLong()+""); %> - " /> - + " > + <%=intl._("Note")%>: <%=intl._("Exploratory tunnel setting changes are stored in the router.config file.")%> <%=intl._("Client tunnel changes are temporary and are not saved.")%> <%=intl._("To make permanent client tunnel changes see the")%> <%=intl._("i2ptunnel page")%>. -
" /> " />
+
+" > +" > +

diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index 7484880ce7..19cd125fa5 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -42,6 +42,7 @@ <%=uihelper._("Please contribute to the router console translation project! Contact the developers on IRC #i2p to help.")%>
-" > " > +" > +" >
diff --git a/history.txt b/history.txt index b9c2c00bac..0729267675 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,10 @@ +2010-04-05 zzz + * Console: + - Add tooltip support for plugin links + - Make target=_blank for plugin links + - More HTML transitional fixes + - Standardize on 'save' to the right of 'cancel' + 2010-04-02 zzz * FloodfillPeerSelector: Adjust rankings again diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 4e28a2c8d2..c10128fe62 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 5; + public final static long BUILD = 6; /** for example "-test" */ public final static String EXTRA = "";