diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index bb6cb215084f4a0757d3f26055c08f0943126d7e..f5309145609a45fa6c920130192b69a778ebac29 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -83,8 +83,8 @@ public class I2PSnarkServlet extends HttpServlet {
out.write("<meta http-equiv=\"refresh\" content=\"60;" + req.getRequestURI() + peerString + "\">\n");
out.write(HEADER);
out.write("</head><body>");
- out.write("<div class=\"page\"><table border=\"0\" width=\"100%\"><tr><td align=\"center\" class=\"snarkTitle\"><a href=\"" + req.getRequestURI() + peerString + "\" title=\"I2PSnark (Manual Page Refresh)\"><img src=\"/themes/console/images/i2psnark.png\" alt=\"I2PSnark Anonymous BitTorrent Client\" border=\"0\" class=\"snarklogo\"></a><br>");
- out.write("<a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\" target=\"_blank\">Forum</a>\n");
+ out.write("<div class=\"page\"><table border=\"0\" width=\"100%\"><tr><td align=\"center\" class=\"snarkTitle\"><a href=\"" + req.getRequestURI() + peerString + "\" title=\"I2PSnark (Manual Page Refresh)\"><img src=\"/themes/console/images/i2psnark.png\" alt=\"I2PSnark Anonymous BitTorrent Client\" border=\"0\" class=\"snarklogo\"></a></table>");
+ out.write("<div class=\"snarknavbar\"><a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\" target=\"_blank\">Forum</a>\n");
Map trackers = _manager.getTrackers();
for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {
Map.Entry entry = (Map.Entry)iter.next();
@@ -96,7 +96,7 @@ public class I2PSnarkServlet extends HttpServlet {
baseURL = baseURL.substring(e + 1);
out.write("<a href=\"" + baseURL + "\" class=\"snarkRefresh\" target=\"_blank\">" + name + "</a>");
}
- out.write("</table>\n");
+ out.write("</div>\n");
out.write("<div class=\"mainsection\"><div class=\"snarkMessages\"><table><tr><td valign=\"top\" align=\"left\"><pre>");
List msgs = _manager.getMessages();
for (int i = msgs.size()-1; i >= 0; i--) {
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 0a87f211823a4df19ff683d7dc5a2b55a52d2e97..49d8fd854763d83a1a0550f7aa07fa4ccc86587f 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -1,3 +1,5 @@
+/* Not yet complete. Subject to flux and change. dr|z3d - 07.25.09 */
+
body {
margin: 25px 10px 0 5px;
padding: 0;
@@ -514,12 +516,14 @@ form {}
.statusnotes {
font-style: italic;
font-size: 8pt;
- font-color: #700;
+ color: #eef;
text-align: center;
- border-radius: 4px;
- -moz-border-radius: 4px;
- -khtml-border-radius: 4px;
- border: 0 !important;
+ border: 1px solid #99f !important;
+ border-top: 0px !important;
+ margin: -5px 0 5px 0;
+ padding: 7px;
+ background: #004;
+ -moz-box-shadow: inset 0px 0px 2px 0px #99f;
}
.joblog {
diff --git a/installer/resources/themes/console/images/i2psnark.png b/installer/resources/themes/console/images/i2psnark.png
index b68dae7519e098f4b7dbca4c9d8987411313f4a7..8c8fca0d2707dcb44d2db7fc43750a6827755956 100644
Binary files a/installer/resources/themes/console/images/i2psnark.png and b/installer/resources/themes/console/images/i2psnark.png differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index e1c71358766383bd2424ebd2f50db4fd139078dc..8019384b767280b2eca796e5090f1ed867d941dc 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -1,3 +1,5 @@
+/* Not yet complete. Subject to flux and change. dr|z3d - 07.25.09 */
+
body {
margin: 25px 10px 0 5px;
padding: 0em;
@@ -561,12 +563,14 @@ form {}
.statusnotes {
font-style: italic;
font-size: 8pt;
- font-color: #700 !important;
+ font-color: #001 !important;
text-align: center;
- border-radius: 4px;
- -moz-border-radius: 4px;
- -khtml-border-radius: 4px;
- border: 0;
+ border: 1px solid #001 !important;
+ border-top: 0 !important;
+ margin: -5px 0 5px 0;
+ padding: 7px;
+ background: #bcf;
+ -moz-box-shadow: inset 0px 0px 2px 1px #eef;
}
.joblog {
diff --git a/installer/resources/themes/console/snark.css b/installer/resources/themes/console/snark.css
index 00c21fa4bfbec1f7b92415379882ad6122c38ac8..36e328ed4a562dc426b33735bd49b57846a1fd81 100644
--- a/installer/resources/themes/console/snark.css
+++ b/installer/resources/themes/console/snark.css
@@ -1,3 +1,5 @@
+/* Not yet complete. Subject to flux and change. dr|z3d - 07.25.09 */
+
body {
background-color: #eef;
color:#001;
@@ -11,65 +13,42 @@ body {
text-align: center;
}
-.snarkRefresh {
- border: 1px outset #eef;
- padding: 2px 10px;
- background: #eef;
- text-decoration: none;
- border-radius: 3px;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- font-size: 9pt;
- font-weight: bold;
- margin: -10px 3px 0 3px;
- text-align: center;
- vertical-align: middle;
- text-transform: uppercase;
- opacity: 0.7;
- letter-spacing: 0.05em;
-}
-
-.snarkRefresh:link {
- border: 1px outset #eef;
- padding: 2px 10px;
- background: #eef;
- text-decoration: none;
- border-radius: 3px;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- font-size: 9pt;
- font-weight: bold;
- margin: 0px 3px 0px 3px !important;
- text-align: center;
- vertical-align: middle;
- text-transform: uppercase;
- opacity: 0.7;
- color: #003;
-}
-.snarkRefresh:hover, .snarkRefresh:hover:visited{
- border: 1px solid #eef;
- padding: 2px 10px;
- background: #003;
- text-decoration: none;
- border-radius: 3px;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- font-size: 9pt;
- font-weight: bold;
- margin: -10px 3px 0 3px;
- text-align: center;
- vertical-align: middle;
- text-transform: uppercase;
- color: #f60;
- opacity: 1;
-}
-
-.snarkRefresh:visited {
- border: 1px outset #eef;
- opacity: 0.7;
- color: #003;
- background: #eef;
-}
+.snarkRefresh:link, .snarkRefresh:visited {
+ text-decoration: none !important;
+ text-transform: uppercase !important;
+ padding: 0 16px;
+ letter-spacing: 0.05em;
+ font-weight: bold;
+ font-size: 11pt;
+ color: #005;
+ text-shadow: 0px 0px 1px rgba(0, 0, 148, 0.9);
+ }
+
+ .snarkRefresh:hover{
+ text-decoration: none !important;
+ text-transform: uppercase !important;
+ padding: 0 16px;
+ letter-spacing: 0.05em;
+ font-weight: bold;
+ font-size: 11pt;
+ color: #f60;
+ border-bottom: 3px solid #f60;
+ border-top: 3px solid #f60;
+ text-shadow: 0px 0px 1px rgba(255, 128, 0, 0.9);
+ }
+
+.snarkRefresh:active{
+ text-decoration: none !important;
+ text-transform: uppercase !important;
+ padding: 0 16px;
+ letter-spacing: 0.05em;
+ font-weight: bold;
+ font-size: 11pt;
+ color: #f30;
+ border-bottom: 3px solid #f30;
+ border-top: 3px solid #f30;
+ text-shadow: 0px 0px 1px rgba(255, 163, 0, 0.9);
+ }
.snarkMessages {
background-color: #f83;
@@ -155,6 +134,7 @@ td {
.page {
background-color: #fff;
color:#310;
+ min-width: 700px !important;
margin: 20px;
padding: 10px 20px 5px 20px;
-moz-border-radius: 4px;
@@ -226,14 +206,16 @@ select {
img {
border: none;
- margin: 0px 5px 10px 5px;
- opacity: 0.7;
+ margin: 0px 5px 0px 5px;
+ opacity: 1.0;
+ line-height: 100%
}
img:hover{
border: none;
- margin: 0px 5px 10px 5px;
- opacity: 1;
+ margin: 0px 5px 0px 5px;
+ opacity: 0.5;
+ line-height: 100%
}
@@ -310,15 +292,34 @@ div.configsection {
padding: 10px;
background: #ffe;
border: 1px solid #001;
- text-align: center;
color: #ffb;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
border-radius: 4px;
- -moz-box-shadow: inset 0px 0px 1px 0px #99f;
+ -moz-box-shadow: inset 0px 0px 0px 1px #900;
word-wrap: break-word;
text-align: center;
background: #ffe url('../console/light/images/darkbluetile.png');
font-weight: bold; /* red tile needs bold text! */
- opacity: 0.95;
+}
+
+div.configsection a{
+ color: #f90;
+}
+
+div.configsection a:hover{
+ color: #f60;
+ text-decoration: underline;
+}
+
+.snarknavbar {
+ margin: 5px 0 20px 0 !important;
+ padding: 10px;
+ border: 1px solid #001;
+ -moz-border-radius: 4px;
+ -khtml-border-radius: 4px;
+ border-radius: 4px;
+ background: #eef;
+ -moz-box-shadow: inset 0px 0px 1px 0px #002;
+ background: #ddf url('../console/light/images/tabletile.png');
}
\ 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 b9e65a1095a7c02201b53083fde855e5cee68d68..1b75108604d72b489e9cc12c3a902d82bdd29d62 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 = 22;
+ public final static long BUILD = 23;
/** for example "-test" */
public final static String EXTRA = "-rc";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;