More theme spit 'n polish. Remove redundant themes from configui.jsp

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

@@ -4,7 +4,7 @@ public class ConfigUIHelper extends HelperBase {
     public ConfigUIHelper() {}
     
     public static final String PROP_THEME = "routerconsole.theme";
-    private static final String themes[] = {"default", "classic", "dark", "defCon1", "light"};
+    private static final String themes[] = {"classic", "dark", "light"};
 
     public String getSettings() {
         StringBuilder buf = new StringBuilder(512);

apps/routerconsole/jsp/configupdate.jsp

@@ -27,28 +27,28 @@
     if (prev != null) System.setProperty("net.i2p.router.web.ConfigUpdateHandler.noncePrev", prev);
     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")%>" />
-<table border="0" cellspacing="5"><tr><td valign="top"><b>News:</b><td>
+<table border="0" cellspacing="5"><tr><td><b>News:</b><td>
  <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %>
  <i>Update In Progress</i><br /><br />
  <% } else { %>
  <input type="submit" name="action" value="Check for update now" /><br /><br />
  <% } %>
 <tr><td><td>
-<tr><td valign="top"><b>News URL:</b>
+<tr><td><b>News URL:</b>
 <td><input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />">
-<tr><td valign="top"><b>Refresh frequency:</b>
+<tr><td><b>Refresh frequency:</b>
 <td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" />
-<tr><td valign="top"><b>Update policy:</b>
+<tr><td><b>Update policy:</b>
 <td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" />
-<tr><td valign="top"><b>Update through the eepProxy?</b>
+<tr><td><b>Update through the eepProxy?</b>
 <td><jsp:getProperty name="updatehelper" property="updateThroughProxy" />
-<tr><td valign="top"><b>eepProxy host:</b>
+<tr><td><b>eepProxy host:</b>
 <td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" />
-<tr><td valign="top"><b>eepProxy port:</b>
+<tr><td><b>eepProxy port:</b>
 <td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" />
-<tr><td valign="top"><b>Update URLs:</b>
+<tr><td><b>Update URLs:</b>
 <td><textarea name="updateURL" cols="90" rows="4" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea>
-<tr><td valign="top"><b>Trusted keys:</b>
+<tr><td><b>Trusted keys:</b>
 <td><textarea name="trustedKeys" cols="90" rows="4" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea>
 <tr><td><td>
 <tr><td><td><input type="submit" name="action" value="Save" /> <input type="reset" value="Cancel" />

installer/resources/themes/console/dark/console.css

@@ -151,10 +151,12 @@ div.news {
 }
 
 div.news li {
-     text-align: left;
-     list-style-type: square;
-     margin: 2px 20px 0px 30px;
-     padding: 10px 20px 1px 0px;
+     text-align: justify;
+     font-weight: bold;
+     list-style-image: url(images/info_dark.png);
+     margin: 0 10px 0 30px;
+     padding: 5px;
+     vertical-align: middle;
 }
 
 div.confignav {
@@ -201,6 +203,7 @@ div.messages li {
      margin: 0 0 0 30px !important;
      padding: 5px;
      border: 0px !important;
+     text-align: justify !important;
 }
 
 table {
@@ -382,6 +385,7 @@ button {
      font-weight: bold;
      margin: 2px 3px;
      text-align: center;
+     min-width: 76px;
 }
 
 button:hover{
@@ -390,6 +394,11 @@ button:hover{
      color: #ff6600;
 }
 
+button:active {
+     border: 1px inset #f60;
+     background-color: #f60;
+     color: #fff;
+}
 .underline {
      border-bottom: 1px solid #eeeeff;
      padding: 5px 0px 5px 0px;
@@ -440,8 +449,10 @@ input:hover {
      border: 1px solid #f60;
 }
 
-input:btn {
-     background-color: #f00 !important;
+input:active {
+     background-color: #002;
+     color: #fff;
+     border: 1px solid #f60;
 }
 
 select {

installer/resources/themes/console/dark/default.css

@@ -23,7 +23,7 @@ div {
 
 h4, label {
      margin: 0;
-     padding: 4px 2px 2px 0px;
+     padding: 4px;
      float: left;
      width: 150px;
 /*    height :  24px; */
@@ -41,6 +41,7 @@ h4 {
      border: 1px solid #99f;
      margin: 5px 0 15px 0;
      background: url(images/tabletitledark.png);
+     background-repeat: x;
      background-color: #002;
      text-transform: uppercase;
      text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.9);
@@ -162,12 +163,12 @@ hr {
 }
 
 .control {
-     margin: 0 0 0 4px;
+     margin: 0 2px 0 2px;
      padding: 0 0 2px 0;
      overflow: hidden;
      height: 20px;
-     width: 60px;
-     font-weight: normal;
+     min-width: 60px;
+     font-weight: bold;
      background-color: #bbbbff;
      color: black;
      border: 1px outset #ddddc0;
@@ -175,6 +176,8 @@ hr {
      white-space: nowrap;
      -moz-border-radius: 4px;
      margin-top: 8px;
+     background: url(images/tabletitlelight.png);
+     background-repeat: x;
 }
 
 .control:link {
@@ -185,6 +188,7 @@ hr {
      border: 1px solid #eeeeff;
      background-color: #003;
      color: #ff6600;
+     background: none;
 }
 
 .control:active {
@@ -254,7 +258,7 @@ hr {
 
 .header {
      -moz-border-radius: 4px 4px 4px 4px;
-     border: 1px solid #ff0000;
+     border: 0;
 }
 
 a:link{

installer/resources/themes/console/light/console.css

@@ -145,6 +145,15 @@ div.news {
      line-height: 140%;
 }
 
+div.news li {
+     text-align: justify;
+     font-weight: bold;
+     list-style-image: url(images/info.png);
+     margin: 0 10px 0 30px;
+     padding: 5px;
+     vertical-align: middle;
+}
+
 div.confignav {
      padding: 10px;
      margin: 0 0px 25px 0;
@@ -209,6 +218,10 @@ th {
      font-size: 8pt;
 }
 
+tr {
+     vertical-align: middle !important;
+}
+
 tr:nth-child ( even ) {
      background-image: url('images/tabletile.png');
      background-color: #99f;
@@ -355,8 +368,9 @@ button {
      -webkit-border-radius: 4px;
      font-size: 8pt;
      font-weight: bold;
-     margin: 2px 3px;
+     margin: 0 1px;
      text-align: center;
+     min-width: 80px;
 }
 
 button:hover{
@@ -404,6 +418,7 @@ input {
      border: 1px solid #001;
      padding: 0px 2px 1px 2px;
      text-decoration: none;
+     min-width: 110px;
 }
 
 input:hover {
@@ -426,9 +441,6 @@ submit {
      border: 1px solid #001;
      padding: 0px 2px 1px 2px;
      text-decoration: none;
-     border-radius: 4px;
-     -moz-border-radius: 4px;
-     -webkit-border-radius: 4px;
 }
 
 select {
@@ -437,11 +449,12 @@ select {
      margin: 5px 10px 5px 10px;
      font-family: "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana,  Tahoma, Helvetica, sans-serif;
      border: 1px solid #001;
+     min-width: 110px;
 }
 
 textarea {
      padding: 5px;
-     margin: 5px 0;
+     margin: 5px -20px;
      background-color: #eef;
      color: #003;
      border-radius: 4px;

installer/resources/themes/console/light/default.css

@@ -132,7 +132,7 @@ hr {
 .freetext {
      width: 150px;
      height: 22px;
-     border: 1px solid #9999ff;
+     border: 1px solid #003;
      padding: 2px;
      margin: 4px 0 2px 4px;
 }
@@ -143,7 +143,7 @@ hr {
      overflow: hidden;
      height: 22px;
      width: 60px;
-     font-weight: normal;
+     font-weight: bold;
      background-color: #bbbbff;
      color: black;
      border: 1px outset #ddddc0;