From 9f84d13542c6d4db1a6fc85cecd6aa8dce3bdf08 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Wed, 15 Jul 2009 01:59:41 +0000
Subject: [PATCH] Formatting tweaks to help.jsp & theme mods.

---
 apps/routerconsole/jsp/help.jsp               |  9 ++--
 .../resources/themes/console/dark/console.css | 18 +++-----
 .../themes/console/light/console.css          | 45 ++++++++++---------
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index 3ec657382..93aa34cb8 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -89,7 +89,7 @@ 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>
+The actual tunnels are shown on the <a href="tunnels.jsp">the tunnels page</a>.</div><br>
 <ul>
 <li class="tidylist"><b>Exploratory:</b><div align="justify">
 Tunnels built by your router and used for communication with the floodfill peers,
@@ -107,7 +107,7 @@ the <a href="configadvanced.jsp">advanced configuration page</a>. <a href="confi
 </ul>
 
 <h3>Congestion</h3>
-Some basic indications of router overload:
+Some basic indications of router overload:<br>
 <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>.
@@ -188,12 +188,11 @@ client applications can be found on our <a href="http://www.i2p2.i2p/download">d
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
  <% File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "history.txt"); %>
  <jsp:setProperty name="contenthelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
- <jsp:setProperty name="contenthelper" property="maxLines" value="500" />
+ <jsp:setProperty name="contenthelper" property="maxLines" value="256" />
  <jsp:setProperty name="contenthelper" property="startAtBeginning" value="true" />
  <jsp:getProperty name="contenthelper" property="textContent" />
  
- <p>
- A more complete list of changes can be found 
+ <p>A more complete list of changes can be found 
  in the history.txt file in your i2p directory.
  </p><hr />
 </div>
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index f23b9f789..8d9abaab6 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -269,7 +269,7 @@ div.main li:nth-child ( even ){
 }
 
 ol {
-     white-space: pre-wrap;
+/*     white-space: pre-wrap; screwy layout removals. */
      display: inline;
      margin: 1px 0 0 0;
      padding: 1px 0 0 20px;
@@ -324,7 +324,7 @@ h1 {
      font-style: normal;
      text-transform: uppercase;
      letter-spacing: 0.15em;
-     text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.9);
+     text-shadow: 0px 0px 3px rgba(255, 255, 255, 0.8);
      white-space: normal;
      background-color: #004;
      -moz-box-shadow: inset 0px 0px 16px 0px #009;
@@ -340,13 +340,10 @@ h1 {
 h2 {
      font-size: 12pt;
      color: #fff;
-     text-shadow: 0px 0px 1px rgba(0, 0, 128, 0.9);
+     text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.5);
      letter-spacing: 0.05em;
      background-color: #003;
-     background-image: url('images/tabletile.png');
-     border-bottom-width: 1px;
-     border-bottom-style: solid;
-     border-bottom-color: #99f;
+     background-image: url('images/darkbluebg.png');
      padding: 5px 10px 8px 10px;
      wordwrap: none;
      border: 1px solid #99f;
@@ -354,6 +351,7 @@ h2 {
      -moz-border-radius: 4px;
      -webkit-border-radius: 4px;
      vertical-align: middle;
+     margin: 25px 0 20px 0 !important;
 }
 
 h2 a:link {
@@ -367,17 +365,13 @@ h2 a:visited {
 h2 a:hover {
      color: #ff6600;
      text-shadow: 0px 0px 1px rgba(255, 255, 72, 0.9);
-     border-bottom-width: 1px;
-     border-bottom-style: solid;
-     border-bottom-color: #99f;
-     padding-bottom: 5px;
 }
 
 h3 {
      border-bottom-width: 1px;
      border-bottom-style: solid;
      border-bottom-color: #99f;
-     padding-bottom: 5px;
+     padding: 5px 0;
 }
   
 button {
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 7e18f9dea..d50a3cfcb 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -152,7 +152,7 @@ div.news li {
      text-align: justify;
      font-weight: bold;
      list-style-image: url(images/info.png);
-     margin: 0 10px 0 25px;
+     margin: 0 10px 0 25px !important;
      padding: 5px 0;
      vertical-align: bottom;
 }
@@ -197,8 +197,8 @@ div.messages li {
      text-align: justify;
      font-weight: bold;
      list-style-image: url(images/warning.png);
-     margin: 0 10px 0 30px;
-     padding: 5px;
+/*     margin: 0 10px 0 20px;
+     padding: 5px;*/
 }
 
 table {
@@ -254,8 +254,8 @@ tt {
 div.main li {
      text-align: left;
      list-style-type: square;
-     margin: 2px 5px 0px 30px;
-     padding: 1px 20px 1px 0px;
+     margin: 2px 5px 0px 5px;
+     padding: 1px 20px 1px 10px;
      line-height: 150%;
 }
 
@@ -264,15 +264,17 @@ div.main li {
 }
 
 ol {
+/* 
      white-space: pre-wrap;
+* 
      display: inline;
-     margin: 2px 0 0 0;
-     padding: 10px 0 0 20px;
+     margin: 1px 0 0 0;
+     padding: 1px 0 0 20px;
 }
 
 ul {
-     display: inline;
-     margin: 0;
+/*     display: inline; */
+     margin: 5px 0;
      padding: 0;
 }
 
@@ -300,8 +302,8 @@ a:active{
 
 .links {
      list-style-image: url(images/link.png);
-     margin: 0 5px 0 0px;
-     padding: 0px 5px;
+     margin: 10px 5px 0 0px;
+     padding: 10px 20px 10px 30px;
 }
 
 p {
@@ -332,21 +334,19 @@ h1 {
 }
 
 h2 {
-     font-family: "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana,  Tahoma, Helvetica, sans-serif;
+     font-size: 12pt;
      color: #000011;
      letter-spacing: 0.05em;
      background-color: #ddf;
      background-image: url('images/tabletile.png');
-     text-shadow: 0px 0px 1px rgba(0, 0, 128, 0.9);
-     border-bottom-width: 1px;
-     border-bottom-style: solid;
-     border-bottom-color: #000022;
-     padding: 7px 10px 7px 10px;
+     text-shadow: 0px 0px 2px rgba(0, 0, 64, 0.5);
+     padding: 7px 10px;
      wordwrap: none;
      border: 1px solid #002;
      border-radius: 4px;
      -moz-border-radius: 4px;
      -webkit-border-radius: 4px;
+     margin: 25px 0 20px 0 !important;
 }
 
 h2 a:hover {
@@ -359,10 +359,13 @@ h2 a:hover {
 }
 
 h3 {
-     border-bottom-width: 1px;
-     border-bottom-style: solid;
-     border-bottom-color: #000022;
-     padding-bottom: 5px;
+     border: 1px solid #002;
+     padding: 3px 4px 3px 4px	;
+     margin: 20px 0 15px 0;
+     border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+     -webkit-border-radius: 0 4px 4px 0;
+     background-color: #eef;
 }
 
 button {