From 44069645df0fcd4d64a17847cacf8ec19c909f96 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Mon, 19 Oct 2009 12:34:19 +0000
Subject: [PATCH] New formatting for news.xml;  elliptical UI enhancements.

---
 apps/routerconsole/jsp/help.jsp               | 10 ++---
 .../themes/console/classic/console.css        | 17 ++++++-
 .../resources/themes/console/dark/console.css | 15 ++++++-
 .../themes/console/light/console.css          | 45 +++++++++++++++----
 news.xml                                      | 13 ++++--
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 6 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index ac945604a..734b38c3d 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -11,11 +11,11 @@
 If you'd like to help improve or translate the documentation, or
 help with other aspects of the project, please see the documentation for
 <a href="http://www.i2p2.i2p/getinvolved.html">volunteers.</a>
-<br><br>Further assistance is available here:</p>
+</p><p>Further assistance is available here:
 <ul class="links">
 <li class="tidylist"><a href="http://www.i2p2.i2p/faq.html">FAQ on www.i2p2.i2p</a>
 <li class="tidylist"><a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.</ul>
-<p>You may also try the <a href="http://forum.i2p/">I2P forum</a>
+</p><p>You may also try the <a href="http://forum.i2p/">I2P forum</a>
 or IRC.</p>
 
 <h2>Summary Bar Information</h2><p>
@@ -75,7 +75,7 @@ The local applications connecting through your router.
 These may be clients started through <a href="i2ptunnel/index.jsp">I2PTunnel</a>
 or external programs connecting through SAM, BOB, or directly to I2CP.
 </div><h3>Tunnels in/out</h3><div align="justify">
-The actual tunnels are shown on the <a href="tunnels.jsp">the tunnels page</a>.</div><br><ul>
+The actual tunnels are shown on the <a href="tunnels.jsp">the tunnels page</a>.</div><ul>
 <li class="tidylist"><div align="justify"><b>Exploratory:</b>
 Tunnels built by your router and used for communication with the floodfill peers,
 building new tunnels, and testing existing tunnels.</div>
@@ -91,7 +91,7 @@ You may also limit the total number by setting <tt>router.maxParticipatingTunnel
 the <a href="configadvanced.jsp">advanced configuration page</a>. <a href="configstats.jsp#tunnel.participatingTunnels">[Enable graphing]</a>.</ul>
 
 <h3>Congestion</h3><div align="justify">
-Some basic indications of router overload:</div><br><ul>
+Some basic indications of router overload:</div><ul>
 <li class="tidylist"><b>Job lag:</b>
 How long jobs are waiting before execution. The job queue is listed on the <a href="jobs.jsp">jobs page</a>.
 Unfortunately, there are several other job queues in the router that may be congested,
@@ -165,7 +165,7 @@ details on other applications available, as well as their licenses, please see t
 client applications can be found on our <a href="http://www.i2p2.i2p/download">download page</a>.
 .</p>
 
