diff --git a/apps/routerconsole/jsp/css.jsp b/apps/routerconsole/jsp/css.jsp index affe83099f427eb31f6ca94fc94ee17bfb6444aa..209cab2b64985d277814a4c28e8e44c5e21fd6d3 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 92da24f4d3be78183526cab6589d9922fac3aead..017efaa3402c7380dc52aaff5e2fd2eaad5d319f 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 2bef637521bb9f1a6a9ac285cd0d4043929bb71d..b14f8e352549d39646ce4a35bb0ecc5737e8e9c7 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 05ad49ad7d89646fd48383d06c0cf7b6fd79170b..5d1d9eb2b95290d5b670535b26738c8c5972e72a 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");