Fix for IE overflow issue; classic theme enhanced; more UI enhancements.

apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java

@@ -47,7 +47,7 @@ public class ConfigTunnelsHandler extends FormHandler {
         boolean saveRequired = false;
         
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Saving changes, with props = " + _settings);
+            _log.debug("Saving changes, with props = " + _settings + ".");
         
         int updated = 0;
         int index = 0;
@@ -67,7 +67,7 @@ public class ConfigTunnelsHandler extends FormHandler {
                 try {
                     client.fromBase64(poolName);
                 } catch (DataFormatException dfe) {
-                    addFormError("Internal error (pool name could not resolve - " + poolName + ")");
+                    addFormError("Internal error (pool name could not resolve - " + poolName + ").");
                     index++;
                     continue;
                 }
@@ -76,7 +76,7 @@ public class ConfigTunnelsHandler extends FormHandler {
             }
             
             if ( (in == null) || (out == null) ) {
-                addFormError("Internal error (pool settings cound not be found for " + poolName + ")");
+                addFormError("Internal error (pool settings cound not be found for " + poolName + ").");
                 index++;
                 continue;
             }
@@ -131,14 +131,14 @@ public class ConfigTunnelsHandler extends FormHandler {
         }
         
         if (updated > 0)
-            addFormNotice("Updated settings for " + updated + " pools");
+            addFormNotice("Updated settings for " + updated + " pools.");
         
         if (saveRequired) {
             boolean saved = _context.router().saveConfig();
             if (saved) 
-                addFormNotice("Exploratory tunnel configuration saved successfully");
+                addFormNotice("Exploratory tunnel configuration saved successfully.");
             else
-                addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs");
+                addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs.");
         }
     }
     private static final int getInt(Object val) { 

apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java

@@ -24,8 +24,8 @@ public class ConfigUIHandler extends FormHandler {
         else
             _context.router().setConfigSetting(CSSHelper.PROP_THEME_NAME, _config);
         if (_context.router().saveConfig()) 
-            addFormNotice("Theme change successfully saved (<a href=\"configui.jsp\">refresh page to view</a>)");
+            addFormNotice("Theme change successfully saved (<a href=\"configui.jsp\">refresh page</a> to view).");
         else
-            addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs");
+            addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs.");
     }
 }

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);

apps/routerconsole/jsp/config.jsp

@@ -30,6 +30,7 @@
  <b>I2P will work best if you configure your rates to match the speed of your internet connection.</b>
  </p>
 <p>
+   <div class="wideload">
     <table>
     <tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBps
     In <td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)<br />
@@ -49,7 +50,7 @@
 -->
     <tr><td><jsp:getProperty name="nethelper" property="sharePercentageBox" />
     Share <td>(<jsp:getProperty name="nethelper" property="shareRateBits" />)<br />