-<h2>Release history</h2><br>
+<h2>Release history</h2>
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
  <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
  <jsp:setProperty name="contenthelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 55c77d869..8d09caa40 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -296,6 +296,7 @@ div.main hr:last-child {
 div.main textarea {
      width: 98% !important; 
      margin: 2px 0 2px 5px;
+     min-height: 96px;
 }
 
 div.main h2 {
@@ -349,7 +350,7 @@ div.news {
 div.news li {
      text-align: justify;
      list-style: none;
-     margin: -15px 15px -25px -20px;
+     margin: 15px 15px -10px -20px;
      padding: 0px 0 15px 0;
      border-bottom: 2px dotted #cc7;
      border-top: 0px solid #cc7;     
@@ -361,6 +362,20 @@ div.news li {
 div.news p {
      color: #330;
      font-size: 9pt;
+     margin-bottom: -10px;
+}
+/*
+div.news p:first-child {
+     padding-top: 15px !important;
+}
+
+ 
+div.news p:nth-child(2n) {
+     padding-top: 15px !important;
+}
+*/
+div.news p:last-child {
+     margin-bottom: 10px;
 }
 
 div.news a:link {
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index e415b56d8..c99c87dcc 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -318,6 +318,7 @@ div.news h4 {
      margin: 5px 0 10px 0;
      font-size: 10pt;
      opacity: 0.8;
+     text-transform: capitalize;
 }
 
 div.news p {
@@ -523,6 +524,14 @@ div.main li {
      text-align: justify !important;
 }
 
+.tidylist:first-child {
+     padding-top: 5px;
+}
+
+.tidylist:last-child {
+     padding-bottom: 5px;
+}
+
 ol {
      display: inline;
      margin: 1px 0 0 0;
@@ -530,7 +539,7 @@ ol {
 }
 
 ul {
-     display: inline;
+/*     display: inline; */
      margin: 0;
      padding: 0;
 }
@@ -564,6 +573,8 @@ a:hover{
 .links {
      padding-bottom: -2px;
      text-align: justify;
+     margin-top: 10px;
+     margin-bottom: -10px;
 }
 
 .links li {
@@ -633,7 +644,7 @@ h3 {
      border: 1px solid #99f;
      border-left: 5px solid #99f;
      padding: 3px 5px 3px 5px;
-     margin: 12px 0 12px 0;
+     margin: 12px 0 10px 0;
      border-radius: 0 4px 4px 0;
      -moz-border-radius: 0 4px 4px 0;
      -khtml-border-radius: 0 4px 4px 0;
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index f5df72dac..97100f3fe 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -288,18 +288,24 @@ div.main textarea {
 
 div.news {
      margin: 0px 15px 10px 220px;
-     padding: 10px 25px 15px 25px;
+     padding: 10px 25px 7px 25px;
      border: 1px solid #003;
      color: #410;
      border-radius: 4px;
      -moz-border-radius: 4px;
      -khtml-border-radius: 4px;
-     text-align: justify !important;
+     text-align: right !important;
+     font-size: 7pt;
      line-height: 140%;
      background: #fea url('images/sandtile.png');
      -moz-box-shadow: inset 0px 0px 1px 0px #410;
 }
 
+div.news p {
+     font-size: 8.5pt;
+     text-align: justify !important;
+}
+
 div.news a:link{
      color: #630;
      text-decoration: none;
@@ -323,13 +329,13 @@ div.news hr{
      background: #410;
      height: 1px;
      border: 0px solid #410;
-     margin: 10px 0;
+     margin: 10px 0 5px;
 }
 
 div.news li {
      text-align: justify;
      list-style: none;
-     margin: 0 0 20px 0 !important;
+     margin: 10px 0 20px 0 !important;
      padding: 5px 0;
      vertical-align: bottom;
      border: 1px solid #410;
@@ -340,7 +346,7 @@ div.news li {
      -khtml-border-radius: 0 4px 4px 0;
      background: #fb1;
      font-size: 10pt;
-     opacity: 0.8;
+     opacity: 0.7;
 }
 
 div.news h4 {
@@ -528,10 +534,21 @@ div.main li {
      word-wrap: break-word;
 }
 
+div.main li:first-child {
+     margin-top: 10px;
+}
 .tidylist {
      text-align: justify !important;
 }
 
+.tidylist li:first-child {
+     margin-top: -10px !important;
+}
+
+.tidylist:last-child {
+     padding-bottom: 5px;
+}
+
 ol {
 
      margin: 1px 0 0 5px;
@@ -540,7 +557,7 @@ ol {
 
 ul {
      display: inline;
-     margin: 5px 0;
+     margin: 0;
      padding: 0;
 }
 
@@ -574,12 +591,24 @@ a:active{
      font-weight: bold;
 }
 
-.links {
-     list-style: url(images/link.png);
+.links li {
+     list-style: url(../images/link.png) !important;
      padding-bottom: -2px;
      text-align: justify;
 }
 
+.links li:first-child {
+     padding-top: 0 !important;
+}
+
+.links li:last-child {
+     padding-bottom: -15px !important;
+}
+
+.links ul {
+     margin-top: -5px !important;
+}
+
 p {
      text-align: justify;
      line-height: 160%;
diff --git a/news.xml b/news.xml
index 7f0fd04f3..4dd4db902 100644
--- a/news.xml
+++ b/news.xml
@@ -9,14 +9,21 @@
             publicurl="http://dev.i2p.net/pipermail/i2p/2005-July/000826.html"
             anonlogs="http://i2p/Nf3ab-ZFkmI-LyMt7GjgT-jfvZ3zKDl0L96pmGQXF1B82W2Bfjf0n7~288vafocjFLnQnVcmZd~-p0-Oolfo9aW2Rm-AhyqxnxyLlPBqGxsJBXjPhm1JBT4Ia8FB-VXt0BuY0fMKdAfWwN61-tj4zIcQWRxv3DFquwEf035K~Ra4SWOqiuJgTRJu7~o~DzHVljVgWIzwf8Z84cz0X33pv-mdG~~y0Bsc2qJVnYwjjR178YMcRSmNE0FVMcs6f17c6zqhMw-11qjKpY~EJfHYCx4lBWF37CD0obbWqTNUIbL~78vxqZRT3dgAgnLixog9nqTO-0Rh~NpVUZnoUi7fNR~awW5U3Cf7rU7nNEKKobLue78hjvRcWn7upHUF45QqTDuaM3yZa7OsjbcH-I909DOub2Q0Dno6vIwuA7yrysccN1sbnkwZbKlf4T6~iDdhaSLJd97QCyPOlbyUfYy9QLNExlRqKgNVJcMJRrIual~Lb1CLbnzt0uvobM57UpqSAAAA/meeting141"
             publiclogs="http://www.i2p.net/meeting141" />
+
+<h4><ul><li>2009-10-18: Website &amp; Console Translation - Help Needed!</li></ul></h4>
+
 <p>
+Shortly after the release of <a href="http://www.i2p2.i2p/release-0.7.7.html">I2P version 0.7.7</a>, we are happy to announce the first stage of the <a href="http://i2p2.i2p/index_zh.html">Chinese translation</a> of the <a href="http://www.i2p2.i2p">website</a>, thanks to our new Chinese translator, "walking". This we hope is the start of a bigger trend to get the website and console translated into YOUR language. Please visit the #i2p chat channel on <a href="irc://irc.freenode.net/i2p"> Freenode IRC</a> or anonymously over I2P via <a href="irc://127.0.0.1:6668/i2p">localhost:6668</a> if you wish to help. We appeal at this time especially to French and Spanish translators, since we seem to have plenty of you running I2P!</p>
+
 <h4><ul><li>2009-10-12: <b>0.7.7 <a href="http://www.i2p2.i2p/release-0.7.7.html">Released</a></b></li></ul></h4>
-</p><p>
+<p>
 I2P version 0.7.7 contains several anonymity improvements.
 The use of session keys for crypto was completely reworked,
-and I2PSnark now uses its own tunnels for tracker communication.
+and <a href="/i2psnark">I2PSnark</a> now uses its own tunnels for tracker communication.
 Work continues on improving the router console,
-including conformance to HTML standards and better support of UTF-8.
+including conformance to HTML standards, better support of UTF-8, and dr|z3d's ongoing
+<a href="/configui.jsp">console theme</a> wizardry, including an extensively 
+reworked "classic" theme optimized for less capable computers or browsers.
 </p><p>
 Work also continues on increasing speeds, both by reducing the
 number of session keys transferred, by improving the
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index bd644cee5..ef84e9e97 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 = 2;
+    public final static long BUILD = 3;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;