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 36266de1be..88f2dd5e8e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -170,7 +170,7 @@ public class I2PSnarkServlet extends Default { PrintWriter out = resp.getWriter(); out.write("\n" + - "\n" + + "\n" + ""); out.write(_("I2PSnark - Anonymous BitTorrent Client")); out.write("\n"); @@ -191,7 +191,8 @@ public class I2PSnarkServlet extends Default { out.write("
"); - out.write(_(" I2PSnark")); + out.write(" "); + out.write(_("I2PSnark")); out.write(" "); out.write(_("Forum")); out.write("\n"); @@ -238,47 +239,78 @@ public class I2PSnarkServlet extends Default { List snarks = getSortedSnarks(req); String uri = req.getRequestURI(); out.write(TABLE_HEADER); - out.write(_("Status")); + out.write(""); + out.write("title=\""); + out.write(_("Torrent Status")); + out.write("\">"); if (_manager.util().connected() && !snarks.isEmpty()) { out.write(" » "); - out.write(_("\"Hide")); + out.write("\"Hide"); + out.write(_("Hide Peers")); + out.write("\">"); } else { out.write("?p=1\">"); - out.write(_("\"Show")); + out.write("\"Show"); } out.write("
\n"); } out.write("\n"); - out.write(_("Torrent")); + out.write(""); + out.write(_("Torrent")); out.write("\n"); - out.write(_("ETA")); + out.write(""); + out.write(_("ETA")); out.write("\n"); - out.write(_("RX")); + out.write(""); + out.write(_("RX")); out.write("\n"); - out.write(_("TX")); + out.write(""); + out.write(_("TX")); out.write("\n"); - out.write(_("Rate")); + out.write("Rate"); out.write("\n"); - out.write(_("Rate")); + out.write(""); + out.write(_("Rate")); out.write("\n"); - out.write(""); if (_manager.util().connected()) { out.write(""); - out.write(_("\"Stop")); + out.write("\"");"); out.write(""); } else if (!snarks.isEmpty()) { out.write(""); - out.write(_("\"Start")); + out.write("\"Start"); out.write(""); } else { out.write(" "); @@ -749,7 +781,7 @@ public class I2PSnarkServlet extends Default { out.write(" "); - out.write(_("")); + out.write(""); out.write(""); break; } @@ -785,7 +817,11 @@ public class I2PSnarkServlet extends Default { + "\" title=\""); out.write(_("Stop the torrent")); out.write("\">"); - out.write(_("\"Stop\"")); + out.write("\"");"); out.write(""); } else { if (isValid) { @@ -793,7 +829,11 @@ public class I2PSnarkServlet extends Default { + "\" title=\""); out.write(_("Start the torrent")); out.write("\">"); - out.write(_("\"Start\"")); + out.write("\"");"); out.write(""); } out.write(""); - out.write(_("\"Remove\"")); + out.write("\"");"); out.write(""); out.write(""); - out.write(_("\"Delete\"")); + out.write("\"");"); out.write(""); } out.write("\n\n"); @@ -938,7 +986,8 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write("
"); - out.write(_("Add Torrent")); + out.write(""); + out.write(_("Add Torrent")); out.write("
\n
"); out.write(_("From URL")); out.write(": \n"); @@ -969,7 +1018,8 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write(""); - out.write(_("Create Torrent")); + out.write(""); + out.write(_("Create Torrent")); out.write("
\n
"); //out.write("From file:
\n"); out.write(_("Data to seed")); @@ -1017,7 +1067,8 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write(""); - out.write(_("Configuration")); + out.write(""); + out.write(_("Configuration")); out.write("
\n"); out.write("
"); out.write(_("Data directory")); @@ -1144,7 +1195,7 @@ public class I2PSnarkServlet extends Default { private void writeConfigLink(PrintWriter out) throws IOException { out.write("
\n"); out.write(""); - out.write(_("Configuration")); + out.write(_("Configuration")); out.write("
\n"); } @@ -1217,7 +1268,7 @@ public class I2PSnarkServlet extends Default { return buf.toString(); } - private static final String HEADER = ""; + private static final String HEADER = ""; private static final String TABLE_HEADER = "\n" + @@ -1284,13 +1335,13 @@ public class I2PSnarkServlet extends Default { title = title.substring(0, title.length() - 1); title = _("Torrent") + ": " + title; buf.append(title); - buf.append("").append(HEADER).append("\n
").append(HEADER).append("\n
I2PSnark").append("
"); buf.append("
" + "
" + - ""); + ""); //DateFormat dfmt=DateFormat.getDateTimeInstance(DateFormat.MEDIUM, // DateFormat.MEDIUM); for (int i=0 ; i< ls.length ; i++) @@ -1383,7 +1434,7 @@ public class I2PSnarkServlet extends Default { // corrupts utf-8 //buf.append(URI.encodePath(URI.addPaths(base,"../"))); buf.append(URI.addPaths(base,"../")); - buf.append("\"> ") + buf.append("\"> ") .append(_("Up to higher level directory")).append("\n"); } @@ -1392,7 +1443,7 @@ public class I2PSnarkServlet extends Default { buf.append("
").append(_("\"File\" ")).append(title).append("").append(_("\"FileSize\"Size")) - .append("").append(_("Status")).append("
").append("\"").append(_("File")).append("\" ").append(title).append("").append(_("\"").append(_("FileSize")).append("\"").append(_("Size")); + buf.append("").append("").append(_("Status")).append("
\n"); - buf.append("\n"); + buf.append("\n"); return buf.toString(); } diff --git a/installer/resources/themes/console/snark/images/hat.png b/installer/resources/themes/console/snark/images/hat.png deleted file mode 100644 index 4599824c49..0000000000 Binary files a/installer/resources/themes/console/snark/images/hat.png and /dev/null differ diff --git a/installer/resources/themes/console/snark/images/snarknav_lowlight.png b/installer/resources/themes/console/snark/images/snarknav_lowlight.png index ef54b1e61e..ba9435c0cd 100644 Binary files a/installer/resources/themes/console/snark/images/snarknav_lowlight.png and b/installer/resources/themes/console/snark/images/snarknav_lowlight.png differ diff --git a/installer/resources/themes/console/snark/favicon.ico b/installer/resources/themes/snark/favicon.ico similarity index 100% rename from installer/resources/themes/console/snark/favicon.ico rename to installer/resources/themes/snark/favicon.ico diff --git a/installer/resources/themes/console/snark/images/add.png b/installer/resources/themes/snark/images/add.png similarity index 100% rename from installer/resources/themes/console/snark/images/add.png rename to installer/resources/themes/snark/images/add.png diff --git a/installer/resources/themes/console/snark/images/arrow_refresh.png b/installer/resources/themes/snark/images/arrow_refresh.png similarity index 100% rename from installer/resources/themes/console/snark/images/arrow_refresh.png rename to installer/resources/themes/snark/images/arrow_refresh.png diff --git a/installer/resources/themes/console/snark/images/config.png b/installer/resources/themes/snark/images/config.png similarity index 100% rename from installer/resources/themes/console/snark/images/config.png rename to installer/resources/themes/snark/images/config.png diff --git a/installer/resources/themes/console/snark/images/configuration.png b/installer/resources/themes/snark/images/configuration.png similarity index 100% rename from installer/resources/themes/console/snark/images/configuration.png rename to installer/resources/themes/snark/images/configuration.png diff --git a/installer/resources/themes/console/snark/images/create.png b/installer/resources/themes/snark/images/create.png similarity index 100% rename from installer/resources/themes/console/snark/images/create.png rename to installer/resources/themes/snark/images/create.png diff --git a/installer/resources/themes/console/snark/images/delete.png b/installer/resources/themes/snark/images/delete.png similarity index 100% rename from installer/resources/themes/console/snark/images/delete.png rename to installer/resources/themes/snark/images/delete.png diff --git a/installer/resources/themes/console/snark/images/details.png b/installer/resources/themes/snark/images/details.png similarity index 100% rename from installer/resources/themes/console/snark/images/details.png rename to installer/resources/themes/snark/images/details.png diff --git a/installer/resources/themes/console/snark/images/eta.png b/installer/resources/themes/snark/images/eta.png similarity index 100% rename from installer/resources/themes/console/snark/images/eta.png rename to installer/resources/themes/snark/images/eta.png diff --git a/installer/resources/themes/console/snark/images/file.png b/installer/resources/themes/snark/images/file.png similarity index 100% rename from installer/resources/themes/console/snark/images/file.png rename to installer/resources/themes/snark/images/file.png diff --git a/installer/resources/themes/console/snark/images/graytile.png b/installer/resources/themes/snark/images/graytile.png similarity index 100% rename from installer/resources/themes/console/snark/images/graytile.png rename to installer/resources/themes/snark/images/graytile.png diff --git a/installer/resources/themes/snark/images/hat.png b/installer/resources/themes/snark/images/hat.png new file mode 100644 index 0000000000..bed0c5b74d Binary files /dev/null and b/installer/resources/themes/snark/images/hat.png differ diff --git a/installer/resources/themes/console/snark/images/hidepeers.png b/installer/resources/themes/snark/images/hidepeers.png similarity index 100% rename from installer/resources/themes/console/snark/images/hidepeers.png rename to installer/resources/themes/snark/images/hidepeers.png diff --git a/installer/resources/themes/console/snark/images/remove.png b/installer/resources/themes/snark/images/remove.png similarity index 100% rename from installer/resources/themes/console/snark/images/remove.png rename to installer/resources/themes/snark/images/remove.png diff --git a/installer/resources/themes/console/snark/images/showpeers.png b/installer/resources/themes/snark/images/showpeers.png similarity index 100% rename from installer/resources/themes/console/snark/images/showpeers.png rename to installer/resources/themes/snark/images/showpeers.png diff --git a/installer/resources/themes/console/snark/images/size.png b/installer/resources/themes/snark/images/size.png similarity index 100% rename from installer/resources/themes/console/snark/images/size.png rename to installer/resources/themes/snark/images/size.png diff --git a/installer/resources/themes/console/snark/images/snark_add.png b/installer/resources/themes/snark/images/snark_add.png similarity index 100% rename from installer/resources/themes/console/snark/images/snark_add.png rename to installer/resources/themes/snark/images/snark_add.png diff --git a/installer/resources/themes/console/snark/images/snark_create.png b/installer/resources/themes/snark/images/snark_create.png similarity index 100% rename from installer/resources/themes/console/snark/images/snark_create.png rename to installer/resources/themes/snark/images/snark_create.png diff --git a/installer/resources/themes/console/snark/images/snark_thead.png b/installer/resources/themes/snark/images/snark_thead.png similarity index 100% rename from installer/resources/themes/console/snark/images/snark_thead.png rename to installer/resources/themes/snark/images/snark_thead.png diff --git a/installer/resources/themes/console/snark/images/snarknav.png b/installer/resources/themes/snark/images/snarknav.png similarity index 100% rename from installer/resources/themes/console/snark/images/snarknav.png rename to installer/resources/themes/snark/images/snarknav.png diff --git a/installer/resources/themes/snark/images/snarknav_lowlight.png b/installer/resources/themes/snark/images/snarknav_lowlight.png new file mode 100644 index 0000000000..ba9435c0cd Binary files /dev/null and b/installer/resources/themes/snark/images/snarknav_lowlight.png differ diff --git a/installer/resources/themes/console/snark/images/snarknav_on.png b/installer/resources/themes/snark/images/snarknav_on.png similarity index 100% rename from installer/resources/themes/console/snark/images/snarknav_on.png rename to installer/resources/themes/snark/images/snarknav_on.png diff --git a/installer/resources/themes/console/snark/images/start.png b/installer/resources/themes/snark/images/start.png similarity index 100% rename from installer/resources/themes/console/snark/images/start.png rename to installer/resources/themes/snark/images/start.png diff --git a/installer/resources/themes/console/snark/images/start_all.png b/installer/resources/themes/snark/images/start_all.png similarity index 100% rename from installer/resources/themes/console/snark/images/start_all.png rename to installer/resources/themes/snark/images/start_all.png diff --git a/installer/resources/themes/console/snark/images/status.png b/installer/resources/themes/snark/images/status.png similarity index 100% rename from installer/resources/themes/console/snark/images/status.png rename to installer/resources/themes/snark/images/status.png diff --git a/installer/resources/themes/console/snark/images/stop.png b/installer/resources/themes/snark/images/stop.png similarity index 100% rename from installer/resources/themes/console/snark/images/stop.png rename to installer/resources/themes/snark/images/stop.png diff --git a/installer/resources/themes/console/snark/images/stop_all.png b/installer/resources/themes/snark/images/stop_all.png similarity index 100% rename from installer/resources/themes/console/snark/images/stop_all.png rename to installer/resources/themes/snark/images/stop_all.png diff --git a/installer/resources/themes/console/snark/images/tile2.png b/installer/resources/themes/snark/images/tile2.png similarity index 100% rename from installer/resources/themes/console/snark/images/tile2.png rename to installer/resources/themes/snark/images/tile2.png diff --git a/installer/resources/themes/console/snark/images/torrent.png b/installer/resources/themes/snark/images/torrent.png similarity index 100% rename from installer/resources/themes/console/snark/images/torrent.png rename to installer/resources/themes/snark/images/torrent.png diff --git a/installer/resources/themes/console/snark/images/up.png b/installer/resources/themes/snark/images/up.png similarity index 100% rename from installer/resources/themes/console/snark/images/up.png rename to installer/resources/themes/snark/images/up.png diff --git a/installer/resources/themes/console/snark/snark.css b/installer/resources/themes/snark/snark.css similarity index 100% rename from installer/resources/themes/console/snark/snark.css rename to installer/resources/themes/snark/snark.css