-    </table>
+  </table></div>
  </p><p>
  <% int share = nethelper.getShareBandwidth();
     if (share < 12) {

apps/routerconsole/jsp/configadvanced.jsp

@@ -16,12 +16,13 @@
 <div class="main" id="main">
 
  <%@include file="confignav.jsp" %>
- 
+
  <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="formhandler" property="allMessages" />
  <div class="configure">
+ <div class="wideload">
  <form action="configadvanced.jsp" method="POST">
  <% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigAdvancedHandler.noncePrev", prev);
@@ -38,5 +39,6 @@
  </form>
 </div>
 </div>
+</div>
 </body>
 </html>

apps/routerconsole/jsp/configclients.jsp

@@ -35,13 +35,13 @@ button span.hide{
  <h3>Client Configuration</h3>
  <p>
  The Java clients listed below are started by the router and run in the same JVM.
- </p><p>
+ </p><p> <div class="wideload">
  <jsp:getProperty name="clientshelper" property="form1" />
  </p><p>
  <i>All changes require restart to take effect. To change other client options, edit the clients.config file.</i>
  </p> <hr /><div class="formaction">
  <input type="submit" name="action" value="Save Client Configuration" />
-</div>
+</div></div>
  <h3>WebApp Configuration</h3>
  <p>
  The Java web applications listed below are started by the webConsole client and run in the same JVM as the router.
@@ -53,7 +53,7 @@ button span.hide{
  A web app may also be disabled by removing the .war file from the webapps directory;
  however the .war file and web app will reappear when you update your router to a newer version,
  so disabling the web app here is the preferred method.
- </p><p>
+ </p><p><div class="wideload">
  <jsp:getProperty name="clientshelper" property="form2" />
  </p>
  <p>
@@ -65,5 +65,6 @@ button span.hide{
  </form>
 </div>
 </div>
+</div>
 </body>
 </html>

apps/routerconsole/jsp/configkeyring.jsp

@@ -11,7 +11,7 @@
 <h1>I2P Keyring Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
-  
+
  <jsp:useBean class="net.i2p.router.web.ConfigKeyringHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
@@ -26,8 +26,9 @@
  <h3>Keyring</h3>
  The router keyring is used to decrypt encrypted leaseSets.
  The keyring may contain keys for local or remote encrypted destinations.
- <p><jsp:getProperty name="keyringhelper" property="summary" />
- </p>
+ <div class="wideload"><p> 
+ <jsp:getProperty name="keyringhelper" property="summary" />
+</p></div>
 
  <hr />
 
@@ -40,6 +41,7 @@
  Enter keys for encrypted remote destinations here.
  Keys for local destinations must be entered on the <a href="i2ptunnel/index.jsp">I2PTunnel page</a>.
  <p>
+  <div class="wideload"> 
       <table>
         <tr>
           <td class="mediumtags" align="right">Dest. name, hash, or full key:</td> 
@@ -54,7 +56,7 @@
       </table>
  </form>
 
-
+</div>
 </div>
 </div>
 </body>

apps/routerconsole/jsp/configlogging.jsp

@@ -13,7 +13,7 @@
 <h1>I2P Logging Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
- 
+
  <jsp:useBean class="net.i2p.router.web.ConfigLoggingHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="*" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
@@ -26,6 +26,7 @@
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce")%>" />
  <input type="hidden" name="action" value="blah" />
  <h3>Configure I2P Logging Options</h3>
+ <div class="wideload">
       <table border="0" cellspacing="5">
         <tr> 
           <td class="mediumtags" align="right"><b>Logging filename:</b> 
@@ -64,5 +65,6 @@
  </form>
 </div>
 </div>
+</div>
 </body>
 </html>

apps/routerconsole/jsp/configpeer.jsp

@@ -69,15 +69,15 @@
  <input type="submit" name="action" value="Adjust peer bonuses" /></div>
  </p>
  </form>
-
  <a name="shitlist"> </a>
  <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
  <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:getProperty name="profilesHelper" property="shitlistSummary" />
  <hr />
+ <div class="wideload">
  <jsp:getProperty name="peerhelper" property="blocklistSummary" />
 
-
+</div>
 </div>
 </div>
 </body>

apps/routerconsole/jsp/configstats.jsp

@@ -56,7 +56,7 @@ function toggleAll(category)
 <h1>I2P Stats Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
- 
+
  <jsp:useBean class="net.i2p.router.web.ConfigStatsHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:setProperty name="formhandler" property="*" />
@@ -78,6 +78,7 @@ function toggleAll(category)
  (change requires restart to take effect)<br />
  Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br />
  Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<hr />
+ <div class="wideload">
  <table>
  <% while (statshelper.hasMoreStats()) {
       while (statshelper.groupRequired()) { %>
@@ -105,5 +106,6 @@ function toggleAll(category)
  </table>
 </div>
 </div>
+</div>
 </body>
 </html>

apps/routerconsole/jsp/configtunnels.jsp

@@ -14,7 +14,6 @@
 <h1>I2P Tunnel Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
-  
  <jsp:useBean class="net.i2p.router.web.ConfigTunnelsHandler" id="formhandler" scope="request" />
  <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
  <jsp:setProperty name="formhandler" property="shouldsave" value="<%=request.getParameter("shouldsave")%>" />
@@ -31,7 +30,7 @@
  High CPU and/or high outbound bandwidth usage may result.
  Change these settings with care, and adjust them if you have problems.
  </i></p>
-
+ <div class="wideload"> 
  <form action="configtunnels.jsp" method="POST">
  <% String prev = System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce");
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigTunnelsHandler.noncePrev", prev);
@@ -46,5 +45,6 @@
  </form>
 </div>
 </div>
+</div>
 </body>
 </html>

apps/routerconsole/jsp/configupdate.jsp

@@ -28,7 +28,7 @@
     System.setProperty("net.i2p.router.web.ConfigUpdateHandler.nonce", new java.util.Random().nextLong()+""); %>
  <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce")%>" />
       <h3>Check for I2P and news updates</h3>
-      <table border="0" cellspacing="5">
+      <div class="wideload"><table border="0" cellspacing="5">
         <tr>
           <td colspan="2"></tr>
         <tr>
@@ -70,6 +70,7 @@
               <input type="reset" value="Cancel" />
             </div>
       </table>
+    </div>
  </form>
 </div>
 </div>

apps/routerconsole/jsp/css.jsp

@@ -18,3 +18,4 @@
 <jsp:useBean class="net.i2p.router.web.CSSHelper" id="cssHelper" scope="request" />
 <jsp:setProperty name="cssHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <link href="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css" /> 
+<!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->