From 460c8a319f232ed3166c1a2a0796f730862c81ad Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Mon, 3 Aug 2009 13:24:55 +0000
Subject: [PATCH] Extensive overhaul of the classic theme; css hacks for IE!

---
 history.txt                                   |   5 +-
 .../themes/console/classic/console.css        | 106 ++++++++++--------
 .../themes/console/classic/ieshim.css         |  72 +++++++++++-
 .../src/net/i2p/router/RouterVersion.java     |   2 +-
 4 files changed, 138 insertions(+), 47 deletions(-)

diff --git a/history.txt b/history.txt
index 2fd710c64..890f0cd80 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-2009-08-02
+2009-08-03 dr|z3d
+    * Extensive update to the Classic theme; custom css hacks for IE.
+
+2009-08-02 dr|z3d
     * Better support for Internet Explorer/classic theme.
     * Incremental improvements to classic theme.
     * More UI tweaks and fiddles. 
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 80c00304f..0ebbbccab 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -1,5 +1,7 @@
+/* Optimised for less capable browers and system specifications */
+
 body {
-     margin: 15px 0;
+     margin: 0;
      padding: 0;
      text-align: left;
      background: #FFF;
@@ -7,7 +9,7 @@ body {
 /*
      font: 10pt/140% Verdana, Tahoma, Helvetica, sans-serif;
 */
-     font: 10pt/140% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
+     font: 9pt/140% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
 }
 
 .hide {
@@ -49,23 +51,23 @@ div.routersummaryouter {
 }
 
 div.routersummary {
-     background: #fafaff;
-     width: 180px;
+     background: #ddf;
+     width: 190px;
      color: inherit;
      margin: 0;
-     padding: 5px 0 0 10px;
+     padding: 7px 0 0 0px;
      text-align: left !important;
-     border: 5px solid #efefff;
+     border: 5px solid #bbf;
      font-size: 9pt;
      word-wrap: break-word;
      font: 9pt/125%;
 }
 
 div.routersummary hr {
-     color: #ccf;
-     background: #ccf;
-     height: 2px;
-     border: 0px solid #ccf;
+     color: #bbf;
+     background: #bbf;
+     height: 5px;
+     border: 0px solid #bbf;
      margin: 4px 0;
 }
 
@@ -86,12 +88,14 @@ div.warning {
 }
 
 div.main {
-     margin: 0 20px 10px 205px;
+     margin: 0px 0px 10px 195px;
      padding: 5px 15px 15px 15px;
-     background: #ffffef;
-     border: 5px solid #ffffd0;
+     background: #eef;
+     border: 5px solid #bbf;
+     border-top: 0;
      text-align: left;
-     color: inherit;
+     color: #001;
+     min-width: 570px;
 }
 
 
@@ -101,12 +105,13 @@ div.main textarea {
 }
 
 div.news {
-     margin: 0 20px 0 205px;
-     padding: -10px 15px 5px 15px;
+     margin: -5px 0px 0 195px;
+     padding: -10px 15px 15px 15px;
      background: #ffffc0;
-     border: 5px solid #ffffa0;
+     border: 5px solid #bbf;
      text-align: justify;
      color: inherit;
+     min-width: 600px;
 }
 
 div.news li {
@@ -128,21 +133,26 @@ div.news a:link {
 div.confignav {
      padding: 12px 0 15px 0;
      background: #cfc;
-     margin: -10px -20px 0 -10px;
-     border: 5px solid #9f9;
+     margin: -10px -20px 0 -23px;
+     border: 5px solid #bbf;
 }
 
 div.configure {
-     margin: 0 -20px 0 -10px;
-     padding: 10px 20px 5px 20px;
-     background: #ffffc0;
+     margin: 0 -20px 0 -20px;
+     padding: 0px 20px 0px 20px;
+/*     background: #eeffee;*/
 }
 
 div.messages {
      padding: 10px;
      background: #fafaff;
      border: 5px solid #fdd;
-     margin: 0px -20px 0px -10px;
+     border-right: 0;
+     margin: 0px -15px 0px -20px;
+     text-align: center;
+     font-size: 9pt;
+     font-weight: bold;
+     color: #444455;
 }
 
 div.messages span.error {
@@ -156,29 +166,29 @@ div.messages span.notice {
 h1 {
      font-size: 18pt;
      text-align: center;
-     border: 5px solid #efefff;
-     border-bottom: 5px solid #efefff;
-     padding: 10px;
-     margin: 0 20px 0 205px;
+     border: 5px solid #bbf;
+     padding: 13px 10px 12px 10px;
+     margin: 0 0px 0 175px;
      line-height: 93%;
      text-transform: uppercase;
      letter-spacing: 0.3em;
      background: #fff;
+     min-width: 600px;
 }
 
 h2 {
      font-size: 14pt;
      padding: 10px;
-     border-bottom: 2px solid #001;
-     border-top: 2px solid #001;
+     border-bottom: 2px solid #003;
+     border-top: 0px solid #003;
      letter-spacing: 0.04em;
 }
 
 h3 {
      font-size: 12pt;
-     padding: 10px;
-     border-bottom: 2px solid #001;
-     border-top: 2px solid #001;
+     padding: 0 10px 10px 10px;
+     border-bottom: 5px solid #bbf;
+     border-top: 0px solid #bbf;
      letter-spacing: 0.04em;
 }
 
@@ -188,8 +198,8 @@ h3 {
 }
 
 table {
-/*     border-collapse: collapse; */
-     border: 5px solid #dfd;
+     border-collapse: collapse; 
+     border: 5px solid #bbf;
      margin: 5px 0px;
      cell-padding: 1px;
      font-size: 7pt;
@@ -197,10 +207,15 @@ table {
      width: 100%;
 }
 
+table hr {
+     display: none
+}
+
 th {
-     background-color: #ccf;
+     background-color: #def;
      padding: 5px 2px;
      text-align: center;
+     border-bottom: 1px solid #88f;
 }
 
 tt {
@@ -208,7 +223,7 @@ tt {
 }
 
 td {
-     padding: 2px;
+     padding: 4px;
 }
 
 tr:nth-child(even) {
@@ -220,10 +235,10 @@ tr:nth-child(odd) {
 }
 
 hr {
-     color: #dd9;
-     background: #dd9;
-     height: 2px;
-     border: 0px solid #dd5;
+     color: #bbf;
+     background: #bbf;
+     height: 5px;
+     border: 0px solid #bbf;
      margin: 5px 0;
 }
 
@@ -242,11 +257,12 @@ input {
 }
 
 select {
-     margin: 3px 5px 3px 0;
+     margin: 3px 5px 3px 5px;
      vertical-align: middle;
 }
 
 submit {
+     margin: 3px 5px 3px 5px;
      padding 0 2px;
 }
 
@@ -310,16 +326,18 @@ tt {
 }
 
 .tablefooter {
-     border: 1px solid #f00;
+     border: 1px solid #88f;
 }
 
 .tablefooter tr, .tablefooter td {
-     background: #aaf;
+     background: #bbf;
      font-size: 8pt;
      font-weight: bold;
      line-height: 150%;
+     word-wrap: nowrap;
+     padding: 8px 1px;
 }
 
 .tidylist {
      text-align: justify;
-}
\ No newline at end of file
+}
diff --git a/installer/resources/themes/console/classic/ieshim.css b/installer/resources/themes/console/classic/ieshim.css
index 0e47dae15..79b903861 100644
--- a/installer/resources/themes/console/classic/ieshim.css
+++ b/installer/resources/themes/console/classic/ieshim.css
@@ -3,4 +3,74 @@
 .wideload {
      overflow: auto;
      width: 100%;
-}
\ No newline at end of file
+}
+
+.formaction {
+     text-align: left !important;
+}
+div.configure textarea {
+     width: 450px !important;
+}
+
+h1 {
+     padding: 15px 10px 16px 10px !important;
+     border-right: 0;
+}
+
+div.confignav {
+     padding: 15px 0 15px 0;
+     border-left: 0px solid #bbf;
+     margin-left: -15px;
+     border-right: 0;
+     border-top: 0;
+}
+
+div.main {
+     border-left: 5px solid #bbf !important;
+     margin-top: 0;
+}
+
+div.messages {
+     border-left: 0px solid #bbf;
+     border-right: 0px solid #ddf;     
+     margin: 0px -15px 0px -15px;
+}
+
+div.main, div.news {
+     margin: 0px 0px 10px 185px;
+     border: 0px solid #bbf;
+}
+
+div.main hr, div.news hr {
+     margin: 5px 0px;
+}
+
+div.main {
+     border-top: 5px solid #eef;
+}
+
+div.news {
+     border-left: 5px solid #bbf;
+     border-right: 0px solid #ffffc0; 
+     margin-right: 0px;
+     margin: -20px 0px 0 185px;
+}
+
+div.routersummary {
+     color: #001;
+     padding-left: 0px;
+     border-left: 5px solid #bbf;
+}
+
+/*
+div.routersummary, div.routersummary hr {
+     background: #ddf;
+     height: 5px;
+     border: 0px solid #ddf;
+     margin: 4px 0;
+}
+*/
+
+text {
+     padding-left: 5px;
+}
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 266c93290..0226e038b 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 = 06;
+    public final static long BUILD = 07;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;