");
// cycle through sort by name or type
@@ -510,7 +510,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (total > 0 && (start > 0 || total > pageSize)) {
writePageNav(out, req, start, pageSize, total, noThinsp);
}
- out.write("
\n
");
+ out.write("
\n
");
if (_manager.util().connected() && !snarks.isEmpty()) {
if (showSort) {
sort = ("4".equals(currentSort)) ? "-4" : "4";
@@ -525,7 +525,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (showSort)
out.write("");
}
- out.write("
\n
");
+ out.write("
\n
");
// cycle through sort by size or downloaded
boolean isDlSort = false;
if (showSort) {
@@ -550,7 +550,7 @@ public class I2PSnarkServlet extends BasicServlet {
: _t("Downloaded")));
if (showSort)
out.write("");
- out.write("
\n
");
+ out.write("
\n
");
boolean isRatSort = false;
if (!snarks.isEmpty()) {
// cycle through sort by uploaded or ratio
@@ -582,7 +582,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (showSort)
out.write("");
}
- out.write("
\n
");
+ out.write("
\n
");
if (_manager.util().connected() && !snarks.isEmpty()) {
if (showSort) {
sort = ("8".equals(currentSort)) ? "-8" : "8";
@@ -597,7 +597,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (showSort)
out.write("");
}
- out.write("
\n
");
+ out.write("
\n
");
if (_manager.util().connected() && !snarks.isEmpty()) {
if (showSort) {
sort = ("9".equals(currentSort)) ? "-9" : "9";
@@ -612,7 +612,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (showSort)
out.write("");
}
- out.write("
\n
");
+ out.write("
\n
");
if (_manager.isStopping()) {
out.write(" ");
@@ -674,13 +674,12 @@ public class I2PSnarkServlet extends BasicServlet {
if (total == 0) {
out.write("
");
out.write("");
out.write(_t("Totals"));
out.write(": ");
@@ -695,32 +694,34 @@ public class I2PSnarkServlet extends BasicServlet {
if (dht != null) {
int dhts = dht.size();
if (dhts > 0) {
- out.write(", ");
+ out.write(", ");
out.write(ngettext("1 DHT peer", "{0} DHT peers", dhts));
+ out.write("");
}
}
String IPString = _manager.util().getOurIPString();
if(!IPString.equals("unknown")) {
// Only truncate if it's an actual dest
- out.write("; ");
+ out.write("; ");
out.write(_t("Dest"));
out.write(": ");
out.write(IPString.substring(0, 4));
- out.write("");
+ out.write("");
}
out.write("");
out.write("
\n");
if (_manager.util().connected() && total > 0) {
- out.write("
" + formatSize(stats[0]) + "
\n" +
- "
" + formatSize(stats[1]) + "
\n" +
- "
" + formatSize(stats[2]) + "ps
\n" +
- "
" + formatSize(stats[3]) + "ps
\n" +
- "
");
+ out.write("
" + formatSize(stats[0]) + "
\n" +
+ "
" + formatSize(stats[1]) + "
\n" +
+ "
" + formatSize(stats[2]) + "ps
\n" +
+ "
" + formatSize(stats[3]) + "ps
\n" +
+ "
");
} else {
out.write("
");
}
+ // TODO javascript handler to remember checkbox status for debug panel visibility (otherwise resets with ajax/meta refresh)
if (dht != null) {
if (showDebug) {
out.write("
\n
");
@@ -1582,11 +1583,14 @@ public class I2PSnarkServlet extends BasicServlet {
String txt;
if (remaining == 0) {
img = "seeding";
- txt = _t("Seeding");
+ txt = _t("Seeding to {0} of {1} peers in swarm", curPeers, knownPeers);
} else {
// partial
img = "complete";
txt = _t("Complete");
+ if (curPeers > 0) {
+ txt = txt + " (" + _t("Seeding to {0} of {1} peers in swarm", curPeers, knownPeers) + ")";
+ }
}
if (curPeers > 0 && !showPeers) {
statusString = toThemeImg(img, "", txt) + "" +
@@ -1606,29 +1610,29 @@ public class I2PSnarkServlet extends BasicServlet {
}
} else {
if (isRunning && curPeers > 0 && downBps > 0 && !showPeers) {
- statusString = toThemeImg("downloading", "", _t("OK")) + "" +
+ statusString = toThemeImg("downloading", "", _t("OK") + " (" + _t("Downloading from {0} of {1} peers in swarm", curPeers, knownPeers) + ")") + "" +
"
" +
+ statusString = toThemeImg("nopeers", "", _t("No Peers") + " (" + _t("Connected to {0} of {1} peers in swarm", curPeers, knownPeers) + ")") + "" +
"
" + _t("No Peers") +
": 0" + thinsp(noThinsp) + knownPeers ;
} else if (isRunning) {
@@ -1641,11 +1645,11 @@ public class I2PSnarkServlet extends BasicServlet {
}
out.write("
");
- out.write("
");
+ out.write("
");
out.write(statusString + "
\n\t");
// (i) icon column
- out.write("
");
+ out.write("
");
if (isValid) {
String announce = meta.getAnnounce();
if (announce == null)
@@ -1660,7 +1664,7 @@ public class I2PSnarkServlet extends BasicServlet {
String encodedBaseName = encodePath(fullBasename);
// File type icon column
- out.write("
\n
");
+ out.write("
\n
");
if (isValid) {
// Link to local details page - note that trailing slash on a single-file torrent
// gets us to the details page instead of the file.
@@ -1845,7 +1849,7 @@ public class I2PSnarkServlet extends BasicServlet {
for (Peer peer : peers) {
if (!peer.isConnected())
continue;
- out.write("
");
PeerID pid = peer.getPeerID();
@@ -1877,9 +1881,9 @@ public class I2PSnarkServlet extends BasicServlet {
if (showDebug)
out.write(" inactive " + (peer.getInactiveTime() / 1000) + "s");
out.write("
\n\t");
- out.write("
");
+ out.write("
");
out.write("
\n\t");
- out.write("
");
+ out.write("
");
float pct;
if (isValid) {
pct = (float) (100.0 * peer.completed() / meta.getPieces());
@@ -1900,9 +1904,9 @@ public class I2PSnarkServlet extends BasicServlet {
//out.write("??");
}
out.write("
\n\t");
- out.write("
");
+ out.write("
");
out.write("
\n\t");
- out.write("
");
+ out.write("
");
if (needed > 0) {
if (peer.isInteresting() && !peer.isChoked()) {
out.write("");
@@ -1924,7 +1928,7 @@ public class I2PSnarkServlet extends BasicServlet {
//}
}
out.write("
\n\t");
- out.write("
");
+ out.write("
");
if (isValid && pct < 100.0) {
if (peer.isInterested() && !peer.isChoking()) {
out.write("");
@@ -1940,10 +1944,10 @@ public class I2PSnarkServlet extends BasicServlet {
}
}
out.write("
\n\t");
- out.write("
");
+ out.write("
");
out.write("
\n\t");
if (showDebug)
- out.write("
" + peer.getSocket() + "
");
+ out.write("
" + peer.getSocket() + "
");
}
}
}
@@ -2448,11 +2452,8 @@ public class I2PSnarkServlet extends BasicServlet {
out.write(_t("Comment Author"));
out.write(":
" +
- "
\n");
+ out.write(_t("Set the author name for your comments and ratings"));
+ out.write("\" >\n");
// "
");
//out.write(_t("Open tracker announce URLs"));
@@ -2923,9 +2924,9 @@ public class I2PSnarkServlet extends BasicServlet {
toThemeImg(buf, "details");
buf.append("
");
+ buf.append("");
if (showPriority) {
buf.append("
");
if ((!complete) && (!item.isDirectory())) {
@@ -3413,7 +3414,7 @@ public class I2PSnarkServlet extends BasicServlet {
}
buf.append("
");
}
- buf.append("
\n");
+ buf.append("\n");
}
if (showSaveButton) {
buf.append("
" +
@@ -3449,17 +3450,23 @@ public class I2PSnarkServlet extends BasicServlet {
int myRating = 0;
CommentSet comments = snark.getComments();
- buf.append("
")
+ buf.append("
\n
")
.append(_t("Ratings and Comments"));
if (esc && _manager.util().getCommentsName().length() == 0) {
buf.append(" ");
- buf.append(_t("Author name required to post comments"));
+ buf.append(_t("Author name required to rate or comment"));
buf.append(" ");
buf.append(_t("[Configure]"));
buf.append("");
+ } else {
+ buf.append(" ");
+ buf.append(DataHelper.escapeHTML(_manager.util().getCommentsName()));
+ buf.append("");
}
- buf.append("
");
+ buf.append("
\n
");
buf.append(_t("Comments"));
buf.append(":
");
+ buf.append("\n");
+
+ // new rating / comment form
+ buf.append("
\n");
+ if (er) {
+ buf.append("
\n\n
");
+ }
+ if (esc) {
+ buf.append("
");
+ } else {
+ buf.append("
");
+ }
+ buf.append("
\n");
+ buf.append("
\n");
if (comments != null) {
synchronized(comments) {
@@ -3501,7 +3541,7 @@ public class I2PSnarkServlet extends BasicServlet {
} else {
buf.append(_t("Average Rating")).append(":
");
- buf.append(_t("No community ratings currently available for this torrent"));
+ buf.append(_t("No community ratings currently available"));
}
buf.append("
");
}
@@ -3513,38 +3553,7 @@ public class I2PSnarkServlet extends BasicServlet {
}
}
- // new rating / comment form
- buf.append("
");
- if (er) {
- buf.append("
");
- }
- if (esc) {
- buf.append("
");
- } else {
- buf.append("
");
- }
- buf.append("
\n");
- buf.append("
");
+ buf.append("
");
// TODO disable / enable comments for this torrent
// existing ratings / comments table
int ccount = 0;
@@ -3553,19 +3562,6 @@ public class I2PSnarkServlet extends BasicServlet {
fmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
buf.append("
");
- // TODO Make .commentText and .commentDelete columns display only when comments are enabled
- // buf.append("