echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed text headings and status text from main snark page to reduce visual clutter

Browse Source 
The header icons are self-explanatory (but tooltip also has header text); the
status text is available from the tooltip.
This commit is contained in:
str4d
2012-07-19 21:39:17 +00:00
parent 2b8b406f9d
commit ecdaa6f2b3
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -337,8 +337,7 @@ public class I2PSnarkServlet extends DefaultServlet {
out.write(_("Status")); out.write(_("Status"));
out.write("\" alt=\""); out.write("\" alt=\"");
out.write(_("Status")); out.write(_("Status"));
out.write("\"> "); out.write("\">");
out.write(_("Status"));
if (_manager.util().connected() && !snarks.isEmpty()) { if (_manager.util().connected() && !snarks.isEmpty()) {
out.write(" <a href=\"/i2psnark/"); out.write(" <a href=\"/i2psnark/");
if (peerParam != null) { if (peerParam != null) {
@ -363,48 +362,49 @@ public class I2PSnarkServlet extends DefaultServlet {
out.write(_("Torrent")); out.write(_("Torrent"));
out.write("\" alt=\""); out.write("\" alt=\"");
out.write(_("Torrent")); out.write(_("Torrent"));
out.write("\"> "); out.write("\">");
out.write(_("Torrent"));
out.write("</th>\n<th align=\"right\">"); out.write("</th>\n<th align=\"right\">");
if (_manager.util().connected() && !snarks.isEmpty()) { if (_manager.util().connected() && !snarks.isEmpty()) {
out.write("<img border=\"0\" src=\"" + _imgPath + "eta.png\" alt=\"\" title=\""); out.write("<img border=\"0\" src=\"" + _imgPath + "eta.png\" title=\"");
out.write(_("Estimated time remaining")); out.write(_("Estimated time remaining"));
out.write("\">"); out.write("\" alt=\"");
// Translators: Please keep short or translate as " " // Translators: Please keep short or translate as " "
out.write(_("ETA")); out.write(_("ETA"));
out.write("\">");
} }
out.write("</th>\n<th align=\"right\">"); out.write("</th>\n<th align=\"right\">");
out.write("<img border=\"0\" src=\"" + _imgPath + "head_rx.png\" alt=\"\" title=\""); out.write("<img border=\"0\" src=\"" + _imgPath + "head_rx.png\" title=\"");
out.write(_("Downloaded")); out.write(_("Downloaded"));
out.write("\">"); out.write("\" alt=\"");
// Translators: Please keep short or translate as " " // Translators: Please keep short or translate as " "
out.write(_("RX")); out.write(_("RX"));
out.write("\">");
out.write("</th>\n<th align=\"right\">"); out.write("</th>\n<th align=\"right\">");
if (_manager.util().connected() && !snarks.isEmpty()) { if (_manager.util().connected() && !snarks.isEmpty()) {
out.write("<img border=\"0\" src=\"" + _imgPath + "head_tx.png\" alt=\"\" title=\""); out.write("<img border=\"0\" src=\"" + _imgPath + "head_tx.png\" title=\"");
out.write(_("Uploaded")); out.write(_("Uploaded"));
out.write("\">"); out.write("\" alt=\"");
// Translators: Please keep short or translate as " " // Translators: Please keep short or translate as " "
out.write(_("TX")); out.write(_("TX"));
out.write("\">");
} }
out.write("</th>\n<th align=\"right\">"); out.write("</th>\n<th align=\"right\">");
if (_manager.util().connected() && !snarks.isEmpty()) { if (_manager.util().connected() && !snarks.isEmpty()) {
out.write("<img border=\"0\" src=\"" + _imgPath + "head_rxspeed.png\" title=\""); out.write("<img border=\"0\" src=\"" + _imgPath + "head_rxspeed.png\" title=\"");
out.write(_("Down Rate")); out.write(_("Down Rate"));
out.write("\" alt=\""); out.write("\" alt=\"");
out.write(_("RX"));
out.write(" \">");
// Translators: Please keep short or translate as " " // Translators: Please keep short or translate as " "
out.write(_("Rate")); out.write(_("RX Rate"));
out.write(" \">");
} }
out.write("</th>\n<th align=\"right\">"); out.write("</th>\n<th align=\"right\">");
if (_manager.util().connected() && !snarks.isEmpty()) { if (_manager.util().connected() && !snarks.isEmpty()) {
out.write("<img border=\"0\" src=\"" + _imgPath + "head_txspeed.png\" title=\""); out.write("<img border=\"0\" src=\"" + _imgPath + "head_txspeed.png\" title=\"");
out.write(_("Up Rate")); out.write(_("Up Rate"));
out.write("\" alt=\""); out.write("\" alt=\"");
out.write(_("TX")); // Translators: Please keep short or translate as " "
out.write(_("TX Rate"));
out.write(" \">"); out.write(" \">");
out.write(_("Rate"));
} }
out.write("</th>\n<th align=\"center\">"); out.write("</th>\n<th align=\"center\">");
@ -973,25 +973,24 @@ public class I2PSnarkServlet extends DefaultServlet {
if (err != null) { if (err != null) {
if (isRunning && curPeers > 0 && !showPeers) if (isRunning && curPeers > 0 && !showPeers)
statusString = "<img border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\" alt=\"" + _("Tracker Error") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\" alt=\"" + _("Tracker Error") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Tracker Error") + "<td class=\"snarkTorrentStatus " + rowClass + "\">" +
": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" + "<a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" +
curPeers + thinsp(noThinsp) + curPeers + thinsp(noThinsp) +
ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
else if (isRunning) else if (isRunning)
statusString = "<img border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\" alt=\"" + _("Tracker Error") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\" alt=\"" + _("Tracker Error") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Tracker Error") + "<td class=\"snarkTorrentStatus " + rowClass + "\">" +
": " + curPeers + thinsp(noThinsp) + curPeers + thinsp(noThinsp) +
ngettext("1 peer", "{0} peers", knownPeers); ngettext("1 peer", "{0} peers", knownPeers);
else { else {
if (err.length() > MAX_DISPLAYED_ERROR_LENGTH) if (err.length() > MAX_DISPLAYED_ERROR_LENGTH)
err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "&hellip;"; err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "&hellip;";
statusString = "<img border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\" alt=\"" + _("Tracker Error") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\" alt=\"" + _("Tracker Error") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Tracker Error") + "<td class=\"snarkTorrentStatus " + rowClass + "\">";
"<br>" + err;
} }
} else if (snark.isStarting()) { } else if (snark.isStarting()) {
statusString = "<img border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Starting") + "\" alt=\"" + _("Starting") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Starting") + "\" alt=\"" + _("Starting") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Starting"); "<td class=\"snarkTorrentStatus " + rowClass + "\">";
} else if (remaining == 0 || needed == 0) { // < 0 means no meta size yet } else if (remaining == 0 || needed == 0) { // < 0 means no meta size yet
// partial complete or seeding // partial complete or seeding
if (isRunning) { if (isRunning) {
@ -1007,52 +1006,52 @@ public class I2PSnarkServlet extends DefaultServlet {
} }
if (curPeers > 0 && !showPeers) if (curPeers > 0 && !showPeers)
statusString = "<img border=\"0\" src=\"" + _imgPath + img + ".png\" title=\"" + txt + "\" alt=\"" + txt + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + img + ".png\" title=\"" + txt + "\" alt=\"" + txt + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + txt + "<td class=\"snarkTorrentStatus " + rowClass + "\">" +
": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" + "<a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" +
curPeers + thinsp(noThinsp) + curPeers + thinsp(noThinsp) +
ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
else else
statusString = "<img border=\"0\" src=\"" + _imgPath + img + ".png\" title=\"" + txt + "\" alt=\"" + txt + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + img + ".png\" title=\"" + txt + "\" alt=\"" + txt + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + txt + "<td class=\"snarkTorrentStatus " + rowClass + "\">" +
": " + curPeers + thinsp(noThinsp) + curPeers + thinsp(noThinsp) +
ngettext("1 peer", "{0} peers", knownPeers); ngettext("1 peer", "{0} peers", knownPeers);
} else { } else {
statusString = "<img border=\"0\" src=\"" + _imgPath + "complete.png\" title=\"" + _("Complete") + "\" alt=\"" + _("Complete") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "complete.png\" title=\"" + _("Complete") + "\" alt=\"" + _("Complete") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Complete"); "<td class=\"snarkTorrentStatus " + rowClass + "\">";
} }
} else { } else {
if (isRunning && curPeers > 0 && downBps > 0 && !showPeers) if (isRunning && curPeers > 0 && downBps > 0 && !showPeers)
statusString = "<img border=\"0\" src=\"" + _imgPath + "downloading.png\" title=\"" + _("OK") + "\" alt=\"" + _("OK") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "downloading.png\" title=\"" + _("OK") + "\" alt=\"" + _("OK") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("OK") + "<td class=\"snarkTorrentStatus " + rowClass + "\">" +
": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" + "<a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" +
curPeers + thinsp(noThinsp) + curPeers + thinsp(noThinsp) +
ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
else if (isRunning && curPeers > 0 && downBps > 0) else if (isRunning && curPeers > 0 && downBps > 0)
statusString = "<img border=\"0\" src=\"" + _imgPath + "downloading.png\" title=\"" + _("OK") + "\" alt=\"" + _("OK") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "downloading.png\" title=\"" + _("OK") + "\" alt=\"" + _("OK") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("OK") + "<td class=\"snarkTorrentStatus " + rowClass + "\">" +
": " + curPeers + thinsp(noThinsp) + curPeers + thinsp(noThinsp) +
ngettext("1 peer", "{0} peers", knownPeers); ngettext("1 peer", "{0} peers", knownPeers);
else if (isRunning && curPeers > 0 && !showPeers) else if (isRunning && curPeers > 0 && !showPeers)
statusString = "<img border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Stalled") + "\" alt=\"" + _("Stalled") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Stalled") + "\" alt=\"" + _("Stalled") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Stalled") + "<td class=\"snarkTorrentStatus " + rowClass + "\">" +
": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" + "<a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" +
curPeers + thinsp(noThinsp) + curPeers + thinsp(noThinsp) +
ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; ngettext("1 peer", "{0} peers", knownPeers) + "</a>";
else if (isRunning && curPeers > 0) else if (isRunning && curPeers > 0)
statusString = "<img border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Stalled") + "\" alt=\"" + _("Stalled") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "stalled.png\" title=\"" + _("Stalled") + "\" alt=\"" + _("Stalled") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Stalled") + "<td class=\"snarkTorrentStatus " + rowClass + "\">" +
": " + curPeers + thinsp(noThinsp) + curPeers + thinsp(noThinsp) +
ngettext("1 peer", "{0} peers", knownPeers); ngettext("1 peer", "{0} peers", knownPeers);
else if (isRunning && knownPeers > 0) else if (isRunning && knownPeers > 0)
statusString = "<img border=\"0\" src=\"" + _imgPath + "nopeers.png\" title=\"" + _("No Peers") + "\" alt=\"" + _("No Peers") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "nopeers.png\" title=\"" + _("No Peers") + "\" alt=\"" + _("No Peers") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("No Peers") + "<td class=\"snarkTorrentStatus " + rowClass + "\">" +
": 0" + thinsp(noThinsp) + knownPeers ; "0" + thinsp(noThinsp) + knownPeers ;
else if (isRunning) else if (isRunning)
statusString = "<img border=\"0\" src=\"" + _imgPath + "nopeers.png\" title=\"" + _("No Peers") + "\" alt=\"" + _("No Peers") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "nopeers.png\" title=\"" + _("No Peers") + "\" alt=\"" + _("No Peers") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("No Peers"); "<td class=\"snarkTorrentStatus " + rowClass + "\">";
else else
statusString = "<img border=\"0\" src=\"" + _imgPath + "stopped.png\" title=\"" + _("Stopped") + "\" alt=\"" + _("Stopped") + "\"></td>" + statusString = "<img border=\"0\" src=\"" + _imgPath + "stopped.png\" title=\"" + _("Stopped") + "\" alt=\"" + _("Stopped") + "\"></td>" +
"<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Stopped"); "<td class=\"snarkTorrentStatus " + rowClass + "\">";
} }
out.write("<tr class=\"" + rowClass + "\">"); out.write("<tr class=\"" + rowClass + "\">");