diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index d19742e14..8dad41943 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -62,10 +62,9 @@ out.print("The higher the share bandwidth the more you improve your anonymity and help the network.
"); } %> -

-
-

- <% } %> -

-
+ +

Adjust Profile Bonuses

Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers. Fast peers are used for client tunnels, and High @@ -59,7 +60,8 @@ if (! "".equals(peer)) { // get existing bonus values? } - %> + %> +
Speed: Capacity: @@ -68,7 +70,6 @@

-
" /> diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index 8ca0087c7..942aedf0d 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -26,11 +26,11 @@

Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes. If you need to kill the router immediately, that option is available as well.

- +
-
+
<% if (System.getProperty("wrapper.version") != null) { %>

If you want the router to restart itself after shutting down, you can choose one of the following. This is useful in some situations - for example, if you changed @@ -38,30 +38,32 @@ or the interface it listens on. A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately. After tearing down the router, it will wait 1 minute before starting back up again.

- +
- <% } %> -
+ <% } %>
+ <% if ( (System.getProperty("os.name") != null) && (System.getProperty("os.name").startsWith("Win")) ) { %>

Systray integration

On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status (later on, I2P client applications will be able to integrate their own functionality into the system tray as well). If you are on windows, you can either enable or disable that icon here.

+
-
+

Run on startup

You can control whether I2P is run on startup or not by selecting one of the following options - I2P will install (or remove) a service accordingly. You can also run the install_i2p_service_winnt.bat (or uninstall_i2p_service_winnt.bat) from the command line, if you prefer.

+
-
+

Note: If you are running I2P as service right now, removing it will shut down your router immediately. You may want to consider shutting down gracefully, as - above, then running uninstall_i2p_service_winnt.bat.

+ above, then running uninstall_i2p_service_winnt.bat.

<% } %> <% if (System.getProperty("wrapper.version") != null) { %> @@ -69,17 +71,19 @@

At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to wrapper.log.

+
- <% } %>
+<% } %>

Launch browser on router startup?

I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser pointing at http://127.0.0.1:7657/index.jsp whenever the router starts up.

+
-
+
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index a1298d444..cf4bd8dc4 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -101,9 +101,7 @@ function toggleAll(category) Advanced filter: - - - + diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp index f7c4911ba..6782ea116 100644 --- a/apps/routerconsole/jsp/configtunnels.jsp +++ b/apps/routerconsole/jsp/configtunnels.jsp @@ -42,7 +42,7 @@ Note - Exploratory tunnel setting changes are stored in the router.config file.
Client tunnel changes are temporary and are not saved.
To make permanent client tunnel changes see the i2ptunnel page.
-
+
diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index 3835db33b..c8a28956a 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -34,9 +34,9 @@ " /> -
+
- +
<% } else { %> Theme selection disabled for Internet Explorer, sorry.
If you're not using IE, it's likely that your browser is pretending to be IE; please configure your browser (or proxy) to use a different User Agent string if you'd like to access the console themes. diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index a8cfa33cd..80cbbf04d 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -32,44 +32,40 @@ - News: + News: <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> Update In Progress
<% } else { %> <% } %>
- News URL: + News URL: "> - Refresh frequency: + Refresh frequency: - Update policy: + Update policy: - Update through the eepProxy? + Update through the eepProxy? - eepProxy host: + eepProxy host: " /> - eepProxy port: + eepProxy port: " /> - Update URLs: + Update URLs: - Trusted keys: + Trusted keys: - - -
- -
+
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index 60bc544de..8e0d75d60 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -536,6 +536,11 @@ input[type=text]:active, input[type=text]:hover { background: #001; } +fieldset { +overflow: hidden; +position: relative; +} + select { background: #002; color: #eef; @@ -636,6 +641,8 @@ form {} border: 0; margin: 5px 5px 5px 10px; padding: 2px; +overflow: hidden; +position: relative; } .optbox:hover { @@ -662,4 +669,8 @@ form {} border-bottom: 1px solid #99f !important; font-size: 7pt; line-height: 110%; +} + +.formaction { + text-align: right; } \ No newline at end of file diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index b8368bebf..d87217c98 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -716,4 +716,8 @@ form {} padding: 8px 2px !important; font-size: 7pt; line-height: 110%; +} + +.formaction { + text-align: right; } \ No newline at end of file diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java index 1ce5cb5e7..a166939b4 100644 --- a/router/java/src/net/i2p/router/Blocklist.java +++ b/router/java/src/net/i2p/router/Blocklist.java @@ -767,10 +767,10 @@ public class Blocklist { out.write(""); } if (_blocklistSize > 0) { - out.write(""); + out.write("
IPs from Blocklist File
FromTo
"); for (int i = 0; i < _blocklistSize; i++) { int from = getFrom(_blocklist[i]); - out.write("\n"); @@ -779,7 +779,7 @@ public class Blocklist { } out.write("
IPs from Blocklist File
From:To:
"); out.write(toStr(from)); out.write(""); + out.write("
"); out.write(toStr(from)); out.write(""); int to = getTo(_blocklist[i]); if (to != from) { out.write(toStr(to)); out.write("
"); } else { - out.write("
No blocklist file entries"); + out.write("
No blocklist file entries."); } out.flush(); } diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 326d2e110..e74d70743 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,9 +18,9 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 02; + public final static long BUILD = 03; /** for example "-test" */ - public final static String EXTRA = "-zed"; + public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION);