From 6e48ecb9cea862d14f0fadf4aba9e441e7600b7f Mon Sep 17 00:00:00 2001 From: z3d Date: Sat, 6 Nov 2010 14:21:22 +0000 Subject: [PATCH] I2PSnark: Fix syntax errors; tweak css. --- .../org/klomp/snark/web/I2PSnarkServlet.java | 30 +++---- .../resources/themes/snark/ubergine/snark.css | 78 ++++++++++--------- 2 files changed, 58 insertions(+), 50 deletions(-) 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 0f4ae8cfe..87c138f3e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -185,6 +185,7 @@ public class I2PSnarkServlet extends Default { out.write("
"); + out.write(" "); out.write(_("I2PSnark")); out.write(""); } else { @@ -300,7 +301,7 @@ public class I2PSnarkServlet extends Default { "\" title=\""); out.write(_("Stop all torrents and the I2P tunnel")); out.write("\">"); - out.write("\"");"); - out.write("\"Start"); out.write(""); @@ -810,11 +811,11 @@ public class I2PSnarkServlet extends Default { out.write("\n\t"); out.write("" + formatSize(uploaded) + "\n\t"); - out.write(""); + out.write(""); if(isRunning && remaining > 0) out.write(formatSize(downBps) + "ps"); out.write("\n\t"); - out.write(""); + out.write(""); if(isRunning) out.write(formatSize(upBps) + "ps"); out.write("\n\t"); @@ -827,7 +828,7 @@ public class I2PSnarkServlet extends Default { + "\" title=\""); out.write(_("Stop the torrent")); out.write("\">"); - out.write("\"");"); - out.write("\"");"); - out.write("\"");"); - out.write("\"");
\n
"); out.write(_("From URL")); - out.write(": \n"); + out.write(": \n"); // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve) //out.write("From file:
"); out.write("
\n"); out.write("
 "); - out.write(_("You can also copy .torrent files to: {0}.", "" + _manager.getDataDir().getAbsolutePath ())) + ""; + out.write(_("You can also copy .torrent files to: {0}.", "" + _manager.getDataDir().getAbsolutePath () + "")); out.write("\n"); out.write(_("Removing a .torrent will cause it to stop.")); out.write("
