* 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
2009-06-28 12:50:33 +00:00
parent 5906fb7139
commit 77ce768cb4
7 changed files with 12 additions and 3 deletions
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@ -6,7 +6,7 @@
 <title>I2P Router Console - home</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <%@include file="css.jsp" %>
-<link rel="shortcut icon" href="favicon.ico" />
+<link rel="shortcut icon" href="/themes/console/images/favicon.ico" />
 </head><body>
 <%
 if (System.getProperty("router.consoleNonce") == null) {
--- a/apps/routerconsole/jsp/nav.jsp
+++ b/apps/routerconsole/jsp/nav.jsp
@ -1,6 +1,6 @@
 <%@page import="java.io.File" %>
 <div class="logo">
- <a href="index.jsp"><img src="i2plogo.png" alt="Router Console" width="187" height="35" /></a><br />
+ <a href="index.jsp"><img src="/themes/console/images/i2plogo.png" alt="Router Console" width="187" height="35" /></a><br />
 </div>
 <div class="toolbar">
 <% if (new File("docs/toolbar.html").exists()) { %>
--- 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());
 %>
--- a/build.xml
+++ b/build.xml
@ -320,6 +320,13 @@
        <!-- CSS now in docs/, not in the .war -->
        <copy file="installer/resources/themes/console/console.css" todir="pkg-temp/docs/themes/console/" />
        <copy file="installer/resources/themes/console/defCon1/console.css" todir="pkg-temp/docs/themes/console/defCon1/" />
+        <!-- these files now in docs/, not in the .war -->
+        <copy file="installer/resources/themes/console/images/favicon.ico" todir="pkg-temp/docs/themes/console/images/" />
+        <copy file="installer/resources/themes/console/images/i2plogo.png" todir="pkg-temp/docs/themes/console/images/" />
+        <!-- Since the logo moved, we have to update the error pages -->
+        <copy todir="pkg-temp/docs/" >
+          <fileset dir="installer/resources/" includes="*-header.ht" />
+        </copy>
        <!-- make a "classic" theme -->
        <copy todir="pkg-temp/docs/themes/console/classic/" >
            <fileset  dir="installer/resources/themes/console/classic/" />
--- a/installer/resources/favicon.ico
+++ b/installer/resources/favicon.ico
--- a/installer/resources/themes/console/images/favicon.ico
+++ b/installer/resources/themes/console/images/favicon.ico
--- a/installer/resources/themes/console/images/i2plogo.png
+++ b/installer/resources/themes/console/images/i2plogo.png