From 77ce768cb496e92b83ff7b4d3d105dfac3ee70aa Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 28 Jun 2009 12:50:33 +0000 Subject: [PATCH] * Console: Move favicon.ico and i2plogo.png out of the .war so that the HTTP proxy can use them directly; proxy error pages must be updated next --- apps/routerconsole/jsp/index.jsp | 2 +- apps/routerconsole/jsp/nav.jsp | 2 +- apps/routerconsole/jsp/viewtheme.jsp | 4 +++- build.xml | 7 +++++++ installer/resources/favicon.ico | Bin 1406 -> 0 bytes .../resources/themes/console/images}/favicon.ico | Bin .../resources/themes/console/images}/i2plogo.png | Bin 7 files changed, 12 insertions(+), 3 deletions(-) delete mode 100644 installer/resources/favicon.ico rename {apps/routerconsole/jsp => installer/resources/themes/console/images}/favicon.ico (100%) rename {apps/routerconsole/jsp => installer/resources/themes/console/images}/i2plogo.png (100%) diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp index 87287b412..73ad4e15b 100644 --- a/apps/routerconsole/jsp/index.jsp +++ b/apps/routerconsole/jsp/index.jsp @@ -6,7 +6,7 @@ I2P Router Console - home <%@include file="css.jsp" %> - + <% if (System.getProperty("router.consoleNonce") == null) { diff --git a/apps/routerconsole/jsp/nav.jsp b/apps/routerconsole/jsp/nav.jsp index ad0021487..43d8d336e 100644 --- a/apps/routerconsole/jsp/nav.jsp +++ b/apps/routerconsole/jsp/nav.jsp @@ -1,6 +1,6 @@ <%@page import="java.io.File" %>
<% if (new File("docs/toolbar.html").exists()) { %> diff --git a/apps/routerconsole/jsp/viewtheme.jsp b/apps/routerconsole/jsp/viewtheme.jsp index 05ccfecbf..95b1e91c0 100644 --- a/apps/routerconsole/jsp/viewtheme.jsp +++ b/apps/routerconsole/jsp/viewtheme.jsp @@ -14,7 +14,9 @@ if (uri.endsWith(".css")) { response.setContentType("image/gif"); } else if (uri.endsWith(".jpg")) { response.setContentType("image/jpeg"); +} else if (uri.endsWith(".ico")) { + response.setContentType("image/x-icon"); } - +response.setHeader("Cache-Control", "max-age=86400"); // cache for a day net.i2p.util.FileUtil.readFile(uri, "./docs", response.getOutputStream()); %> \ No newline at end of file diff --git a/build.xml b/build.xml index da8cfc4c2..525364929 100644 --- a/build.xml +++ b/build.xml @@ -320,6 +320,13 @@ + + + + + + + diff --git a/installer/resources/favicon.ico b/installer/resources/favicon.ico deleted file mode 100644 index fd09b1b4cc69cb3eaa0853bda10698e3105d261f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1406 zcmbtUO=weD6#ibD)U+uYpS4Eks?o+;$8>C=62%Uo(uIr4%%aOKsuXeIvJhb&Xwr@d z(?zRU)F04AabqbcVunFPM06O`MM+$gqOk^%<{=tml=^JuJNKm!8ph%dqvYVs5nQs*4>misZfG=|4d9eAGSVJ|uuShNu? zc42zP!HM!P@(T{~%Ql*d5u}PGsD(W4+;vb|E@5hE8kuJfhToRZ$e8`*A*7ZrqpR49 z;j)Fuf{h0c9XQJl`pN?sTS_4_>!6XjhL|T(?8dE|lE*^+wF8@Z6my5g@4n=4FhA$O z((%JEd)@kjPk3G@|3jV!ayX7Cn;XG;ZIB%91`0O;vqfXzBrwb7dtE)I_EBF;y{k5^ z@$4gKsgDC^(GC0E8<<~da0*CIZ9uwk5ff$x77el`3+X-^6Il}$?I#C=*jspuW^-fT=KjRDmD~CpB9?X9q1E^h@!^8qff2J=rpqtU!`T#&poic};3@f6 zRAMo1LmXblHyA&`_@ci-kN-HY9{p7V!Q>ab#8J*e1{TMjnI0_r58!lXO!t>m6x*{% z@Bno(bqo$B|+s~9Xw6}+OM7*R`N`=LvL8&!@LrUp& z+^JMs74H;1@oK?MN^KNe%K)o4wM8V!mhIaGeoy|bei3fiyxEkq#W0MYXfFN~>?Smf yI@K;XsMIcvw@RBj-#U$VDEZTq`cypy0i{}lT>7;VaGgiTSFNprz9I4Y5&9p!OB