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 18fde5897ecc35a0463e1c08813dab4e146a94c2..b8dd9abfd27073e0fea75954e92c6460a1ae79ab 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -239,7 +239,7 @@ public class I2PSnarkServlet extends Default {
out.write(TABLE_HEADER);
out.write(_("Status"));
if (_manager.util().connected() && !snarks.isEmpty()) {
- out.write(" (<a href=\"");
+ out.write(" » <a href=\"");
out.write(req.getRequestURI());
if (peerParam != null) {
out.write("\">");
@@ -248,20 +248,20 @@ public class I2PSnarkServlet extends Default {
out.write("?p=1\">");
out.write(_("Show Peers"));
}
- out.write("</a>)<br>\n");
+ out.write("</a><br>\n");
}
out.write("</th>\n<th align=\"left\">");
out.write(_("Torrent"));
out.write("</th>\n<th align=\"center\">");
out.write(_("ETA"));
out.write("</th>\n<th align=\"right\">");
- out.write(_("Downloaded"));
+ out.write(_("RX"));
out.write("</th>\n<th align=\"right\">");
- out.write(_("Uploaded"));
+ out.write(_("TX"));
out.write("</th>\n<th align=\"right\">");
- out.write(_("Down Rate"));
+ out.write(_("RX Rate"));
out.write("</th>\n<th align=\"right\">");
- out.write(_("Up Rate"));
+ out.write(_("TX Rate"));
out.write("</th>\n");
out.write("<th align=\"center\">");
@@ -598,7 +598,7 @@ public class I2PSnarkServlet extends Default {
return rv;
}
- private static final int MAX_DISPLAYED_FILENAME_LENGTH = 44;
+ private static final int MAX_DISPLAYED_FILENAME_LENGTH = 38;
private static final int MAX_DISPLAYED_ERROR_LENGTH = 40;
private void displaySnark(PrintWriter out, Snark snark, String uri, int row, long stats[], boolean showPeers, boolean showDebug) throws IOException {
String filename = snark.torrent;
@@ -671,34 +671,34 @@ public class I2PSnarkServlet extends Default {
}
} else if (remaining <= 0) {
if (isRunning && curPeers > 0 && !showPeers)
- statusString = _("Seeding") + " (" +
+ statusString = _("Seeding") + " » " +
"<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
curPeers + '/' +
- ngettext("1 peer", "{0} peers", knownPeers) + "</a>)";
+ ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
else if (isRunning)
- statusString = _("Seeding") + " (" + curPeers + "/" +
- ngettext("1 peer", "{0} peers", knownPeers) + ')';
+ statusString = _("Seeding") + " » " + curPeers + "/" +
+ ngettext("1 peer", "{0} peers", knownPeers);
else
statusString = _("Complete");
} else {
if (isRunning && curPeers > 0 && downBps > 0 && !showPeers)
- statusString = _("OK") + " (" +
+ statusString = _("OK") + " » " +
"<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
curPeers + "/" +
- ngettext("1 peer", "{0} peers", knownPeers) + "</a>)";
+ ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
else if (isRunning && curPeers > 0 && downBps > 0)
statusString = _("OK") + " (" + curPeers + "/" +
ngettext("1 peer", "{0} peers", knownPeers) + ')';
else if (isRunning && curPeers > 0 && !showPeers)
- statusString = _("Stalled") + " (" +
+ statusString = _("Stalled") + " » " +
"<a href=\"" + uri + "?p=" + Base64.encode(snark.meta.getInfoHash()) + "\">" +
curPeers + '/' +
- ngettext("1 peer", "{0} peers", knownPeers) + "</a>)";
+ ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
else if (isRunning && curPeers > 0)
- statusString = _("Stalled") + " (" + curPeers + '/' +
- ngettext("1 peer", "{0} peers", knownPeers) + ')';
+ statusString = _("Stalled") + " » " + curPeers + '/' +
+ ngettext("1 peer", "{0} peers", knownPeers);
else if (isRunning)
- statusString = _("No Peers") + " (0/" + knownPeers + ')';
+ statusString = _("No Peers") + " » 0/" + knownPeers;
else
statusString = _("Stopped");
}
@@ -745,11 +745,11 @@ public class I2PSnarkServlet extends Default {
if (e < 0)
continue;
baseURL = baseURL.substring(e + 1);
- out.write(" [<a href=\"" + baseURL + "details.php?dllist=1&filelist=1&info_hash=");
+ out.write(" » <a href=\"" + baseURL + "details.php?dllist=1&filelist=1&info_hash=");
out.write(TrackerClient.urlencode(snark.meta.getInfoHash()));
out.write("\" title=\"" + name + ' ' + _("Tracker") + "\">");
out.write(_("Details"));
- out.write("</a>]");
+ out.write("</a>");
break;
}
}
diff --git a/installer/resources/themes/console/images/snarknav_on.png b/installer/resources/themes/console/images/snarknav_on.png
index c7457195c9dd38f2b28b77659e2e8be46c225439..be1b85b394c38bf57a8b523d951353b338831cc9 100644
Binary files a/installer/resources/themes/console/images/snarknav_on.png and b/installer/resources/themes/console/images/snarknav_on.png differ
diff --git a/installer/resources/themes/console/snark.css b/installer/resources/themes/console/snark.css
index c5d86037ea8e93bd928d9749d036ce81c38e2a81..5add2b9096382d654309f0a951a018801babbde2 100644
--- a/installer/resources/themes/console/snark.css
+++ b/installer/resources/themes/console/snark.css
@@ -96,8 +96,8 @@ table {
}
thead, tfoot {
- background: #333;
- background: url("../console/images/snark_thead.png") repeat scroll 0 0 #333333;
+ background: #000;
+ background: url("../console/images/snark_thead.png") repeat-x scroll 0 0 #101;
text-shadow:0 2px 5px #333333;
}
@@ -106,6 +106,10 @@ text-shadow: 1px 1px #210;
text-shadow:1px 1px #550000;
}
+thead {
+ border-bottom: 2px solid #101;
+}
+
th {
padding: 4px;
font-size: 9pt;
@@ -116,6 +120,11 @@ th {
whitespace: nowrap;
}
+th:first-child {
+ text-align: left;
+ padding-left: 10px;
+}
+
.SnarkTorrents {
margin: 0;
border: 1px solid #001;
@@ -123,7 +132,7 @@ th {
}
td {
- padding: 2px;
+ padding: 1px;
color: #ddd !important;
font-size: 9.5pt;
}
@@ -146,20 +155,31 @@ td:first-child {
}
.snarkTorrentEven {
- background: #555;
+ background: #545;
font-size: 8pt;
}
+.snarkTorrentStatus {
+ line-height: 200%;
+}
+
.snarkTorrentStatus:first-child {
text-align: left !important;
font-style: italic;
- padding-left: 2%;
+ padding-left: 10px;
}
+.snarkTorrentRate, .snarkTorrentDownloaded, .snarkTorrentUploaded {
+ font-size: 8pt;
+ font-weight: bold;
+}
.snarkTorrentOdd {
- background: #444;
+ background: #434;
font-size: 8pt;
+ border: 1px inset #323;
+ border-left: 0;
+ border-right: 0;
}
.snarkFileName {
@@ -314,7 +334,8 @@ input[type=text]:active, input[type=text]:hover, input.r:hover {
}
select {
- background: url('../console/images/graytile.png');
+ background: #333;
+ background: url('../console/images/graytile.png') !important;
color: #f60;
font: 9pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
font-weight: bold;