I2PSnark: All the goodness from the disapproved branch + visual fixes.

This commit is contained in:
z3d
2010-11-10 17:56:33 +00:00
parent 83ae568d38
commit 585339e0d4
2 changed files with 89 additions and 68 deletions

View File

@@ -186,6 +186,7 @@ public class I2PSnarkServlet extends Default {
out.write("<div class=\"snarknavbar\"><a href=\"/i2psnark/\" title=\"");
out.write(_("Torrents"));
out.write("\" class=\"snarkRefresh\">");
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/arrow_refresh.png\"> ");
out.write(_("I2PSnark"));
out.write("</a>");
} else {
@@ -814,11 +815,11 @@ public class I2PSnarkServlet extends Default {
out.write("</td>\n\t");
out.write("<td align=\"right\" class=\"snarkTorrentUploaded " + rowClass
+ "\">" + formatSize(uploaded) + "</td>\n\t");
out.write("<td align=\"right\" class=\"snarkTorrentRate\">");
out.write("<td align=\"right\" class=\"snarkTorrentRateDown\">");
if(isRunning && remaining > 0)
out.write(formatSize(downBps) + "ps");
out.write("</td>\n\t");
out.write("<td align=\"right\" class=\"snarkTorrentRate\">");
out.write("<td align=\"right\" class=\"snarkTorrentRateUp\">");
if(isRunning)
out.write(formatSize(upBps) + "ps");
out.write("</td>\n\t");
@@ -1086,10 +1087,11 @@ public class I2PSnarkServlet extends Default {
out.write("</span><hr>\n");
out.write("<table border=\"0\"><tr><td>");
out.write(_("Data directory"));
out.write(": <td><input type=\"text\" size=\"50\" name=\"dataDir\" value=\"" + dataDir + "\" ");
out.write("title=\"");
out.write(_("Directory to store torrents and data"));
out.write("\" disabled=\"true\" ><br><i>(");
out.write(": <td><code>" + dataDir + "</code> (");
// out.write(": <td><input type=\"text\" size=\"50\" name=\"dataDir\" value=\"" + dataDir + "\" ");
// out.write("title=\"");
// out.write(_("Directory to store torrents and data"));
// out.write("\" disabled=\"true\" ><br><i>(");
out.write(_("Edit i2psnark.config and restart to change"));
out.write(")</i><br>\n");
@@ -1357,28 +1359,25 @@ public class I2PSnarkServlet extends Default {
title = _("Torrent") + ": " + title;
buf.append(title);
buf.append("</TITLE>").append(HEADER).append("<link rel=\"shortcut icon\" href=\"/themes/snark/ubergine/favicon.ico\"></HEAD><BODY>\n<center><div class=\"snarknavbar\"> <a href=\"/i2psnark/\" title=\"Torrents\"");
buf.append(" class=\"snarkRefresh\">I2PSnark</a>").append("</div>");
buf.append(" class=\"snarkRefresh\"><img border=\"0\" src=\"/themes/snark/ubergine/images/arrow_refresh.png\"> I2PSnark</a>").append("</div>");
if (parent)
{
buf.append("\n<br><A HREF=\"");
// corrupts utf-8
//buf.append(URI.encodePath(URI.addPaths(base,"../")));
buf.append(URI.addPaths(base,"../"));
buf.append("\"><img border=\"0\" src=\"/themes/console/images/outbound.png\"> ")
.append(_("Up to higher level directory")).append("</A>\n");
}
buf.append("</div><div class=\"page\"><div class=\"mainsection\">");
boolean showPriority = snark != null && !snark.storage.complete();
buf.append("</div><div class=\"page\"><div class=\"mainsection\">");
boolean showPriority = snark != null && !snark.storage.complete();
if (showPriority)
buf.append("<form action=\"").append(base).append("\" method=\"POST\">\n");
buf.append("<TABLE BORDER=0 class=\"snarkTorrents\" cellpadding=\"5px 10px\">" +
buf.append("<TABLE BORDER=0 class=\"snarkTorrents\" cellpadding=\"5px 10px\">" +
"<thead><tr><th>").append("<img border=\"0\" src=\"/themes/snark/ubergine/images/file.png\" title=\"").append(_("File")).append("\" alt=\"").append(_("File")).append("\">&nbsp;").append(title).append("</th><th align=\"right\">").append("<img border=\"0\" src=\"/themes/snark/ubergine/images/size.png\" title=\"").append(_("FileSize")).append("\" alt=\"").append(_("FileSize")).append("\">").append(_("Size"));
buf.append("</th><th>").append("<img border=\"0\" src=\"/themes/snark/ubergine/images/status.png\" title=\"").append(_("Download Status")).append("\">").append(_("Status")).append("</th>");
if (showPriority)
buf.append("<th>").append(_("Priority")).append("</th>");
buf.append("</tr></thead>\n");
buf.append("<tr><td colspan=\"4\" class=\"ParentDir\"><A HREF=\"");
buf.append(URI.addPaths(base,"../"));
buf.append("\"><img border=\"0\" src=\"/themes/snark/ubergine/images/up.png\"> ")
.append(_("Up to higher level directory")).append("</A></td></tr>\n");
//DateFormat dfmt=DateFormat.getDateTimeInstance(DateFormat.MEDIUM,
// DateFormat.MEDIUM);
boolean showSaveButton = false;

View File

@@ -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 {
@@ -182,6 +181,18 @@ tfoot th {
padding-bottom: 4px !important;
}
.ParentDir {
background: #656;
background: #351933;
font-size: 8pt;
border: 0px inset #101 !important;
border-left: 0 !important;
border-right: 0 !important;
text-align: left !important;
padding: 4px 0;
}
.SnarkTorrents {
margin: 0;
border: 1px solid #101;
@@ -190,9 +201,9 @@ tfoot th {
td {
padding: 1px;
color: #ddd !important;
font-size: 9.5pt;
opacity: 1;
color: #ddd !important;
opacity: 1;
font-size: 9.5pt;
}
.mainsection td {
@@ -201,20 +212,21 @@ td {
td:first-child {
text-align: right;
padding-left: 10px;
/* padding-left: 10px;*/
font-size: 9.5pt;
}
.snarkTorrentName {
text-shadow:1px 1px #550000;
padding: 2px 0 0;
padding: 2px 0 0;
}
.snarkTorrentAction {
text-shadow:1px 1px #550000;
padding: 1px 1px 1px 1px !important;
margin: 0 !important;
text-align: center;
width: 68px;
padding: 1px 1px 1px 1px !important;
margin: 0 !important;
text-align: center;
width: 68px;
}
.snarkTorrentAction img {
@@ -254,19 +266,18 @@ td:first-child {
.snarkTorrentStatus:first-child {
text-align: left !important;
font-style: italic;
padding-left: 0px;
min-width: 92px;
font-weight: bold;
font-size: 7pt !important;
color: #dd9 !important;
font-size: 8pt;
}
.snarkTorrentStatus:first-child img {
margin-right: 0px !important;
}
.snarkTorrentRate, .snarkTorrentDownloaded, .snarkTorrentUploaded {
.snarkTorrentRateUp, .snarkTorrentRateDown, .snarkTorrentDownloaded, .snarkTorrentUploaded {
font-size: 8pt;
font-weight: bold;
padding: 0 3px;
@@ -280,10 +291,13 @@ td:first-child {
color: #b9b !important;
}
.snarkTorrentRate {
color: #d9d !important;
.snarkTorrentRateUp {
color: #b9b !important;
}
.snarkTorrentRateDown {
color: #76a !important;
}
.snarkTorrentOdd {
background: #656;
@@ -413,13 +427,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 +447,7 @@ input[type=submit] {
color: #000;
background: #989;
border: 1px inset #bbb;
padding: 2px;
}
input[type=submit]:hover {
@@ -453,6 +469,12 @@ input[type=text]:active, input[type=text]:hover, input.r:hover {
color: #fff;
}
input[type=radio] {
padding: 2px;
color: #f00 !important;
margin: 0 5px 0 15px;
}
select {
background: #333;
background: url('/themes/snark/ubergine/images/graytile.png') !important;
@@ -468,7 +490,7 @@ select {
select:hover, textarea:hover {
background: #f60 !important;
color: #fff;
color: #fff !important;
}
textarea {
@@ -599,7 +621,7 @@ div.configsection a:hover {
}
code {
font-size: 9pt;
font-size: 9.5pt;
color: #b8b;
padding: 0 2px;
font-weight: bold;
@@ -610,8 +632,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;