From c12312f5230a8479957caa4a19b7b513e1ae52de Mon Sep 17 00:00:00 2001 From: str4d Date: Sun, 9 Apr 2017 06:24:43 +0000 Subject: [PATCH] i2psnark: Remove hard-coded topnav image --- .../org/klomp/snark/web/I2PSnarkServlet.java | 38 ++++++++---------- .../snark/classic/images/arrow_refresh.png | Bin 777 -> 0 bytes .../snark/dark/images/arrow_refresh.png | Bin 777 -> 0 bytes .../snark/light/images/arrow_refresh.png | Bin 406 -> 0 bytes .../snark/light/images/arrow_refresh0.png | Bin 776 -> 0 bytes .../snark/midnight/images/arrow_refresh.png | Bin 776 -> 0 bytes .../snark/ubergine/images/arrow_refresh.png | Bin 777 -> 0 bytes .../snark/vanilla/images/arrow_refresh.png | Bin 864 -> 0 bytes 8 files changed, 16 insertions(+), 22 deletions(-) delete mode 100644 installer/resources/themes/snark/classic/images/arrow_refresh.png delete mode 100644 installer/resources/themes/snark/dark/images/arrow_refresh.png delete mode 100644 installer/resources/themes/snark/light/images/arrow_refresh.png delete mode 100644 installer/resources/themes/snark/light/images/arrow_refresh0.png delete mode 100644 installer/resources/themes/snark/midnight/images/arrow_refresh.png delete mode 100644 installer/resources/themes/snark/ubergine/images/arrow_refresh.png delete mode 100644 installer/resources/themes/snark/vanilla/images/arrow_refresh.png 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 f9c877d4c..96cffc4e6 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -62,7 +62,7 @@ public class I2PSnarkServlet extends BasicServlet { private String _themePath; private String _imgPath; private String _lastAnnounceURL; - + private static final String DEFAULT_NAME = "i2psnark"; public static final String PROP_CONFIG_FILE = "i2psnark.configFile"; private static final String WARBASE = "/.resources/"; @@ -314,8 +314,6 @@ public class I2PSnarkServlet extends BasicServlet { out.write("
"); - out.write(toThemeImg("arrow_refresh")); - out.write("  "); if (_contextName.equals(DEFAULT_NAME)) out.write(_t("I2PSnark")); else @@ -325,8 +323,6 @@ public class I2PSnarkServlet extends BasicServlet { out.write("
"); - out.write(toThemeImg("arrow_refresh")); - out.write("  "); if (_contextName.equals(DEFAULT_NAME)) out.write(_t("I2PSnark")); else @@ -748,7 +744,7 @@ public class I2PSnarkServlet extends BasicServlet { writeHiddenInputs(buf, req, action); out.write(buf.toString()); } - + /** * hidden inputs for nonce and paramters p, st, and sort * @@ -779,7 +775,7 @@ public class I2PSnarkServlet extends BasicServlet { .append(action).append("\" >\n"); } } - + /** * Build HTML-escaped and stripped query string * @@ -824,7 +820,7 @@ public class I2PSnarkServlet extends BasicServlet { } return buf.toString(); } - + /** * @since 0.9.6 */ @@ -898,7 +894,7 @@ public class I2PSnarkServlet extends BasicServlet { _imgPath + "last.png\">"); } } - + /** * Do what they ask, adding messages to _manager.addMessage as necessary */ @@ -941,7 +937,7 @@ public class I2PSnarkServlet extends BasicServlet { String canonical = null; try { canonical = local.getCanonicalPath(); - + if (local.exists()) { if (_manager.getTorrent(canonical) != null) _manager.addMessage(_t("Torrent already running: {0}", newFile)); @@ -1394,7 +1390,7 @@ public class I2PSnarkServlet extends BasicServlet { _manager.addMessage("Unknown POST action: \"" + action + '\"'); } } - + private static final String iopts[] = {"inbound.length", "inbound.quantity", "outbound.length", "outbound.quantity" }; @@ -1489,17 +1485,17 @@ public class I2PSnarkServlet extends BasicServlet { remainingSeconds = needed / downBps; else remainingSeconds = -1; - + MetaInfo meta = snark.getMetaInfo(); String b64 = Base64.encode(snark.getInfoHash()); String b64Short = b64.substring(0, 6); // isValid means isNotMagnet boolean isValid = meta != null; boolean isMultiFile = isValid && meta.getFiles() != null; - + String err = snark.getTrackerProblems(); int knownPeers = Math.max(curPeers, snark.getTrackerSeenPeers()); - + String rowClass = (row % 2 == 0 ? "snarkTorrentEven" : "snarkTorrentOdd"); String statusString; if (snark.isChecking()) { @@ -1601,7 +1597,7 @@ public class I2PSnarkServlet extends BasicServlet { "" + _t("Stopped") + ""; } } - + out.write(""); out.write(""); out.write(statusString + "\n\t"); @@ -1946,7 +1942,7 @@ public class I2PSnarkServlet extends BasicServlet { } return buf.toString(); } - + /** @since 0.8.2 */ private static String thinsp(boolean disable) { if (disable) @@ -2073,7 +2069,7 @@ public class I2PSnarkServlet extends BasicServlet { newURL = DataHelper.stripHTML(newURL); // XSS //String newFile = req.getParameter("newFile"); //if ( (newFile == null) || (newFile.trim().length() <= 0) ) newFile = ""; - + out.write("
\n"); // *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file out.write("
\n"); @@ -2764,8 +2760,6 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(" onload=\"setupbuttons()\""); buf.append(">\n
"); - toThemeImg(buf, "arrow_refresh"); - buf.append("  "); if (_contextName.equals(DEFAULT_NAME)) buf.append(_t("I2PSnark")); else @@ -3406,7 +3400,7 @@ public class I2PSnarkServlet extends BasicServlet { icon = "page_white"; return icon; } - + /** * Icon file in the .war. Always 16x16. * @@ -3426,7 +3420,7 @@ public class I2PSnarkServlet extends BasicServlet { private String toImg(String icon, String altText) { return "\"""; } - + /** * Image file in the theme. * @@ -3436,7 +3430,7 @@ public class I2PSnarkServlet extends BasicServlet { private String toThemeImg(String image) { return toThemeImg(image, "", ""); } - + /** * Image file in the theme. * diff --git a/installer/resources/themes/snark/classic/images/arrow_refresh.png b/installer/resources/themes/snark/classic/images/arrow_refresh.png deleted file mode 100644 index 0d280de31164579cf1ed018e581db43fa209ae8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 777 zcmV+k1NQuhP)pHyGcYrRCt_)Qe8__K^T7KoZZ>==(@Y9>ql#ThUua$SpwZqo?3bODP8GWmMACbxLW|$weGSNwC(%jnNLyhiiDY*Ul%d zfj5`Y#BrY=d3m-nXXrt93Fv$Th-x4ShJX_&W~R$-w_iLe=STx{nHltN{Q=*Qkd2wx zNpozZfSg^+?P!9D$$xW>G&`ZQ^~F_oyCdI%p$Sn!*jx;F#|U3eTK$5e9b?HMh$5hr zxyaj2H~4rx_=`gD7B}J4X&c(pw7(C595~zSD$74nCDrCc7B*sOzeD=_0&ewWWZ7IZ z>GQg(!hTuOPB|=#g;t!e!^udW$YX~}JL4-J3sjS?&m-+*u)#*Us~AfmW9b_ zh7{pUA~UlxB4S!p0~{Hga|4&Wh8#+`o<)<%d%JT~lV-d zGJ!Ehtgk9B%BApMaAEp!k(ebBH_iQ8;(5TRnDrS={y_Y0_gq@HS+ZS6o--?!rBK4` zN$}}~Eq+7%7TYbq)Pc@ICwT?Ny|N?-PLk0fX&Ek)EaApqskj?9LzhU500000NkvXX Hu0mjfCHrP- diff --git a/installer/resources/themes/snark/dark/images/arrow_refresh.png b/installer/resources/themes/snark/dark/images/arrow_refresh.png deleted file mode 100644 index 0d280de31164579cf1ed018e581db43fa209ae8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 777 zcmV+k1NQuhP)pHyGcYrRCt_)Qe8__K^T7KoZZ>==(@Y9>ql#ThUua$SpwZqo?3bODP8GWmMACbxLW|$weGSNwC(%jnNLyhiiDY*Ul%d zfj5`Y#BrY=d3m-nXXrt93Fv$Th-x4ShJX_&W~R$-w_iLe=STx{nHltN{Q=*Qkd2wx zNpozZfSg^+?P!9D$$xW>G&`ZQ^~F_oyCdI%p$Sn!*jx;F#|U3eTK$5e9b?HMh$5hr zxyaj2H~4rx_=`gD7B}J4X&c(pw7(C595~zSD$74nCDrCc7B*sOzeD=_0&ewWWZ7IZ z>GQg(!hTuOPB|=#g;t!e!^udW$YX~}JL4-J3sjS?&m-+*u)#*Us~AfmW9b_ zh7{pUA~UlxB4S!p0~{Hga|4&Wh8#+`o<)<%d%JT~lV-d zGJ!Ehtgk9B%BApMaAEp!k(ebBH_iQ8;(5TRnDrS={y_Y0_gq@HS+ZS6o--?!rBK4` zN$}}~Eq+7%7TYbq)Pc@ICwT?Ny|N?-PLk0fX&Ek)EaApqskj?9LzhU500000NkvXX Hu0mjfCHrP- diff --git a/installer/resources/themes/snark/light/images/arrow_refresh.png b/installer/resources/themes/snark/light/images/arrow_refresh.png deleted file mode 100644 index 717f386e3163e50fda41e902b47bc624af146688..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P)pGNJ&INRCt_YWPpOu&<3^-A2>4qGcX1+F#NZNh%z2zWca^cK;Xyp z)vFtRfki-slT)8G6Z5a_K&CEK|9vQ}2&FIl`^)CDZ(q?or_a6wSuhdI;R_v~pXiWwN5?%7i@U0CqkbPyX!+yJDO31~_<11fk2B37?n z{TIfD0gzfo7uSvtKsG;;_+Lf_CKHIu{(+pzj3oDw30WZnBV#KQ+wvJ1 z{-yl>&2p2OjlrJr|G#NqCowW*{r$yokd^h1`hNzdIsg9upNKtJu>)|h;)*zQa2XhJ zo}h>Wdm6+5>NWxDE&wG5ggQ{tU?>2|fz*IR058CO?#4>6_W%F@07*qoM6N<$f^kHy AfB*mh diff --git a/installer/resources/themes/snark/light/images/arrow_refresh0.png b/installer/resources/themes/snark/light/images/arrow_refresh0.png deleted file mode 100644 index c30c16341460d95ff8b3f6e8baa3e6b6fa1ef90a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 776 zcmV+j1NZ!iP)pHx=BPqR5*>5P(Mr)aTtBS``6M^udOYV(ny;SBp}ce2qc&=+5{34 zbRdR7BXJ|ffk9Y|n+xtPCdSFZ)jtE16C;L5VhGS;uf5(~DeYbRyX)P#X)yc=-}L4C z-h1Es9&ky8Z;foF@65iw498r!?d!|1EH@bp2A=`oE`qWb9qAbu{53y+FTk=aXZd}@ zwL; zC=`M$%Q!m9LqFEn-L9@pB$F&;***2c-)?-IPw~PxLGaBI!hjHB7Ukccd5&KIU{gxp z^!BEf2}l$Ku2NAxob3E~0>C}xDAt|)luF&mt*yNz*{nqR`v(NmG>0gqdw#!9>FG%> zEG<0>VR*-J zwyR3x0m^#{00jF7@A`xO_nwCcA;jf*!SX!UbX}Kt@aP{NJTv7}Dc8IJ0000pHx=BPqR5*>5P(Mr)aTtBS``6M^udOYV(ny;SBp}ce2qc&=+5{34 zbRdR7BXJ|ffk9Y|n+xtPCdSFZ)jtE16C;L5VhGS;uf5(~DeYbRyX)P#X)yc=-}L4C z-h1Es9&ky8Z;foF@65iw498r!?d!|1EH@bp2A=`oE`qWb9qAbu{53y+FTk=aXZd}@ zwL; zC=`M$%Q!m9LqFEn-L9@pB$F&;***2c-)?-IPw~PxLGaBI!hjHB7Ukccd5&KIU{gxp z^!BEf2}l$Ku2NAxob3E~0>C}xDAt|)luF&mt*yNz*{nqR`v(NmG>0gqdw#!9>FG%> zEG<0>VR*-J zwyR3x0m^#{00jF7@A`xO_nwCcA;jf*!SX!UbX}Kt@aP{NJTv7}Dc8IJ0000pHyGcYrRCt_)Qe8__K^T7KoZZ>==(@Y9>ql#ThUua$SpwZqo?3bODP8GWmMACbxLW|$weGSNwC(%jnNLyhiiDY*Ul%d zfj5`Y#BrY=d3m-nXXrt93Fv$Th-x4ShJX_&W~R$-w_iLe=STx{nHltN{Q=*Qkd2wx zNpozZfSg^+?P!9D$$xW>G&`ZQ^~F_oyCdI%p$Sn!*jx;F#|U3eTK$5e9b?HMh$5hr zxyaj2H~4rx_=`gD7B}J4X&c(pw7(C595~zSD$74nCDrCc7B*sOzeD=_0&ewWWZ7IZ z>GQg(!hTuOPB|=#g;t!e!^udW$YX~}JL4-J3sjS?&m-+*u)#*Us~AfmW9b_ zh7{pUA~UlxB4S!p0~{Hga|4&Wh8#+`o<)<%d%JT~lV-d zGJ!Ehtgk9B%BApMaAEp!k(ebBH_iQ8;(5TRnDrS={y_Y0_gq@HS+ZS6o--?!rBK4` zN$}}~Eq+7%7TYbq)Pc@ICwT?Ny|N?-PLk0fX&Ek)EaApqskj?9LzhU500000NkvXX Hu0mjfCHrP- diff --git a/installer/resources/themes/snark/vanilla/images/arrow_refresh.png b/installer/resources/themes/snark/vanilla/images/arrow_refresh.png deleted file mode 100644 index 88d9edfc365feb2487cd70243d7a38259dd5e717..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 864 zcmV-m1E2hfP)pI5=lfsRCt`7l1*q_RTRg6_q};9GntttamEnSbV`~MO_L@ST8%}T zAV!dqf~8PV0?{HZF5HNS6x<0_P*Cu*2nxl8xDnBfN_5pO)S>|sTho~&CNr75WWK-W zz3Yh!5lkD}3ukc;=lt&Z-~UnUa3;HHtp-?Z^_#oOdAIl5Wma!hZ|npt_<3P`j~Sg9 z@Y@X^&+b%z%QLo*BPRz{ee?Z3oqD-NAHUBiOzffijwXD3Kf6r$?A7Uet&ZJYgguj~ z5i2B9zI{i)ipLvIj&<%I8SI7m40g83qpdY!VRh<}K91fN@UcERJ3`i(=@b2M&4G9x zW5dO&!g0UGbvb`Cpl`cm-Q~c8UCL+07X;YAO_r(VJqjLlWu!ncbX!2vBfXTYlbv0| z%4(Vto13svgmhgBT5xU#G`CCcy`M~Wozcpw?u*o*DiBA2MUniu4S9Gak>%Izdewg~ zE3h zk4>E%!cHwQ_sgGL`q5!F?ou=;c6Ek>Pn{lC!#y^YYuCB>%?dv!^@l&);N1Tt?=?7k zY$Wphi_=FiMGt?ZxZ7%SG}@$GY!EvXvtNI0QVr~m(zco*T5uQ*7rC;`;f^3zq-Eh> z;FeU|nSs=bMRXd7S1Ci_a(Bx&$gp+UOhFc1=8MwI6Y zP?JZS4X{Jdp$J|rF|5XVc}^*w5Dl_v^hm^7;2ulkFBz;z{=Km{7cTeEUbFZlqM5u) qZ|#jdDj$~9vZk7xsR)RwkN*ZiUPfG!avx6s0000