From 110f01a55b5c8c276d5bc3cdf475f9be9cd5eec5 Mon Sep 17 00:00:00 2001
From: duck <duck@mail.i2p>
Date: Sun, 27 Jun 2010 17:04:51 +0000
Subject: [PATCH] I2P logo in routerconsole sidebar is now themed.
---
.../java/src/net/i2p/router/web/CSSHelper.java | 4 ++--
.../java/src/net/i2p/router/web/SummaryBarRenderer.java | 8 ++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
index 785acce6d5..013216ad32 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
@@ -9,13 +9,13 @@ public class CSSHelper extends HelperBase {
public static final String PROP_THEME_NAME = "routerconsole.theme";
public static final String DEFAULT_THEME = "light";
- private static final String BASE = "/themes/console/";
+ public static final String BASE_THEME_PATH = "/themes/console/";
private static final String FORCE = "classic";
public static final String PROP_REFRESH = "routerconsole.summaryRefresh";
public static final String DEFAULT_REFRESH = "60";
public String getTheme(String userAgent) {
- String url = BASE;
+ String url = BASE_THEME_PATH;
if (userAgent != null && userAgent.contains("MSIE")) {
url += FORCE + "/";
} else {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index 1fbe6fce56..6a548c2683 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -25,8 +25,12 @@ public class SummaryBarRenderer {
*/
public void renderSummaryHTML(Writer out) throws IOException {
StringBuilder buf = new StringBuilder(8*1024);
-
- buf.append("<a href=\"/index.jsp\" target=\"_top\"><img src=\"/themes/console/images/i2plogo.png\" alt=\"")
+ String theme = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);
+
+ buf.append("<a href=\"/index.jsp\" target=\"_top\"><img src=\"")
+ .append(CSSHelper.BASE_THEME_PATH)
+ .append(theme)
+ .append("/images/i2plogo.png\" alt=\"")
.append(_("I2P Router Console"))
.append("\" title=\"")
.append(_("I2P Router Console"))
--
GitLab