merge of '6cf2d1b2af6daa4fffc59fede3407d3e10c09095'
and '9afc46edd20c72064eb24b5c1f6a4a8540e35799'
z3d
@ -170,7 +170,7 @@ public class I2PSnarkServlet extends Default {
|
|||||||
|
|
||||||
PrintWriter out = resp.getWriter();
|
PrintWriter out = resp.getWriter();
|
||||||
out.write("<html>\n" +
|
out.write("<html>\n" +
|
||||||
"<head><link rel=\"shortcut icon\" href=\"/themes/console/snark/favicon.ico\">\n" +
|
"<head><link rel=\"shortcut icon\" href=\"/themes/snark/ubergine/favicon.ico\">\n" +
|
||||||
"<title>");
|
"<title>");
|
||||||
out.write(_("I2PSnark - Anonymous BitTorrent Client"));
|
out.write(_("I2PSnark - Anonymous BitTorrent Client"));
|
||||||
out.write("</title>\n");
|
out.write("</title>\n");
|
||||||
@ -191,7 +191,8 @@ public class I2PSnarkServlet extends Default {
|
|||||||
out.write("<div class=\"snarknavbar\"><a href=\"" + req.getRequestURI() + peerString + "\" title=\"");
|
out.write("<div class=\"snarknavbar\"><a href=\"" + req.getRequestURI() + peerString + "\" title=\"");
|
||||||
out.write(_("Refresh page"));
|
out.write(_("Refresh page"));
|
||||||
out.write("\" class=\"snarkRefresh\">");
|
out.write("\" class=\"snarkRefresh\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/arrow_refresh.png\"> I2PSnark"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/arrow_refresh.png\"> ");
|
||||||
|
out.write(_("I2PSnark"));
|
||||||
out.write("</a> <a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\" target=\"_blank\">");
|
out.write("</a> <a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\" target=\"_blank\">");
|
||||||
out.write(_("Forum"));
|
out.write(_("Forum"));
|
||||||
out.write("</a>\n");
|
out.write("</a>\n");
|
||||||
@ -238,47 +239,78 @@ public class I2PSnarkServlet extends Default {
|
|||||||
List snarks = getSortedSnarks(req);
|
List snarks = getSortedSnarks(req);
|
||||||
String uri = req.getRequestURI();
|
String uri = req.getRequestURI();
|
||||||
out.write(TABLE_HEADER);
|
out.write(TABLE_HEADER);
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/status.png\" title=\"Torrent Status\">Status"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/status.png\" >");
|
||||||
|
out.write("title=\"");
|
||||||
|
out.write(_("Torrent Status"));
|
||||||
|
out.write("\">");
|
||||||
if (_manager.util().connected() && !snarks.isEmpty()) {
|
if (_manager.util().connected() && !snarks.isEmpty()) {
|
||||||
out.write(" » <a href=\"");
|
out.write(" » <a href=\"");
|
||||||
out.write(req.getRequestURI());
|
out.write(req.getRequestURI());
|
||||||
if (peerParam != null) {
|
if (peerParam != null) {
|
||||||
out.write("\">");
|
out.write("\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/showpeers.png\" title=\"Toggle Peer Visibility\" alt=\"Hide Peers\">"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/showpeers.png\" title=\"");
|
||||||
|
out.write(_("Toggle Peer Visibility"));
|
||||||
|
out.write(" alt=\"Hide Peers\">");
|
||||||
|
out.write(_("Hide Peers"));
|
||||||
|
out.write("\">");
|
||||||
} else {
|
} else {
|
||||||
out.write("?p=1\">");
|
out.write("?p=1\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/hidepeers.png\" title=\"Toggle Peer Visibility\" alt=\"Show Peers\">"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/hidepeers.png\" title=\"");
|
||||||
|
out.write(_("Toggle Peer Visibility"));
|
||||||
|
out.write("\" alt=\"Show Peers\">");
|
||||||
}
|
}
|
||||||
out.write("</a><br>\n");
|
out.write("</a><br>\n");
|
||||||
}
|
}
|
||||||
out.write("</th>\n<th align=\"left\">");
|
out.write("</th>\n<th align=\"left\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/torrent.png\" title=\"Loaded Torrents\">Torrent"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/torrent.png\" title=\"");
|
||||||
|
out.write(_("Loaded Torrents"));
|
||||||
|
out.write("\">");
|
||||||
|
out.write(_("Torrent"));
|
||||||
out.write("</th>\n<th align=\"center\">");
|
out.write("</th>\n<th align=\"center\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/eta.png\" title=\"Estimated Download Time\">ETA"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/eta.png\" title=\"");
|
||||||
|
out.write(_("Estimated Download Time"));
|
||||||
|
out.write("\">");
|
||||||
|
out.write(_("ETA"));
|
||||||
out.write("</th>\n<th align=\"center\">");
|
out.write("</th>\n<th align=\"center\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/images/inbound.png\" title=\"Data Downloaded\">RX"));
|
out.write("<img border=\"0\" src=\"/themes/console/images/inbound.png\" title=\"");
|
||||||
|
out.write(_("Data Downloaded"));
|
||||||
|
out.write("\">");
|
||||||
|
out.write(_("RX"));
|
||||||
out.write("</th>\n<th align=\"center\">");
|
out.write("</th>\n<th align=\"center\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/images/outbound.png\" title=\"Data Uploaded\">TX"));
|
out.write("<img border=\"0\" src=\"/themes/console/images/outbound.png\" title=\"");
|
||||||
|
out.write(_("Data Uploaded"));
|
||||||
|
out.write("\">");
|
||||||
|
out.write(_("TX"));
|
||||||
out.write("</th>\n<th align=\"center\">");
|
out.write("</th>\n<th align=\"center\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/images/inbound.png\" title=\"Download Speed\">Rate"));
|
out.write("<img border=\"0\" src=\"/themes/console/images/inbound.png\" title=\"");
|
||||||
|
out.write(_("Download Speed"));
|
||||||
|
out.write("\">Rate");
|
||||||
out.write("</th>\n<th align=\"center\">");
|
out.write("</th>\n<th align=\"center\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/images/outbound.png\" title=\"Upload Speed\">Rate"));
|
out.write("<img border=\"0\" src=\"/themes/console/images/outbound.png\" title=\"");
|
||||||
|
out.write(_("Upload Speed"));
|
||||||
|
out.write("\">");
|
||||||
|
out.write(_("Rate"));
|
||||||
out.write("</th>\n");
|
out.write("</th>\n");
|
||||||
|
|
||||||
out.write("<th align=\"center\">");
|
out.write("<th align=\"center\">");
|
||||||
if (_manager.util().connected()) {
|
if (_manager.util().connected()) {
|
||||||
out.write("<a href=\"" + uri + "?action=StopAll&nonce=" + _nonce +
|
out.write("<a href=\"" + uri + "?action=StopAll&nonce=" + _nonce +
|
||||||
"\" title=\"");
|
"\" title=\"");
|
||||||
out.write(_("Stop all torrents and the I2P tunnel"));
|
out.write(_("Stop all torrents and the I2P tunnel"));
|
||||||
out.write("\">");
|
out.write("\">");
|
||||||
out.write(_("<img src=\"/themes/console/snark/images/stop_all.png\" title=\"Stop All Torrents\" alt=\"Stop All\">"));
|
out.write("<img src=\"/themes/snark/ubergine/images/stop_all.png\" title=\"");
|
||||||
|
out.write(_("Stop All Torrents"));
|
||||||
|
out.write("\" alt=\"");
|
||||||
|
out.write(_("Stop All"));
|
||||||
|
out.write("\">");
|
||||||
out.write("</a>");
|
out.write("</a>");
|
||||||
} else if (!snarks.isEmpty()) {
|
} else if (!snarks.isEmpty()) {
|
||||||
out.write("<a href=\"" + uri + "?action=StartAll&nonce=" + _nonce +
|
out.write("<a href=\"" + uri + "?action=StartAll&nonce=" + _nonce +
|
||||||
"\" title=\"");
|
"\" title=\"");
|
||||||
out.write(_("Start all torrents and the I2P tunnel"));
|
out.write(_("Start all torrents and the I2P tunnel"));
|
||||||
out.write("\">");
|
out.write("\">");
|
||||||
out.write(_("<img src=\"/themes/console/snark/images/start_all.png\" title=\"Start All Torrents\" alt=\"Start All\">"));
|
out.write("<img src=\"/themes/snark/ubergine/images/start_all.png\" title=\"");
|
||||||
|
out.write(_("Start All Torrents"));
|
||||||
|
out.write("\" alt=\"Start All\">");
|
||||||
out.write("</a>");
|
out.write("</a>");
|
||||||
} else {
|
} else {
|
||||||
out.write(" ");
|
out.write(" ");
|
||||||
@ -749,7 +781,7 @@ public class I2PSnarkServlet extends Default {
|
|||||||
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(TrackerClient.urlencode(snark.meta.getInfoHash()));
|
||||||
out.write("\" title=\"" + name + ' ' + _("Tracker") + "\" target=\"_blank\">");
|
out.write("\" title=\"" + name + ' ' + _("Tracker") + "\" target=\"_blank\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/details.png\">"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/details.png\">");
|
||||||
out.write("</a>");
|
out.write("</a>");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -785,7 +817,11 @@ public class I2PSnarkServlet extends Default {
|
|||||||
+ "\" title=\"");
|
+ "\" title=\"");
|
||||||
out.write(_("Stop the torrent"));
|
out.write(_("Stop the torrent"));
|
||||||
out.write("\">");
|
out.write("\">");
|
||||||
out.write(_("<img src=\"/themes/console/snark/images/stop.png\" title=\"Stop Torrent\" alt=\"Stop\">"));
|
out.write("<img src=\"/themes/snark/ubergine/images/stop.png\" title=\"");
|
||||||
|
out.write(_("Stop Torrent"));
|
||||||
|
out.write("\" alt=\"");
|
||||||
|
out.write(_("Stop"));
|
||||||
|
out.write("\">");
|
||||||
out.write("</a>");
|
out.write("</a>");
|
||||||
} else {
|
} else {
|
||||||
if (isValid) {
|
if (isValid) {
|
||||||
@ -793,7 +829,11 @@ public class I2PSnarkServlet extends Default {
|
|||||||
+ "\" title=\"");
|
+ "\" title=\"");
|
||||||
out.write(_("Start the torrent"));
|
out.write(_("Start the torrent"));
|
||||||
out.write("\">");
|
out.write("\">");
|
||||||
out.write(_("<img src=\"/themes/console/snark/images/start.png\" title=\"Start Torrent\" alt=\"Start\">"));
|
out.write("<img src=\"/themes/snark/ubergine/images/start.png\" title=\"");
|
||||||
|
out.write(_("Start Torrent"));
|
||||||
|
out.write("\" alt=\"");
|
||||||
|
out.write(_("Start"));
|
||||||
|
out.write("\">");
|
||||||
out.write("</a>");
|
out.write("</a>");
|
||||||
}
|
}
|
||||||
out.write("<a href=\"" + uri + "?action=Remove" + parameters
|
out.write("<a href=\"" + uri + "?action=Remove" + parameters
|
||||||
@ -805,7 +845,11 @@ public class I2PSnarkServlet extends Default {
|
|||||||
// Then the remaining single quite must be escaped
|
// Then the remaining single quite must be escaped
|
||||||
out.write(_("Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded data will not be deleted) ?", fullFilename));
|
out.write(_("Are you sure you want to delete the file \\''{0}.torrent\\'' (downloaded data will not be deleted) ?", fullFilename));
|
||||||
out.write("')) { return false; }\">");
|
out.write("')) { return false; }\">");
|
||||||
out.write(_("<img src=\"/themes/console/snark/images/remove.png\" title=\"Remove Torrent\" alt=\"Remove\">"));
|
out.write("<img src=\"/themes/snark/ubergine/images/remove.png\" title=\"");
|
||||||
|
out.write(_("Remove Torrent"));
|
||||||
|
out.write("\" alt=\"");
|
||||||
|
out.write(_("Remove"));
|
||||||
|
out.write("\">");
|
||||||
out.write("</a>");
|
out.write("</a>");
|
||||||
out.write("<a href=\"" + uri + "?action=Delete" + parameters
|
out.write("<a href=\"" + uri + "?action=Delete" + parameters
|
||||||
+ "\" title=\"");
|
+ "\" title=\"");
|
||||||
@ -816,7 +860,11 @@ public class I2PSnarkServlet extends Default {
|
|||||||
// Then the remaining single quite must be escaped
|
// Then the remaining single quite must be escaped
|
||||||
out.write(_("Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?", fullFilename));
|
out.write(_("Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?", fullFilename));
|
||||||
out.write("')) { return false; }\">");
|
out.write("')) { return false; }\">");
|
||||||
out.write(_("<img src=\"/themes/console/snark/images/delete.png\" title=\"Delete Torrent + Data\" alt=\"Delete\">"));
|
out.write("<img src=\"/themes/snark/ubergine/images/delete.png\" title=\"");
|
||||||
|
out.write(_("Delete Torrent + Data"));
|
||||||
|
out.write("\" alt=\"");
|
||||||
|
out.write(_("Delete"));
|
||||||
|
out.write("\">");
|
||||||
out.write("</a>");
|
out.write("</a>");
|
||||||
}
|
}
|
||||||
out.write("</td>\n</tr>\n");
|
out.write("</td>\n</tr>\n");
|
||||||
@ -938,7 +986,8 @@ public class I2PSnarkServlet extends Default {
|
|||||||
out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n");
|
out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n");
|
||||||
out.write("<input type=\"hidden\" name=\"action\" value=\"Add\" >\n");
|
out.write("<input type=\"hidden\" name=\"action\" value=\"Add\" >\n");
|
||||||
out.write("<div class=\"addtorrentsection\"><span class=\"snarkConfigTitle\">");
|
out.write("<div class=\"addtorrentsection\"><span class=\"snarkConfigTitle\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/add.png\">Add Torrent"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/add.png\">");
|
||||||
|
out.write(_("Add Torrent"));
|
||||||
out.write("</span><hr>\n<table border=\"0\"><tr><td>");
|
out.write("</span><hr>\n<table border=\"0\"><tr><td>");
|
||||||
out.write(_("From URL"));
|
out.write(_("From URL"));
|
||||||
out.write(":<td><input type=\"text\" name=\"newURL\" size=\"85\" value=\"" + newURL + "\" > \n");
|
out.write(":<td><input type=\"text\" name=\"newURL\" size=\"85\" value=\"" + newURL + "\" > \n");
|
||||||
@ -969,7 +1018,8 @@ public class I2PSnarkServlet extends Default {
|
|||||||
out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n");
|
out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n");
|
||||||
out.write("<input type=\"hidden\" name=\"action\" value=\"Create\" >\n");
|
out.write("<input type=\"hidden\" name=\"action\" value=\"Create\" >\n");
|
||||||
out.write("<span class=\"snarkConfigTitle\">");
|
out.write("<span class=\"snarkConfigTitle\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/create.png\">Create Torrent"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/create.png\">");
|
||||||
|
out.write(_("Create Torrent"));
|
||||||
out.write("</span><hr>\n<table border=\"0\"><tr><td>");
|
out.write("</span><hr>\n<table border=\"0\"><tr><td>");
|
||||||
//out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
|
//out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
|
||||||
out.write(_("Data to seed"));
|
out.write(_("Data to seed"));
|
||||||
@ -1017,7 +1067,8 @@ public class I2PSnarkServlet extends Default {
|
|||||||
out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n");
|
out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" >\n");
|
||||||
out.write("<input type=\"hidden\" name=\"action\" value=\"Save\" >\n");
|
out.write("<input type=\"hidden\" name=\"action\" value=\"Save\" >\n");
|
||||||
out.write("<span class=\"snarkConfigTitle\">");
|
out.write("<span class=\"snarkConfigTitle\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/config.png\">Configuration"));
|
out.write("<img border=\"0\" src=\"/themes/snark/ubergine/images/config.png\">");
|
||||||
|
out.write(_("Configuration"));
|
||||||
out.write("</span><hr>\n");
|
out.write("</span><hr>\n");
|
||||||
out.write("<table border=\"0\"><tr><td>");
|
out.write("<table border=\"0\"><tr><td>");
|
||||||
out.write(_("Data directory"));
|
out.write(_("Data directory"));
|
||||||
@ -1144,7 +1195,7 @@ public class I2PSnarkServlet extends Default {
|
|||||||
private void writeConfigLink(PrintWriter out) throws IOException {
|
private void writeConfigLink(PrintWriter out) throws IOException {
|
||||||
out.write("<div class=\"configsection\"><span class=\"snarkConfig\">\n");
|
out.write("<div class=\"configsection\"><span class=\"snarkConfig\">\n");
|
||||||
out.write("<span class=\"snarkConfigTitle\"><a href=\"configure\">");
|
out.write("<span class=\"snarkConfigTitle\"><a href=\"configure\">");
|
||||||
out.write(_("<img border=\"0\" src=\"/themes/console/snark/images/config.png\">Configuration"));
|
out.write(_("<img border=\"0\" src=\"/themes/snark/ubergine/images/config.png\">Configuration"));
|
||||||
out.write("</a></span></span></div>\n");
|
out.write("</a></span></span></div>\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1217,7 +1268,7 @@ public class I2PSnarkServlet extends Default {
|
|||||||
return buf.toString();
|
return buf.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final String HEADER = "<link href=\"/themes/console/snark/snark.css\" rel=\"stylesheet\" type=\"text/css\" >";
|
private static final String HEADER = "<link href=\"/themes/snark/ubergine/snark.css\" rel=\"stylesheet\" type=\"text/css\" >";
|
||||||
|
|
||||||
|
|
||||||
private static final String TABLE_HEADER = "<table border=\"0\" class=\"snarkTorrents\" width=\"100%\" cellpadding=\"0 10px\">\n" +
|
private static final String TABLE_HEADER = "<table border=\"0\" class=\"snarkTorrents\" width=\"100%\" cellpadding=\"0 10px\">\n" +
|
||||||
@ -1284,13 +1335,13 @@ public class I2PSnarkServlet extends Default {
|
|||||||
title = title.substring(0, title.length() - 1);
|
title = title.substring(0, title.length() - 1);
|
||||||
title = _("Torrent") + ": " + title;
|
title = _("Torrent") + ": " + title;
|
||||||
buf.append(title);
|
buf.append(title);
|
||||||
buf.append("</TITLE>").append(HEADER).append("<link rel=\"shortcut icon\" href=\"/themes/console/snark/favicon.ico\"></HEAD><BODY>\n<div class=\"snarknavbar\"> <a href=\"/i2psnark/\" title=\"Torrents\"");
|
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\">I2PSnark</a>").append("</div>");
|
||||||
|
|
||||||
buf.append("<div class=\"page\"><div class=\"mainsection\">" +
|
buf.append("<div class=\"page\"><div class=\"mainsection\">" +
|
||||||
"<TABLE BORDER=0 class=\"snarkTorrents\" cellpadding=\"5px 10px\">" +
|
"<TABLE BORDER=0 class=\"snarkTorrents\" cellpadding=\"5px 10px\">" +
|
||||||
"<thead><tr><th>").append(_("<img border=\"0\" src=\"/themes/console/snark/images/file.png\" title=\"File\" alt=\"File\"> ")).append(title).append("</th><th>").append(_("<img border=\"0\" src=\"/themes/console/snark/images/size.png\" title=\"FileSize\" alt=\"FileSize\">Size"))
|
"<thead><tr><th>").append("<img border=\"0\" src=\"/themes/snark/ubergine/images/file.png\" title=\"").append(_("File")).append("\" alt=\"").append(_("File")).append("\"> ").append(title).append("</th><th>").append(_("<img border=\"0\" src=\"/themes/snark/ubergine/images/size.png\" title=\"")).append(_("FileSize")).append("\" alt=\"").append(_("FileSize")).append("\">").append(_("Size"));
|
||||||
.append("</th><th>").append(_("<img border=\"0\" src=\"/themes/console/snark/images/status.png\" title=\"Download Status\">Status")).append("</th></tr></thead>");
|
buf.append("</th><th>").append("<img border=\"0\" src=\"/themes/snark/ubergine/images/status.png\" title=\"").append(_("Download Status")).append("\">").append(_("Status")).append("</th></tr></thead>");
|
||||||
//DateFormat dfmt=DateFormat.getDateTimeInstance(DateFormat.MEDIUM,
|
//DateFormat dfmt=DateFormat.getDateTimeInstance(DateFormat.MEDIUM,
|
||||||
// DateFormat.MEDIUM);
|
// DateFormat.MEDIUM);
|
||||||
for (int i=0 ; i< ls.length ; i++)
|
for (int i=0 ; i< ls.length ; i++)
|
||||||
@ -1383,7 +1434,7 @@ public class I2PSnarkServlet extends Default {
|
|||||||
// corrupts utf-8
|
// corrupts utf-8
|
||||||
//buf.append(URI.encodePath(URI.addPaths(base,"../")));
|
//buf.append(URI.encodePath(URI.addPaths(base,"../")));
|
||||||
buf.append(URI.addPaths(base,"../"));
|
buf.append(URI.addPaths(base,"../"));
|
||||||
buf.append("\"><img border=\"0\" src=\"/themes/console/snark/images/up.png\"> ")
|
buf.append("\"><img border=\"0\" src=\"/themes/snark/ubergine/images/up.png\"> ")
|
||||||
.append(_("Up to higher level directory")).append("</A></td></tr></thead>\n");
|
.append(_("Up to higher level directory")).append("</A></td></tr></thead>\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1392,7 +1443,7 @@ public class I2PSnarkServlet extends Default {
|
|||||||
|
|
||||||
|
|
||||||
buf.append("</TABLE>\n");
|
buf.append("</TABLE>\n");
|
||||||
buf.append("</div></div></BODY></HTML>\n");
|
buf.append("</div></div></center></BODY></HTML>\n");
|
||||||
|
|
||||||
return buf.toString();
|
return buf.toString();
|
||||||
}
|
}
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 958 B After Width: | Height: | Size: 659 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 733 B After Width: | Height: | Size: 733 B |
|
Before Width: | Height: | Size: 631 B After Width: | Height: | Size: 631 B |
|
Before Width: | Height: | Size: 584 B After Width: | Height: | Size: 584 B |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 570 B After Width: | Height: | Size: 570 B |
|
Before Width: | Height: | Size: 716 B After Width: | Height: | Size: 716 B |
|
Before Width: | Height: | Size: 778 B After Width: | Height: | Size: 778 B |
|
Before Width: | Height: | Size: 561 B After Width: | Height: | Size: 561 B |
|
Before Width: | Height: | Size: 216 B After Width: | Height: | Size: 216 B |
|
Before Width: | Height: | Size: 571 B After Width: | Height: | Size: 571 B |
BIN
installer/resources/themes/snark/images/hat.png
Normal file
|
After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 921 B After Width: | Height: | Size: 921 B |
|
Before Width: | Height: | Size: 486 B After Width: | Height: | Size: 486 B |
|
Before Width: | Height: | Size: 920 B After Width: | Height: | Size: 920 B |
|
Before Width: | Height: | Size: 454 B After Width: | Height: | Size: 454 B |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 121 B After Width: | Height: | Size: 121 B |
|
Before Width: | Height: | Size: 167 B After Width: | Height: | Size: 167 B |
BIN
installer/resources/themes/snark/images/snarknav_lowlight.png
Normal file
|
After Width: | Height: | Size: 659 B |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 355 B |
|
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 499 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 369 B |
|
Before Width: | Height: | Size: 424 B After Width: | Height: | Size: 424 B |
|
Before Width: | Height: | Size: 1008 B After Width: | Height: | Size: 1008 B |
|
Before Width: | Height: | Size: 156 B After Width: | Height: | Size: 156 B |
|
Before Width: | Height: | Size: 543 B After Width: | Height: | Size: 543 B |
|
Before Width: | Height: | Size: 341 B After Width: | Height: | Size: 341 B |
@ -2,7 +2,7 @@
|
|||||||
/* Guantanamo Commemorative Edition. */
|
/* Guantanamo Commemorative Edition. */
|
||||||
|
|
||||||
body {
|
body {
|
||||||
background: #101 url('/themes/console/snark/images/graytile.png');
|
background: #101 url('/themes/snark/ubergine/images/graytile.png');
|
||||||
color: #001;
|
color: #001;
|
||||||
font: 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
|
font: 8pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
|
||||||
}
|
}
|
||||||
@ -23,8 +23,8 @@ body {
|
|||||||
font-size: 11pt;
|
font-size: 11pt;
|
||||||
color: #f70;
|
color: #f70;
|
||||||
text-shadow: 1px 1px #420;
|
text-shadow: 1px 1px #420;
|
||||||
background: url('/themes/console/snark/images/snarknav_lowlight.png') no-repeat scroll center bottom;
|
background: url('/themes/snark/ubergine/images/snarknav_lowlight.png') no-repeat scroll center bottom;
|
||||||
background: #310 url('/themes/console/snark/images/snarknav_lowlight.png') repeat-x scroll center center;
|
background: #310 url('/themes/snark/ubergine/images/snarknav_on.png') repeat-x scroll center center;
|
||||||
-moz-border-radius: 0px;
|
-moz-border-radius: 0px;
|
||||||
-khtml-border-radius: 3px;
|
-khtml-border-radius: 3px;
|
||||||
border-radius: 0px;
|
border-radius: 0px;
|
||||||
@ -42,8 +42,8 @@ body {
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 11pt;
|
font-size: 11pt;
|
||||||
color: #f50;
|
color: #f50;
|
||||||
background: #310 url('/themes/console/snark/images/snarknav_on.png') repeat-x scroll center center;
|
background: #310 url('/themes/snark/ubergine/images/snarknav_on.png') repeat-x scroll center center;
|
||||||
background: url('/themes/console/snark/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;
|
-moz-border-radius: 0;
|
||||||
-khtml-border-radius: 0;
|
-khtml-border-radius: 0;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
@ -60,20 +60,11 @@ body {
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 11pt;
|
font-size: 11pt;
|
||||||
color: #fb0;
|
color: #fb0;
|
||||||
background: #310 url('/themes/console/snark/images/snarknav_on.png') repeat-x scroll center center;
|
background: #310 url('/themes/snark/ubergine/images/snarknav_on.png') repeat-x scroll center center;
|
||||||
}
|
|
||||||
|
|
||||||
.snarkRefresh:first-child {
|
|
||||||
-moz-border-radius: 0px 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.snarkRefresh:last-child {
|
.snarkRefresh:last-child {
|
||||||
-moz-border-radius: 0 3px 0px 0px;
|
-moz-border-radius: 0 3px 3px 0px;
|
||||||
-khtml-border-radius: 0 3px 0 0;
|
-khtml-border-radius: 0 3px 0 0;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
-moz-box-shadow: inset 0 0 1px 0 #f90;
|
-moz-box-shadow: inset 0 0 1px 0 #f90;
|
||||||
@ -81,6 +72,15 @@ body {
|
|||||||
box-shadow: 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;
|
||||||
|
}
|
||||||
|
|
||||||
.snarkMessages {
|
.snarkMessages {
|
||||||
font: bold 9pt "Lucida Console","DejaVu Sans Mono",Courier,mono !important;
|
font: bold 9pt "Lucida Console","DejaVu Sans Mono",Courier,mono !important;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
@ -95,7 +95,7 @@ body {
|
|||||||
color: #22f;
|
color: #22f;
|
||||||
height: 70px;
|
height: 70px;
|
||||||
width: auto;
|
width: auto;
|
||||||
background: #111 url('/themes/console/snark/images/hat.png') no-repeat scroll right center;
|
background: #101 url('/themes/snark/ubergine/images/hat.png') no-repeat scroll right center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logshim {
|
.logshim {
|
||||||
@ -108,7 +108,7 @@ pre {
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
text-align: left !important;
|
text-align: left !important;
|
||||||
height: 8px;
|
height: 8px;
|
||||||
color: #070;
|
color: #51a;
|
||||||
font-weight: bold !important;
|
font-weight: bold !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,7 +118,7 @@ table {
|
|||||||
padding: 0px;
|
padding: 0px;
|
||||||
border-spacing: 0px;
|
border-spacing: 0px;
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
color: #323 url("/themes/console/snark/images/hat.png");
|
color: #323 url("/themes/snark/ubergine/images/hat.png");
|
||||||
width: 100%;
|
width: 100%;
|
||||||
opacity: 1 !important;
|
opacity: 1 !important;
|
||||||
}
|
}
|
||||||
@ -128,7 +128,7 @@ tr {
|
|||||||
}
|
}
|
||||||
|
|
||||||
thead, tfoot {
|
thead, tfoot {
|
||||||
background: url("/themes/console/snark/images/snark_thead.png") repeat-x scroll 0 0 #101;
|
background: url("/themes/snark/ubergine/images/snark_thead.png") repeat-x scroll 0 0 #101;
|
||||||
text-shadow:0 2px 5px #333333;
|
text-shadow:0 2px 5px #333333;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -313,7 +313,7 @@ td:first-child {
|
|||||||
border-radius: 0 0 5px 5px;
|
border-radius: 0 0 5px 5px;
|
||||||
border-top: 0;
|
border-top: 0;
|
||||||
text-shadow: 0px 3px 5px #323;
|
text-shadow: 0px 3px 5px #323;
|
||||||
background: #101 url('/themes/console/snark/images/snarknav.png') repeat-x scroll center center !important;
|
background: #101 url('/themes/snark/ubergine/images/snarknav.png') repeat-x scroll center center !important;
|
||||||
font-variant: small-caps !important;
|
font-variant: small-caps !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -323,7 +323,7 @@ td:first-child {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.page {
|
.page {
|
||||||
background: #323 url('/themes/console/snark/images/tile2.png');
|
background: #323 url('/themes/snark/ubergine/images/tile2.png');
|
||||||
color: #310;
|
color: #310;
|
||||||
min-width: 820px !important;
|
min-width: 820px !important;
|
||||||
margin: 5px 0 0 0;
|
margin: 5px 0 0 0;
|
||||||
@ -386,13 +386,13 @@ input {
|
|||||||
-khtml-border-radius: 4px;
|
-khtml-border-radius: 4px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
border: 1px inset #000;
|
border: 1px inset #000;
|
||||||
background: #212 url('/themes/console/snark/images/graytile.png');
|
background: #212 url('/themes/snark/ubergine/images/graytile.png');
|
||||||
color: #f60;
|
color: #f60;
|
||||||
}
|
}
|
||||||
|
|
||||||
input.r {
|
input.r {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
background: url('/themes/console/snark/images/graytile.png');
|
background: url('/themes/snark/ubergine/images/graytile.png');
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type=submit] {
|
input[type=submit] {
|
||||||
@ -423,7 +423,7 @@ input[type=text]:active, input[type=text]:hover, input.r:hover {
|
|||||||
|
|
||||||
select {
|
select {
|
||||||
background: #333;
|
background: #333;
|
||||||
background: url('/themes/console/snark/images/graytile.png') !important;
|
background: url('/themes/snark/ubergine/images/graytile.png') !important;
|
||||||
color: #f60;
|
color: #f60;
|
||||||
font: 9pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
|
font: 9pt "Lucida Sans Unicode","Bitstream Vera Sans",Verdana,Tahoma,Helvetica,sans-serif;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
@ -440,7 +440,7 @@ select:hover, textarea:hover {
|
|||||||
}
|
}
|
||||||
|
|
||||||
textarea {
|
textarea {
|
||||||
background: #111 url('/themes/console/snark/images/graytile.png');
|
background: #111 url('/themes/snark/ubergine/images/graytile.png');
|
||||||
color: #f60;
|
color: #f60;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
padding: 1px 4px 0px;
|
padding: 1px 4px 0px;
|
||||||
@ -493,7 +493,7 @@ div.newtorrentsection {
|
|||||||
-khtml-box-shadow: inset 0px 0px 1px 0px #101;
|
-khtml-box-shadow: inset 0px 0px 1px 0px #101;
|
||||||
box-shadow: inset 0px 0px 1px 0px #101;
|
box-shadow: inset 0px 0px 1px 0px #101;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
background: #545 url('/themes/console/snark/images/snark_create.png') no-repeat scroll right center;
|
background: #545 url('/themes/snark/ubergine/images/snark_create.png') no-repeat scroll right center;
|
||||||
opacity: 1.0;
|
opacity: 1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -510,7 +510,7 @@ div.addtorrentsection {
|
|||||||
-khtml-box-shadow: inset 0px 0px 1px 0px #101;
|
-khtml-box-shadow: inset 0px 0px 1px 0px #101;
|
||||||
box-shadow: inset 0px 0px 1px 0px #101;
|
box-shadow: inset 0px 0px 1px 0px #101;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
background: #545 url('/themes/console/snark/images/snark_add.png') no-repeat scroll right center;
|
background: #545 url('/themes/snark/ubergine/images/snark_add.png') no-repeat scroll right center;
|
||||||
opacity: 1.0;
|
opacity: 1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -544,7 +544,7 @@ div.configsectionpanel {
|
|||||||
box-shadow: inset 0px 0px 1px 0px #101;
|
box-shadow: inset 0px 0px 1px 0px #101;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
background: #545 url('/themes/console/snark/images/configuration.png') no-repeat scroll right center;
|
background: #545 url('/themes/snark/ubergine/images/configuration.png') no-repeat scroll right center;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -575,22 +575,23 @@ code {
|
|||||||
font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono;
|
font-family: "Lucida Console", "DejaVu Sans Mono", Courier, mono;
|
||||||
}
|
}
|
||||||
.snarknavbar {
|
.snarknavbar {
|
||||||
margin: 0 0 10px 0 !important;
|
margin: -10px 0 5px 0 !important;
|
||||||
padding: 7px 10px;
|
padding: 9px 10px 10px;
|
||||||
border: 1px solid #001;
|
border: 1px solid #101;
|
||||||
-moz-border-radius: 4px;
|
-moz-border-radius: 0 0 8px 8px;
|
||||||
-khtml-border-radius: 4px;
|
-khtml-border-radius: 0 0 4px 4px;
|
||||||
border-radius: 4px;
|
border-radius: 0 0 4px 4px;
|
||||||
-moz-box-shadow: inset 0px 0px 1px 0px #002;
|
-moz-box-shadow: inset 0px 0px 1px 0px #002;
|
||||||
-khtml-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;
|
box-shadow: inset 0px 0px 1px 0px #002;
|
||||||
background: #111 url('/themes/console/snark/images/snarknav.png') repeat-x scroll center center;
|
background: #111 url('/themes/snark/ubergine/images/snarktopnav.png') repeat-x scroll center center;
|
||||||
text-transform: uppercase !important;
|
text-transform: uppercase !important;
|
||||||
letter-spacing: 0.065em !important;
|
letter-spacing: 0.065em !important;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 11.5pt;
|
font-size: 11.5pt;
|
||||||
color: #001;
|
color: #001;
|
||||||
min-width: 820px;
|
min-width: 700px;
|
||||||
|
width: 700px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||