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 cfe5c5457..3633f9a4e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -169,7 +169,7 @@ public class I2PSnarkServlet extends Default { PrintWriter out = resp.getWriter(); out.write("\n" + - "\n" + + "\n" + ""); out.write(_("I2PSnark - Anonymous BitTorrent Client")); out.write("\n"); @@ -190,7 +190,7 @@ public class I2PSnarkServlet extends Default { out.write("
"); - out.write(_("I2PSnark")); + out.write(_(" I2PSnark")); out.write(" "); out.write(_("Forum")); out.write("\n"); @@ -253,15 +253,15 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write(_("Torrent")); out.write("\n"); - out.write(_("ETA")); + out.write(_("ETA")); out.write("\n"); - out.write(_("RX")); + out.write(_("RX")); out.write("\n"); - out.write(_("TX")); + out.write(_("TX")); out.write("\n"); - out.write(_("RX Rate")); + out.write(_("Rate")); out.write("\n"); - out.write(_("TX Rate")); + out.write(_("Rate")); out.write("\n"); out.write(""); @@ -745,10 +745,10 @@ public class I2PSnarkServlet extends Default { if (e < 0) continue; baseURL = baseURL.substring(e + 1); - out.write(" » "); - out.write(_("Details")); + out.write("\" title=\"" + name + ' ' + _("Tracker") + "\" target=\"_blank\">"); + out.write(_("")); out.write(""); break; } @@ -924,13 +924,13 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write("
"); - out.write(_("Add Torrent")); + out.write(_("Add Torrent")); out.write("
\n
"); out.write(_("From URL")); out.write(": \n"); // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve) - //out.write("From file:
\n"); - out.write("
 
"); + out.write("
\n"); out.write("
 "); @@ -955,7 +955,7 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write(""); - out.write(_("Create Torrent")); + out.write(_("Create Torrent")); out.write("
\n
"); //out.write("From file:
\n"); out.write(_("Data to seed")); @@ -979,12 +979,12 @@ public class I2PSnarkServlet extends Default { out.write("\t\n"); } out.write("\n"); - out.write(_("or")); - out.write("
  "); - out.write("
 
\n"); out.write("\n"); @@ -1003,7 +1003,7 @@ public class I2PSnarkServlet extends Default { out.write("\n"); out.write("\n"); out.write(""); - out.write(_("Configuration")); + out.write(_("Configuration")); out.write("
\n"); out.write("
"); out.write(_("Data directory")); @@ -1130,7 +1130,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"); } @@ -1203,7 +1203,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" + diff --git a/installer/resources/themes/console/images/snark_add.png b/installer/resources/themes/console/images/snark_add.png deleted file mode 100644 index e11574930..000000000 Binary files a/installer/resources/themes/console/images/snark_add.png and /dev/null differ diff --git a/installer/resources/themes/console/images/snark_create.png b/installer/resources/themes/console/images/snark_create.png deleted file mode 100644 index 2f41beb04..000000000 Binary files a/installer/resources/themes/console/images/snark_create.png and /dev/null differ diff --git a/installer/resources/themes/console/snark_favicon.ico b/installer/resources/themes/console/snark/favicon.ico similarity index 100% rename from installer/resources/themes/console/snark_favicon.ico rename to installer/resources/themes/console/snark/favicon.ico diff --git a/installer/resources/themes/console/snark/images/arrow_refresh.png b/installer/resources/themes/console/snark/images/arrow_refresh.png new file mode 100644 index 000000000..26b8dff1b Binary files /dev/null and b/installer/resources/themes/console/snark/images/arrow_refresh.png differ diff --git a/installer/resources/themes/console/snark/images/config.png b/installer/resources/themes/console/snark/images/config.png new file mode 100644 index 000000000..565a9330e Binary files /dev/null and b/installer/resources/themes/console/snark/images/config.png differ diff --git a/installer/resources/themes/console/snark/images/create.png b/installer/resources/themes/console/snark/images/create.png new file mode 100644 index 000000000..44ccbf812 Binary files /dev/null and b/installer/resources/themes/console/snark/images/create.png differ diff --git a/installer/resources/themes/console/snark/images/details.png b/installer/resources/themes/console/snark/images/details.png new file mode 100644 index 000000000..12cd1aef9 Binary files /dev/null and b/installer/resources/themes/console/snark/images/details.png differ diff --git a/installer/resources/themes/console/snark/images/eta.png b/installer/resources/themes/console/snark/images/eta.png new file mode 100644 index 000000000..f4c3f99d9 Binary files /dev/null and b/installer/resources/themes/console/snark/images/eta.png differ diff --git a/installer/resources/themes/console/images/graytile.png b/installer/resources/themes/console/snark/images/graytile.png similarity index 100% rename from installer/resources/themes/console/images/graytile.png rename to installer/resources/themes/console/snark/images/graytile.png diff --git a/installer/resources/themes/console/images/hat.png b/installer/resources/themes/console/snark/images/hat.png similarity index 100% rename from installer/resources/themes/console/images/hat.png rename to installer/resources/themes/console/snark/images/hat.png diff --git a/installer/resources/themes/console/snark/images/snark_add.png b/installer/resources/themes/console/snark/images/snark_add.png new file mode 100644 index 000000000..f02fe118c Binary files /dev/null and b/installer/resources/themes/console/snark/images/snark_add.png differ diff --git a/installer/resources/themes/console/snark/images/snark_create.png b/installer/resources/themes/console/snark/images/snark_create.png new file mode 100644 index 000000000..1e767b9b2 Binary files /dev/null and b/installer/resources/themes/console/snark/images/snark_create.png differ diff --git a/installer/resources/themes/console/images/snark_thead.png b/installer/resources/themes/console/snark/images/snark_thead.png similarity index 100% rename from installer/resources/themes/console/images/snark_thead.png rename to installer/resources/themes/console/snark/images/snark_thead.png diff --git a/installer/resources/themes/console/images/snarknav.png b/installer/resources/themes/console/snark/images/snarknav.png similarity index 100% rename from installer/resources/themes/console/images/snarknav.png rename to installer/resources/themes/console/snark/images/snarknav.png diff --git a/installer/resources/themes/console/images/snarknav_on.png b/installer/resources/themes/console/snark/images/snarknav_on.png similarity index 100% rename from installer/resources/themes/console/images/snarknav_on.png rename to installer/resources/themes/console/snark/images/snarknav_on.png diff --git a/installer/resources/themes/console/snark.css b/installer/resources/themes/console/snark/snark.css similarity index 100% rename from installer/resources/themes/console/snark.css rename to installer/resources/themes/console/snark/snark.css