\n"); @@ -1346,7 +1350,7 @@ public class I2PSnarkServlet extends Default { title = _("Torrent") + ": " + title; buf.append(title); buf.append("").append(HEADER).append("\n
I2PSnark").append("
"); + buf.append(" class=\"snarkRefresh\"> I2PSnark").append("
"); buf.append("
" + "" + @@ -1415,7 +1419,7 @@ public class I2PSnarkServlet extends Default { String plc = item.toString().toLowerCase(); if (plc.endsWith(".jpg") || plc.endsWith(".jpeg") || plc.endsWith(".png") || plc.endsWith(".gif") || plc.endsWith(".ico")) { - buf.append("\"\" "); } else { buf.append(toImg(icon)); @@ -1512,7 +1516,7 @@ buf.append("\n"); /** @since 0.7.14 */ private static String toImg(String icon) { - return "\"\" "; + return "\"\" "; } diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css index 5ada66db0..0e9bc0f00 100644 --- a/installer/resources/themes/snark/ubergine/snark.css +++ b/installer/resources/themes/snark/ubergine/snark.css @@ -17,7 +17,7 @@ body { text-decoration: none !important; text-transform: uppercase !important; padding: 4px 16px 5px !important; - margin: -5px -7px -5px 0 !important; + margin: -5px -8px -5px 0 !important; letter-spacing: 0.05em; font-weight: bold; font-size: 11pt; @@ -43,13 +43,13 @@ body { font-size: 11pt; color: #f50; background: #310 url('/themes/snark/ubergine/images/snarknav_on.png') repeat-x scroll center center; - background: url('/themes/snark/ubergine/images/snarknav_lowlight.png') repeat-x scroll center center; - -moz-border-radius: 0; - -khtml-border-radius: 0; - border-radius: 0; - -moz-box-shadow: inset 0 0 1px 0 #f90; - -khtml-box-shadow: inset 0 0 1px 0 #f90; - box-shadow: 0 0 1px #f90; + background: #310 url('/themes/snark/ubergine/images/snarknav_lowlight.png') repeat-x scroll center center; + -moz-border-radius: 0; + -khtml-border-radius: 0; + border-radius: 0; + -moz-box-shadow: inset 0 0 1px 0 #f90; + -khtml-box-shadow: inset 0 0 1px 0 #f90; + box-shadow: 0 0 1px #f90; } .snarkRefresh:active { @@ -64,21 +64,21 @@ body { } .snarkRefresh:last-child { - -moz-border-radius: 0 3px 3px 0px; - -khtml-border-radius: 0 3px 0 0; - border-radius: 0; - -moz-box-shadow: inset 0 0 1px 0 #f90; - -khtml-box-shadow: inset 0 0 1px 0 #f90; - box-shadow: 0 0 1px 0 #f90; + -moz-border-radius: 0 3px 3px 0px; + -khtml-border-radius: 0 3px 3px 0; + border-radius: 0 3px 3px 0; + -moz-box-shadow: inset 0 0 1px 0 #f90; + -khtml-box-shadow: inset 0 0 1px 0 #f90; + box-shadow: 0 0 1px 0 #f90; } .snarkRefresh:first-child { - -moz-border-radius: 3px 0 0 3px; - -khtml-border-radius: 3px; - border-radius: 0; - -moz-box-shadow: inset 0 0 1px 0 #f90; - -khtml-box-shadow: inset 0 0 1px 0 #f90; - box-shadow: 0 0 1px 0 #f90; + -moz-border-radius: 3px 0 0 3px; + -khtml-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; + -moz-box-shadow: inset 0 0 1px 0 #f90; + -khtml-box-shadow: inset 0 0 1px 0 #f90; + box-shadow: 0 0 1px 0 #f90; } .snarkMessages { @@ -116,7 +116,7 @@ pre { padding: 0; text-align: left !important; height: 8px; - color: #13f; + color: #13f; font-weight: bold !important; } @@ -126,18 +126,18 @@ table { padding: 0px; border-spacing: 0px; border-collapse: collapse; - color: #323; - width: 100%; - opacity: 1 !important; + color: #323; + width: 100%; + opacity: 1 !important; } tr { - opacity: 1; + opacity: 1; } thead, tfoot { - background: url("/themes/snark/ubergine/images/snark_thead.png") repeat-x scroll 0 0 #101; - text-shadow:0 2px 5px #333333; + background: url("/themes/snark/ubergine/images/snark_thead.png") repeat-x scroll 0 0 #101; + text-shadow:0 2px 5px #333333; } thead a, tfoot a { @@ -153,7 +153,7 @@ th { font-size: 9pt; border-top: 1px outset #001; border-bottom: 1px inset #101; - color: #ddd; + color: #ddd; whitespace: nowrap; font-variant: small-caps !important; letter-spacing: 0.05em; @@ -161,8 +161,7 @@ th { th:first-child { text-align: left !important; - padding-left: 2px; - max-width: 120px; + padding-left: 2px; } tfoot td:first-child { @@ -266,7 +265,7 @@ td:first-child { margin-right: 0px !important; } -.snarkTorrentRate, .snarkTorrentDownloaded, .snarkTorrentUploaded { +.snarkTorrentRateUp, .snarkTorrentRateDown, .snarkTorrentDownloaded, .snarkTorrentUploaded { font-size: 8pt; font-weight: bold; padding: 0 3px; @@ -280,10 +279,13 @@ td:first-child { color: #b9b !important; } -.snarkTorrentRate { - color: #d9d !important; +.snarkTorrentRateUp { + color: #b9b !important; } +.snarkTorrentRateDown { + color: #76a !important; +} .snarkTorrentOdd { background: #656; @@ -413,13 +415,14 @@ input { font-size: 9pt; font-weight: bold; text-align: left; - padding: 2px 4px; + padding: 3px 4px !important; -moz-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; border: 1px inset #000; background: #212 url('/themes/snark/ubergine/images/graytile.png'); color: #f60; + margin: 2px 0; } input.r { @@ -432,6 +435,7 @@ input[type=submit] { color: #000; background: #989; border: 1px inset #bbb; + padding: 2px; } input[type=submit]:hover { @@ -468,7 +472,7 @@ select { select:hover, textarea:hover { background: #f60 !important; - color: #fff; + color: #fff !important; } textarea { @@ -610,8 +614,8 @@ code { padding: 11px 10px 12px; border: 1px solid #101; -moz-border-radius: 0 0 8px 8px; - -khtml-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; + -khtml-border-radius: 0 0 8px 8px; + border-radius: 0 0 8px 8px; -moz-box-shadow: inset 0px 0px 1px 0px #002; -khtml-box-shadow: inset 0px 0px 1px 0px #002; box-shadow: inset 0px 0px 1px 0px #002;