AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Console: Serve default favicon.ico

Browse Source 
i2ptunnel: Remove dup link to nonexistent theme favicon.ico
This commit is contained in:
zzz
2020-11-23 18:46:12 +00:00
parent aef2fb8ce0
commit 2ffb570850
7 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/i2ptunnel/jsp/edit.jsp
View File

@@ -39,7 +39,6 @@ if (tun != null) {
<title><%=intl._t("Hidden Services Manager")%> - <%=(__isClient ? intl._t("Edit Client Tunnel") : intl._t("Edit Hidden Service"))%></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
<style type='text/css'>
input.default { width: 1px; height: 1px; visibility: hidden; }

1
apps/i2ptunnel/jsp/index.jsp
View File

@@ -13,7 +13,6 @@
<title><%=intl._t("Hidden Services Manager")%></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<link rel="icon" href="<%=indexBean.getTheme()%>images/favicon.ico" />
<link href="<%=indexBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
</head><body id="tunnelListPage">
<div class="panel" id="overview"><h2><%=intl._t("Hidden Services Manager")%></h2><p>

1
apps/i2ptunnel/jsp/register.jsp
View File

@@ -27,7 +27,6 @@
<title><%=intl._t("Hidden Services Manager")%> - <%=intl._t("Registration Helper")%></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
<style type='text/css'>
input.default { width: 1px; height: 1px; visibility: hidden; }

1
apps/i2ptunnel/jsp/ssl.jsp
View File

@@ -26,7 +26,6 @@
<title><%=intl._t("Hidden Services Manager")%> - <%=intl._t("SSL Helper")%></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
<style type='text/css'>
input.default { width: 1px; height: 1px; visibility: hidden; }

1
apps/i2ptunnel/jsp/wizard.jsp
View File

@@ -46,7 +46,6 @@
<title><%=intl._t("I2P Tunnel Manager - Tunnel Creation Wizard")%></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
</head>
<body id="tunnelWizardPage">

2
apps/routerconsole/java/build.xml
View File

@@ -339,6 +339,7 @@
<!-- set if unset -->
<property name="workspace.changes.w.tr" value="" />
<!-- Don't include the css in the war, the main build.xml will copy it to docs/themes/console/ -->
<copy file="../../../installer/resources/themes/console/images/favicon.ico" tofile="../jsp/favicon.ico" />
<war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
basedir="../jsp/" excludes="web.xml, *.css, **/*.java, *.jsp, *.jsi, web-fragment.xml, web-out.xml">
<manifest>
@@ -678,6 +679,7 @@
<delete dir="../jsp/WEB-INF/" />
<delete file="../jsp/web-fragment.xml" />
<delete file="../jsp/web-out.xml" />
<delete file="../jsp/favicon.ico" />
</target>
<target name="cleandep" depends="clean">
</target>

2
apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
View File

@@ -61,6 +61,8 @@ public class LocaleWebAppHandler extends HandlerWrapper
if (pathInContext.equals("/") || pathInContext.equals("/index.html")) {
// home page
pathInContext = "/index.jsp";
} else if (pathInContext.equals("/favicon.ico")) {
// pass thru unchanged
} else if (pathInContext.indexOf('/', 1) < 0 &&
(!pathInContext.endsWith(".jsp")) &&
(!pathInContext.endsWith(".log")) &&