From 327102a254014ed212c7ee5b6f2892f9f532fce6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 20 Aug 2009 14:35:32 +0000
Subject: [PATCH] * Console: - Put favicon on every page - Make
every page UTF-8
---
apps/routerconsole/jsp/css.jsp | 6 +++++-
apps/routerconsole/jsp/error.jsp | 1 -
apps/routerconsole/jsp/index.jsp | 2 --
apps/routerconsole/jsp/summaryframe.jsp | 1 -
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/routerconsole/jsp/css.jsp b/apps/routerconsole/jsp/css.jsp
index affe83099f..209cab2b64 100644
--- a/apps/routerconsole/jsp/css.jsp
+++ b/apps/routerconsole/jsp/css.jsp
@@ -2,6 +2,8 @@
/*
* This should be included inside <head>...</head>,
* as it sets the stylesheet.
+ *
+ * This is included almost 30 times, so keep whitespace etc. to a minimum.
*/
response.setHeader("Pragma", "no-cache");
@@ -15,7 +17,9 @@
session.setAttribute("i2p.contextId", request.getParameter("i2p.contextId"));
}
%>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="shortcut icon" href="favicon.ico">
<jsp:useBean class="net.i2p.router.web.CSSHelper" id="cssHelper" scope="request" />
<jsp:setProperty name="cssHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<link href="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css">
-<!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->
\ No newline at end of file
+<!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->
diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp
index 92da24f4d3..017efaa340 100644
--- a/apps/routerconsole/jsp/error.jsp
+++ b/apps/routerconsole/jsp/error.jsp
@@ -13,7 +13,6 @@
// If it can't find the iframe or viewtheme.jsp I wonder if the whole thing blows up...
%>
<html><head><title>I2P Router Console</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<%@include file="css.jsp" %>
<link rel="shortcut icon" href="favicon.ico" /></head><body>
<%
diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index 2bef637521..b14f8e3525 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -5,8 +5,6 @@
<html><head>
<%@include file="css.jsp" %>
<title>I2P Router Console - home</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="shortcut icon" href="/themes/console/images/favicon.ico" />
</head><body>
<%
if (System.getProperty("router.consoleNonce") == null) {
diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp
index 05ad49ad7d..5d1d9eb2b9 100644
--- a/apps/routerconsole/jsp/summaryframe.jsp
+++ b/apps/routerconsole/jsp/summaryframe.jsp
@@ -10,7 +10,6 @@
<html><head>
<%@include file="css.jsp" %>
<title>Summary Bar</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<%
// try hard to avoid an error page in the iframe after shutdown
String action = request.getParameter("action");
--
GitLab