diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 950f2e82714bd143ba8c99725d18ed07618a7268..e0ff254b8e85f1e98b7ca7eaf9145b3fce40316e 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -324,7 +324,7 @@ public class SnarkManager implements Snark.CompleteListener {
Snark snark = getTorrent(name);
if ( (snark != null) && (snark.acceptor != null) ) {
snark.acceptor.restart();
- addMessage("I2CP listener restarted for " + snark.meta.getName());
+ addMessage("I2CP listener restarted for " + snark.meta.getName()) +".";
}
}
}
@@ -334,8 +334,8 @@ public class SnarkManager implements Snark.CompleteListener {
}
if (shouldAutoStart() != autoStart) {
_config.setProperty(PROP_AUTO_START, autoStart + "");
- addMessage("Adjusted autostart to " + autoStart);
- changed = true;
+ addMessage("Autostart of torrents set to " + autoStart);
+ changed = true + ".";
}
if (_util.shouldUseOpenTrackers() != useOpenTrackers) {
_config.setProperty(I2PSnarkUtil.PROP_USE_OPENTRACKERS, useOpenTrackers + "");
@@ -391,8 +391,8 @@ public class SnarkManager implements Snark.CompleteListener {
try {
filename = sfile.getCanonicalPath();
} catch (IOException ioe) {
- _log.error("Unable to add the torrent " + filename, ioe);
- addMessage("ERR: Could not add the torrent '" + filename + "': " + ioe.getMessage());
+ _log.error("Unable to add the torrent " + filename, ioe) + ".";
+ addMessage("ERR: Could not add the torrent '" + filename + "': " + ioe.getMessage()) + ".";
return;
}
File dataDir = getDataDir();
@@ -431,7 +431,7 @@ public class SnarkManager implements Snark.CompleteListener {
}
}
} catch (IOException ioe) {
- addMessage("Torrent in " + sfile.getName() + " is invalid: " + ioe.getMessage());
+ addMessage("Torrent in " + sfile.getName() + " is invalid: " + ioe.getMessage()) +".";
if (sfile.exists())
sfile.delete();
return;
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
index 195889fad295a59d565fa55b59de01e8e0120f8d..3601bf38beaf52debd7405f21f1b9fd6a8d3199b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
@@ -95,9 +95,9 @@ public class ConfigServiceHandler extends FormHandler {
SysTray tray = SysTray.getInstance();
if (tray != null) {
tray.show();
- addFormNotice("Systray enabled");
+ addFormNotice("System tray icon enabled.");
} else {
- addFormNotice("Systray not supported on this platform");
+ addFormNotice("System tray icon feature not supported on this platform. Sorry!");
}
} catch (Throwable t) {
addFormError("Warning: unable to contact the systray manager - " + t.getMessage());
@@ -107,9 +107,9 @@ public class ConfigServiceHandler extends FormHandler {
SysTray tray = SysTray.getInstance();
if (tray != null) {
tray.hide();
- addFormNotice("Systray disabled");
+ addFormNotice("System tray icon disabled.");
} else {
- addFormNotice("Systray not supported on this platform");
+ addFormNotice("System tray icon feature not supported on this platform. Sorry!");
}
} catch (Throwable t) {
addFormError("Warning: unable to contact the systray manager - " + t.getMessage());
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index 8305d64f3dd41b63390c07fddab8e4ba04a565b2..f724c7ed46ddcbe19d0084c3b5071a643b93f5c3 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -367,7 +367,7 @@ public class SummaryHelper extends HelperBase {
if (timeToExpire < 0) {
// red or yellow light
buf.append("<td align=\right\"><img src=\"/themes/console/images/local_inprogress.png\" alt=\"Rebuilding…\" title=\"Leases expired ").append(DataHelper.formatDuration(0-timeToExpire));
- buf.append(" ago. Rebuilding..\"></td></tr>\n");
+ buf.append(" ago. Rebuilding…\"></td></tr>\n");
} else {
// green light
buf.append("<td align=\right\"><img src=\"/themes/console/images/local_up.png\" alt=\"Ready\" title=\"Ready\"></td></tr>\n");
diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp
index 2a473d1f5ba6677ab1271eadd876e5ed15c96ee8..abfce05fd8af245afe6eafff6138dd2c020368b5 100644
--- a/apps/routerconsole/jsp/summarynoframe.jsp
+++ b/apps/routerconsole/jsp/summarynoframe.jsp
@@ -127,7 +127,7 @@
<tr><td align="left"><b>Total:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundLifetimeKBps" />/<jsp:getProperty name="helper" property="outboundLifetimeKBps" />K/s</td></tr>
<tr><td align="left"><b>Used:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundTransferred" />/<jsp:getProperty name="helper" property="outboundTransferred" /></td></tr></table>
<hr>
-<h3><a href="tunnels.jsp" target="_blank" title="View existing tunnels and tunnel build status.">Tunnels in/out</a></h3><hr>
+<h3><a href="tunnels.jsp" target="_top" title="View existing tunnels and tunnel build status.">Tunnels in/out</a></h3><hr>
<table><tr>
<td align="left"><b>Exploratory:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundTunnels" />/<jsp:getProperty name="helper" property="outboundTunnels" /></td></tr>
<tr><td align="left"><b>Client:</b></td><td align="right"><jsp:getProperty name="helper" property="inboundClientTunnels" />/<jsp:getProperty name="helper" property="outboundClientTunnels" /></td></tr>
diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css
index 62296c191fc2bee98dbcda2e4154cc3cf944db45..a69454535c04f72afdc5840bf830b9b5d6a96326 100644
--- a/installer/resources/themes/console/classic/console.css
+++ b/installer/resources/themes/console/classic/console.css
@@ -110,7 +110,7 @@ div.toolbar {
div.routersummaryouter {
float: left;
- width: 205px;
+ width: 200px;
margin: 0;
padding: 0;
border: 0;
@@ -119,7 +119,7 @@ div.routersummaryouter {
div.routersummary {
background: #ddf;
- width: 190px;
+ width: 185px;
color: inherit;
margin: 0;
padding: 7px 1px;
@@ -171,7 +171,7 @@ div.routersummary h4 {
div.routersummary table {
border: 0;
text-align: center !important;
- margin: -5px 5px;
+ margin: -5px 5px -5px 2px;
width: 180px !important;
overflow: hidden;
font-size: 8pt;
@@ -225,7 +225,7 @@ div.warning h3 {
}
div.main {
- margin: 0px 0px 0px 196px;
+ margin: 0px 0px 0px 195px;
padding: 15px 15px 15px 15px;
background: #eef;
border: 5px solid #bbf;
@@ -251,7 +251,7 @@ div.main textarea {
}
div.news {
- margin: -5px 0px 0 196px;
+ margin: -5px 0px 0 195px;
padding: -10px 15px 8px 15px;
background: #ffffc0;
border: 5px solid #bbf;
@@ -358,7 +358,7 @@ h1 {
text-align: center;
border: 5px solid #bbf;
padding: 13px 10px 12px 10px;
- margin: 0 0px 0 196px;
+ margin: 0 0px 0 195px;
line-height: 93%;
text-transform: uppercase;
letter-spacing: 0.3em;
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index fe902cb1e99bc55d26c7201360f8beb413209a22..6986ce9b796714f6a1c0aebe8e8fc550c42ae5f9 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -1,7 +1,7 @@
/* Not yet complete. Subject to flux and change. dr|z3d - 07.25.09 */
body {
- margin: 25px 10px 0 5px;
+ margin: 20px 5px 0 15px;
padding: 0;
text-align: center;
background: #002;
@@ -79,7 +79,7 @@ a:active{
div.routersummaryouter {
float: left;
width: 200px;
- margin: 0 0 10px 20px;
+ margin: 0 0 10px 5px;
padding: 0;
border: 0;
clear: left;/* fixes a bug in Opera */
@@ -125,7 +125,7 @@ div.routersummary hr {
div.routersummary h3 {
border: 0;
font-size: 10pt;
- letter-spacing: 0.05em;
+ letter-spacing: 0.04em;
margin: -7px -9px -10px -9px;
padding: 3px 0px 5px 0px;
background: #007;
@@ -140,8 +140,8 @@ div.routersummary h3 {
div.routersummary h4 {
border: 0;
border-bottom: 0 !important;
- font-size: 9pt;
- letter-spacing: 0.05em;
+ font-size: 8.5pt;
+ letter-spacing: 0.03em;
margin: -7px -9px -10px -9px !important;
padding: 2px 3px 5px 3px;
background: #005;
@@ -154,7 +154,7 @@ div.routersummary h4 {
div.routersummary table {
border: 0;
text-align: center !important;
- margin: -5px -5px;
+ margin: -1px -4px -4px -4px;
width: 185px !important;
overflow: hidden;
font-size: 8pt;
@@ -178,7 +178,7 @@ div.routersummary p {
}
div.routersummary a:link, div.routersummary a:visited {
- text-shadow: 0px 0px 1px rgba(0, 0, 32, 0.3);
+ text-shadow: 0px 0px 1px rgba(192, 192, 255, 0.5);
}
div.routersummary a:hover {
@@ -224,7 +224,7 @@ div.warning {
}
div.main {
- margin: 0px 0px 20px 215px;
+ margin: 0px 0px 20px 195px;
padding: 0 15px 15px 25px;
background: #002;
text-align: left;
@@ -240,7 +240,7 @@ div.main textarea {
}
div.news {
- margin: 0px 15px 20px 240px;
+ margin: 0px 15px 20px 220px;
padding: 20px 30px 20px 30px;
border: 1px solid #99f;
background: #004;
@@ -266,7 +266,7 @@ div.news li {
div.confignav {
padding: 15px 10px !important;
- margin: 0 0 25px 0;
+ margin: 0 0 15px 0;
background: #004 url('images/darkbluebg.png');
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
@@ -325,7 +325,7 @@ div.messages li {
}
div.graphspanel {
- padding: 15px 15px 15px 15px;
+ padding: 0px 5px 10px 5px;
margin: 10px 0px;
background: #005;
-moz-border-radius: 4px;
@@ -497,7 +497,7 @@ h1 {
text-align: left;
color: #fff;
padding: 10px 15px;
- margin: 0 15px 25px 240px;
+ margin: 0 15px 15px 220px;
font-size: 16pt;
font-weight: bold;
font-style: normal;
@@ -529,7 +529,7 @@ h2 {
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
vertical-align: middle;
- margin: 25px 0 20px 0 !important;
+ margin: 15px 0 10px 0 !important;
-moz-box-shadow: inset 0px 0px 1px 0px #eef;
-khtml-box-shadow: inset 0px 0px 1px 0px #eef;
box-shadow: inset 0px 0px 1px 0px #eef;
@@ -757,8 +757,8 @@ form {}
}
.joblog {
- margin: 25px 0 25px 0;
- padding: 20px 30px 20px 30px !important;
+ margin: 15px 0 15px 0;
+ padding: 20px !important;
border: 1px solid #99f;
background-color: #004;
background: url("images/darkbluebg.png");
diff --git a/installer/resources/themes/console/images/local_down.png b/installer/resources/themes/console/images/local_down.png
index 14c7d4b9294e4109af51437ba8ac18d45710f673..4d056de5da5e89dc55609522bfc9224526665236 100644
Binary files a/installer/resources/themes/console/images/local_down.png and b/installer/resources/themes/console/images/local_down.png differ
diff --git a/installer/resources/themes/console/images/local_inprogress.png b/installer/resources/themes/console/images/local_inprogress.png
index d8fcfe44e89f608f35bcee1569d1e8acea324da8..245dc058d8274486f073b53ed73763e97d0e0af5 100644
Binary files a/installer/resources/themes/console/images/local_inprogress.png and b/installer/resources/themes/console/images/local_inprogress.png differ
diff --git a/installer/resources/themes/console/images/local_up.png b/installer/resources/themes/console/images/local_up.png
index 1b70292fe7d3942a6582b9d27d2f4448e0665e46..5b8a3451707baef478833ea6a3411a523bea0661 100644
Binary files a/installer/resources/themes/console/images/local_up.png and b/installer/resources/themes/console/images/local_up.png differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index be4f6a3d6aeda98f71bf44281541cdf2e406bd3c..6138ab4c8982631a4146717797215bf0e5cf3763 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -119,21 +119,21 @@ div.routersummary hr {
}
div.routersummary h3 {
- border: 0px solid #f00;
-/* border-bottom: 1px solid #99f !important;*/
+ border: 0;
font-size: 10pt;
- letter-spacing: 0.05em;
+ letter-spacing: 0.04em;
margin: -7px -9px -7px -9px;
padding: 5px 0px 5px 0px;
background: #c5d5fb;
text-transform: uppercase;
+ background-image: -moz-linear-gradient(top, bottom, from(#ddf), to(#c5d5fb), color-stop(25%, #c5d5fb), color-stop(100%, #ddf));
}
div.routersummary h4 {
border: 0px solid #f00;
border-bottom: 0 !important;
- font-size: 9pt;
- letter-spacing: 0.05em;
+ font-size: 8.5pt;
+ letter-spacing: 0.02em;
margin: -7px -9px -7px -9px !important;
padding: 2px 3px 3px 3px;
background: #c1d1f7;
@@ -145,7 +145,7 @@ div.routersummary h4 {
div.routersummary table {
border: 0;
text-align: center !important;
- margin: -5px -5px;
+ margin: -2px -4px;
width: 185px !important;
overflow: hidden;
font-size: 8pt;
@@ -169,11 +169,11 @@ div.routersummary p {
}
div.routersummary a:link, div.routersummary a:visited {
- text-shadow: 0px 0px 1px rgba(0, 0, 32, 0.3);
+ text-shadow: 0px 0px 1px rgba(0, 0, 32, 0.5);
}
div.routersummary a:hover {
- text-shadow: 0px 0px 1px rgba(255, 96, 0, 0.7);
+ text-shadow: 0px 0px 0.5px rgba(255, 255, 255, 0.7);
color: #f60;
}