From b48014f8e6808bbcf895a509e3b29c76d92d6744 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 10 Jul 2012 21:29:49 +0000
Subject: [PATCH] Use favicon from theme in I2PTunnel if it exists

---
 apps/i2ptunnel/jsp/editClient.jsp | 3 ++-
 apps/i2ptunnel/jsp/editServer.jsp | 3 ++-
 apps/i2ptunnel/jsp/index.jsp      | 3 ++-
 apps/i2ptunnel/jsp/wizard.jsp     | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index 7aef0ab31..2fcf487f5 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -19,9 +19,10 @@
     <title><%=intl._("I2P Tunnel Manager - Edit Client Tunnel")%></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+    <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
 
     <% if (editBean.allowCSS()) {
-  %><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()%>default.css" rel="stylesheet" type="text/css" /> 
     <link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
     <% }
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index eb9e7a1b3..3b7e7b943 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -19,9 +19,10 @@
     <title><%=intl._("I2P Tunnel Manager - Edit Server Tunnel")%></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+    <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
 
     <% if (editBean.allowCSS()) {
-  %><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()%>default.css" rel="stylesheet" type="text/css" /> 
     <link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
     <% }
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index 41adffc7a..a35826a5c 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -24,7 +24,8 @@
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
     
     <% if (indexBean.allowCSS()) {
-  %><link href="<%=indexBean.getTheme()%>default.css" rel="stylesheet" type="text/css" /> 
+  %><link rel="icon" href="<%=indexBean.getTheme()%>images/favicon.ico">
+    <link href="<%=indexBean.getTheme()%>default.css" rel="stylesheet" type="text/css" /> 
     <link href="<%=indexBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
     <% }
   %>
diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
index d9aeb3873..3adac32ea 100644
--- a/apps/i2ptunnel/jsp/wizard.jsp
+++ b/apps/i2ptunnel/jsp/wizard.jsp
@@ -57,7 +57,8 @@
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
 
     <% if (editBean.allowCSS()) {
-  %><link href="<%=editBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
+  %><link rel="icon" href="<%=editBean.getTheme()%>images/favicon.ico">
+    <link href="<%=editBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
     <link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
     <% }
   %>