marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted i2ptunnel to reading theme from routerconsole

Browse Source
This commit is contained in:
str4d
2012-08-01 02:26:26 +00:00
parent 679549cbf2
commit 120d31244e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
View File

@@ -45,7 +45,6 @@ import net.i2p.util.Log;
*/ */
public class IndexBean { public class IndexBean {
protected final I2PAppContext _context; protected final I2PAppContext _context;
private String _theme;
protected final Log _log; protected final Log _log;
protected final TunnelControllerGroup _group; protected final TunnelControllerGroup _group;
private String _action; private String _action;
@@ -100,8 +99,7 @@ public class IndexBean {
private static final List<String> _nonces = new ArrayList(MAX_NONCES + 1); private static final List<String> _nonces = new ArrayList(MAX_NONCES + 1);
static final String CLIENT_NICKNAME = "shared clients"; static final String CLIENT_NICKNAME = "shared clients";
public static final String THEME_CONFIG_FILE = "themes.config"; public static final String PROP_THEME_NAME = "routerconsole.theme";
public static final String PROP_THEME = "routerconsole.theme";
public static final String DEFAULT_THEME = "light"; public static final String DEFAULT_THEME = "light";
public static final String PROP_CSS_DISABLED = "routerconsole.css.disabled"; public static final String PROP_CSS_DISABLED = "routerconsole.css.disabled";
public static final String PROP_JS_DISABLED = "routerconsole.javascript.disabled"; public static final String PROP_JS_DISABLED = "routerconsole.javascript.disabled";
@@ -115,7 +113,6 @@ public class IndexBean {
addNonce(); addNonce();
_booleanOptions = new ConcurrentHashSet(4); _booleanOptions = new ConcurrentHashSet(4);
_otherOptions = new ConcurrentHashMap(4); _otherOptions = new ConcurrentHashMap(4);
_theme = _context.readConfigFile(THEME_CONFIG_FILE).getProperty(PROP_THEME, DEFAULT_THEME);
} }
public static String getNextNonce() { public static String getNextNonce() {
@@ -396,7 +393,8 @@ public class IndexBean {
//// ////
public String getTheme() { public String getTheme() {
return "/themes/console/" + _theme + "/"; String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME);
return "/themes/console/" + theme + "/";
} }
public boolean allowCSS() { public boolean allowCSS() {