I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Console: Move favicon.ico and i2plogo.png out of the .war

Browse Source 
so that the HTTP proxy can use them directly;
      proxy error pages must be updated next
This commit is contained in:
zzz
2009-06-28 12:50:33 +00:00
parent 5906fb7139
commit 77ce768cb4
7 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/jsp/index.jsp
View File

@ -6,7 +6,7 @@
<title>I2P Router Console - home</title> <title>I2P Router Console - home</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<%@include file="css.jsp" %> <%@include file="css.jsp" %>
<link rel="shortcut icon" href="favicon.ico" /> <link rel="shortcut icon" href="/themes/console/images/favicon.ico" />
</head><body> </head><body>
<% <%
if (System.getProperty("router.consoleNonce") == null) { if (System.getProperty("router.consoleNonce") == null) {

2
apps/routerconsole/jsp/nav.jsp
View File

@ -1,6 +1,6 @@
<%@page import="java.io.File" %> <%@page import="java.io.File" %>
<div class="logo"> <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>
<div class="toolbar"> <div class="toolbar">
<% if (new File("docs/toolbar.html").exists()) { %> <% if (new File("docs/toolbar.html").exists()) { %>

4
apps/routerconsole/jsp/viewtheme.jsp
View File

@ -14,7 +14,9 @@ if (uri.endsWith(".css")) {
response.setContentType("image/gif"); response.setContentType("image/gif");
} else if (uri.endsWith(".jpg")) { } else if (uri.endsWith(".jpg")) {
response.setContentType("image/jpeg"); 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()); net.i2p.util.FileUtil.readFile(uri, "./docs", response.getOutputStream());
%> %>

7
build.xml
View File

@ -320,6 +320,13 @@
<!-- CSS now in docs/, not in the .war --> <!-- 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/console.css" todir="pkg-temp/docs/themes/console/" />
<copy file="installer/resources/themes/console/defCon1/console.css" todir="pkg-temp/docs/themes/console/defCon1/" /> <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 --> <!-- make a "classic" theme -->
<copy todir="pkg-temp/docs/themes/console/classic/" > <copy todir="pkg-temp/docs/themes/console/classic/" >
<fileset dir="installer/resources/themes/console/classic/" /> <fileset dir="installer/resources/themes/console/classic/" />

BIN
installer/resources/favicon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

0
apps/routerconsole/jsp/favicon.ico → installer/resources/themes/console/images/favicon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
apps/routerconsole/jsp/i2plogo.png → installer/resources/themes/console/images/i2plogo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 925 B

After

Width:  |  Height:  |  Size: 925 B