From 3839d9873ad092b686122d0e893e9b3d35a89907 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Fri, 9 Oct 2009 00:45:33 +0000
Subject: [PATCH] Minor theme updates; lose whitespace in config.jsp; add
 license for SilkIcons.

---
 apps/routerconsole/jsp/config.jsp             |  8 +++----
 .../themes/console/classic/console.css        |  8 +++++--
 .../resources/themes/console/dark/console.css | 16 ++++++++++----
 licenses/LICENSE-SilkIcons.txt                | 22 +++++++++++++++++++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 5 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 licenses/LICENSE-SilkIcons.txt

diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index 7cd937511..d33bf38c9 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -48,7 +48,7 @@
     </tr><tr>
         <td><jsp:getProperty name="nethelper" property="sharePercentageBox" /> Share</td>
         <td>(<jsp:getProperty name="nethelper" property="shareRateBits" />)
-</td></tr></table></div></p><p>
+</td></tr></table></div></p>
  <% int share = nethelper.getShareBandwidth();
     if (share < 12) {
         out.print("<b>NOTE</b>: You have configured I2P to share only " + share + "KBps. ");
@@ -60,7 +60,7 @@
         out.print("The higher the share bandwidth the more you improve your anonymity and help the network.<hr>");
     }
  %>
-</p><div class="formaction">
+<div class="formaction">
 <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /></div>
  <!--
  <b>Enable load testing: </b>
@@ -171,7 +171,7 @@
 </ul><br>
  Reviewing the <a href="peers.jsp#upnp">UPnP status</a> may help.
  UPnP may be enabled or disabled above, but a change requires a router restart to take effect.
-</p><p>Hostnames entered above will be published in the network database.
+<p>Hostnames entered above will be published in the network database.
     They are <b>not private</b>.
     Also, <b>do not enter a private IP address</b> like 127.0.0.1 or 192.168.1.1.
     If you specify the wrong IP address or
@@ -233,7 +233,7 @@
 <li class="tidylist"><b>ERR - Client Manager I2CP Error - check logs</b> -
      This is usually due to a port 7654 conflict. Check the logs to verify. Do you have another I2P instance running?
      Stop the conflicting program and restart I2P.
- </ul></p><br>
+ </ul><hr>
       <!--
  <b>Dynamic Router Keys: </b>
  <input type="checkbox" class="optbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br>
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index f5b5a0325..e04eae955 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -259,13 +259,17 @@ div.main {
      -moz-box-shadow: inset 0px 0px 0px 1px #99f;
 }
 
+div.main ul {
+     margin: 0;
+}
+
 div.main li {
-     padding-bottom: 10px;
+     padding: 0 0 5px 0;
      list-style: square;
 }
 
 div.main li:first-child {
-     padding-top: 20px;
+     padding-top: 5px;
 }
 
 div.main textarea {
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index cf809d336..7f2a7f204 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -226,7 +226,7 @@ div.warning {
 /* console error messages */
 
 div.sorry {
-     margin: 5px 15px 10px 220px;
+     margin: 15px 15px 10px 220px;
      padding: 20px 20px 20px 75px;
      background: #005;
      border: 1px solid #99f;
@@ -310,7 +310,7 @@ div.confignav {
 }
 
 div.configure {
-     padding: 5px 15px 15px 15px;
+     padding: 5px 15px 0 15px;
      margin: 10px 0px;
      background: #005;
      -moz-border-radius: 4px;
@@ -357,7 +357,7 @@ div.messages li {
 }
 
 div.graphspanel {
-     padding: 15px;
+     padding: 10px 15px 0 15px;
      margin: 15px 0px;
      background: #005;
      -moz-border-radius: 4px;
@@ -373,7 +373,11 @@ div.graphspanel {
 
 div.graphspanel form {
      text-align: left;
-     padding: 15px;
+     padding: 0 15px 0px 15px;
+}
+
+div.graphspanel hr {
+     margin: 10px -15px 10px -15px;
 }
 
 div.graphspanel img {
@@ -824,6 +828,10 @@ form {}
      text-align: justify;
 }
 
+div.joblog form:first-child {
+     margin-top: 10px;
+}
+
 .smallhead {
      font-size: 7pt
 }
diff --git a/licenses/LICENSE-SilkIcons.txt b/licenses/LICENSE-SilkIcons.txt
new file mode 100644
index 000000000..400a64d78
--- /dev/null
+++ b/licenses/LICENSE-SilkIcons.txt
@@ -0,0 +1,22 @@
+Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com
\ No newline at end of file
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 1b7510860..47f19a478 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 = 23;
+    public final static long BUILD = 24;
     /** for example "-test" */
     public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;