Use favicon from theme in I2PTunnel if it exists

This commit is contained in:
str4d
2012-07-10 21:29:49 +00:00
parent f1881352c8
commit b48014f8e6
4 changed files with 8 additions and 4 deletions

View File

@@ -19,9 +19,10 @@
<title><%=intl._("I2P Tunnel Manager - Edit Client Tunnel")%></title> <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="text/html; charset=UTF-8" />
<meta http-equiv="Content-Type" content="application/xhtml+xml; 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()) { <% 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()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" /> <link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% } <% }

View File

@@ -19,9 +19,10 @@
<title><%=intl._("I2P Tunnel Manager - Edit Server Tunnel")%></title> <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="text/html; charset=UTF-8" />
<meta http-equiv="Content-Type" content="application/xhtml+xml; 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()) { <% 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()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" /> <link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% } <% }

View File

@@ -24,7 +24,8 @@
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" /> <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<% if (indexBean.allowCSS()) { <% 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" /> <link href="<%=indexBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% } <% }
%> %>

View File

@@ -57,7 +57,8 @@
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" /> <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<% if (editBean.allowCSS()) { <% 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" /> <link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% } <% }
%> %>