diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java index 5fc3679e0c..285cdd3854 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java @@ -55,7 +55,7 @@ public class ConfigClientsHandler extends FormHandler { else startWebApp(app); } else { - addFormError("Unsupported " + _action); + addFormError("Unsupported " + _action + "."); } } @@ -70,18 +70,18 @@ public class ConfigClientsHandler extends FormHandler { ca.disabled = val == null; } ClientAppConfig.writeClientAppConfig(_context, clients); - addFormNotice("Client configuration saved successfully - restart required to take effect"); + addFormNotice("Client configuration saved successfully - restart required to take effect."); } private void startClient(int i) { List clients = ClientAppConfig.getClientApps(_context); if (i >= clients.size()) { - addFormError("Bad client index"); + addFormError("Bad client index."); return; } ClientAppConfig ca = (ClientAppConfig) clients.get(i); LoadClientAppsJob.runClient(ca.className, ca.clientName, LoadClientAppsJob.parseArgs(ca.args), _log); - addFormNotice("Client " + ca.clientName + " started"); + addFormNotice("Client " + ca.clientName + " started."); } private void saveWebAppChanges() { @@ -98,7 +98,7 @@ public class ConfigClientsHandler extends FormHandler { props.setProperty(name, "" + (val != null)); } RouterConsoleRunner.storeWebAppProperties(props); - addFormNotice("WebApp configuration saved successfully - restart required to take effect"); + addFormNotice("WebApp configuration saved successfully - restart required to take effect."); } // Big hack for the moment, not using properties for directory and port @@ -116,14 +116,14 @@ public class ConfigClientsHandler extends FormHandler { path = new File(path, app + ".war"); s.addWebApplication("/"+ app, path.getAbsolutePath()).start(); // no passwords... initialize(wac); - addFormNotice("WebApp " + app + " started"); + addFormNotice("WebApp " + app + " started."); } catch (Exception ioe) { - addFormError("Failed to start " + app + " " + ioe); + addFormError("Failed to start " + app + " " + ioe + "."); } return; } } } - addFormError("Failed to find server"); + addFormError("Failed to find server."); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java index 3cdcbfa19e..47b301d28e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java @@ -15,7 +15,7 @@ public class ConfigClientsHelper extends HelperBase { public String getForm1() { StringBuilder buf = new StringBuilder(1024); buf.append("\n"); - buf.append("\n"); + buf.append("\n"); List clients = ClientAppConfig.getClientApps(_context); for (int cur = 0; cur < clients.size(); cur++) { @@ -31,7 +31,7 @@ public class ConfigClientsHelper extends HelperBase { public String getForm2() { StringBuilder buf = new StringBuilder(1024); buf.append("
ClientRun at Startup?Start NowClass and arguments
ClientRun at Startup?Start NowClass and arguments
\n"); - buf.append("\n"); + buf.append("\n"); Properties props = RouterConsoleRunner.webAppProperties(); Set keys = new TreeSet(props.keySet()); for (Iterator iter = keys.iterator(); iter.hasNext(); ) { @@ -47,7 +47,7 @@ public class ConfigClientsHelper extends HelperBase { } private void renderForm(StringBuilder buf, String index, String name, boolean urlify, boolean enabled, boolean ro, String desc) { - buf.append("\n"); + buf.append("\n"); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java index 11830975ba..74f2594856 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java @@ -3,7 +3,7 @@ package net.i2p.router.web; public class ConfigUIHelper extends HelperBase { public ConfigUIHelper() {} - private static final String themes[] = {"classic", "dark", "light"}; + private static final String themes[] = {"Classic", "Dark", "Light"}; public String getSettings() { StringBuilder buf = new StringBuilder(512); diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index 2c2394e769..9363ba04bf 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -42,16 +42,15 @@

WebAppRun at Startup?Start NowDescription
WebAppRun at Startup?Start NowDescription
"); + buf.append("
"); if (urlify && enabled) { String link = "/"; if (! RouterConsoleRunner.ROUTERCONSOLE.equals(name)) @@ -56,16 +56,16 @@ public class ConfigClientsHelper extends HelperBase { } else { buf.append(name); } - buf.append(" "); + buf.append("/>"); if (!enabled) { buf.append(""); } - buf.append(" ").append(desc).append("
").append(desc).append("
- + - +
Dest. name, hash, or full key: - + Dest. name, hash, or full key:
Session Key: - + Session Key:
-
- -
+
+
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index 8d655b8e9b..a854b07505 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -28,32 +28,32 @@

Configure I2P Logging Options

- - - - - - -
Logging filename: + Logging filename: " />
(the symbol '@' will be replaced during log rotation)
Log record format: + Log record format: " />
(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)
Log date format: + Log date format: " />
('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)
Max log file size: + Max log file size: " />
Default log level: + Default log level:
(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)
Log level overrides: + Log level overrides:

+

diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index 8264a95389..a4d22c6c8d 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -37,7 +37,7 @@

Manual Peer Controls

- Router Hash: +
Router Hash:

Manually Shitlist / Unshitlist a Router

Shitlisting will prevent the participation of this peer in tunnels you create. @@ -62,9 +62,9 @@ } %>
- Speed: +
Speed:
- Capacity: +
Capacity:

diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e74d70743c..79a99b76c1 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 = 03; + public final static long BUILD = 04; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;