From d9cb4e262085248cdbf8de0e0464bd70328b31b0 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 11 Jun 2009 18:05:05 +0000 Subject: [PATCH] * Console: - Move the console css from default.css in the .war to docs/themes/console/console.css, and support console themes in the main console with routerconsole.theme=foo --- apps/routerconsole/java/build.xml | 3 ++- .../src/net/i2p/router/web/CSSHelper.java | 20 +++++++++++++++++++ apps/routerconsole/jsp/config.jsp | 2 +- apps/routerconsole/jsp/configadvanced.jsp | 2 +- apps/routerconsole/jsp/configclients.jsp | 2 +- apps/routerconsole/jsp/configkeyring.jsp | 2 +- apps/routerconsole/jsp/configlogging.jsp | 2 +- apps/routerconsole/jsp/configpeer.jsp | 2 +- apps/routerconsole/jsp/configservice.jsp | 2 +- apps/routerconsole/jsp/configstats.jsp | 2 +- apps/routerconsole/jsp/configtunnels.jsp | 2 +- apps/routerconsole/jsp/configupdate.jsp | 2 +- apps/routerconsole/jsp/css.jsp | 20 +++++++++++++++++++ apps/routerconsole/jsp/graphs.jsp | 2 +- apps/routerconsole/jsp/help.jsp | 2 +- apps/routerconsole/jsp/index.jsp | 2 +- apps/routerconsole/jsp/jobs.jsp | 2 +- apps/routerconsole/jsp/logs.jsp | 2 +- apps/routerconsole/jsp/nav.jsp | 15 +++----------- apps/routerconsole/jsp/netdb.jsp | 2 +- apps/routerconsole/jsp/oldconsole.jsp | 2 +- apps/routerconsole/jsp/oldstats.jsp | 2 +- apps/routerconsole/jsp/peers.jsp | 2 +- apps/routerconsole/jsp/profiles.jsp | 2 +- apps/routerconsole/jsp/summaryframe.jsp | 2 +- apps/routerconsole/jsp/tunnels.jsp | 2 +- build.xml | 3 +++ 27 files changed, 70 insertions(+), 35 deletions(-) create mode 100644 apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java create mode 100644 apps/routerconsole/jsp/css.jsp diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml index da04fc9bab..d571e48095 100644 --- a/apps/routerconsole/java/build.xml +++ b/apps/routerconsole/java/build.xml @@ -75,8 +75,9 @@ + + basedir="../jsp/" excludes="web.xml, *.css, *.java, *.jsp, web-fragment.xml"> diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java new file mode 100644 index 0000000000..643c8c45c3 --- /dev/null +++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java @@ -0,0 +1,20 @@ +package net.i2p.router.web; + +/** + * Copied and modded from I2PTunnel IndexBean (GPL) + * @author zzz + */ +public class CSSHelper extends HelperBase { + public CSSHelper() {} + + public static final String PROP_THEME_NAME = "routerconsole.theme"; + private static final String BASE = "/themes/console/"; + + public String getTheme() { + String url = BASE; + String theme = _context.getProperty(PROP_THEME_NAME); + if (theme != null) + url += theme + "/"; + return url; + } +} diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index ba95c8d566..933401913f 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -3,7 +3,7 @@ I2P Router Console - config networking - +<%@include file="css.jsp" %> <%@include file="nav.jsp" %> diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index d3bfbeea1a..d2097c252b 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -4,7 +4,7 @@ I2P Router Console - config advanced - +<%@include file="css.jsp" %> <%@include file="nav.jsp" %> diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 96916fff12..701e39aff0 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -4,7 +4,7 @@ I2P Router Console - config clients - +<%@include file="css.jsp" %>