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

Store router console theme setting in themes.config

Browse Source
This commit is contained in:
str4d
2012-07-21 10:11:32 +00:00
parent c8a73b63fd
commit 5d5a3b80e5
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
View File

@ -12,7 +12,8 @@ public class CSSHelper extends HelperBase {
private static final Map<String, Boolean> _UACache = new ConcurrentHashMap(); private static final Map<String, Boolean> _UACache = new ConcurrentHashMap();
public CSSHelper() {} public CSSHelper() {}
public static final String THEME_CONFIG_FILE = "themes.config";
public static final String PROP_THEME_NAME = "routerconsole.theme"; public static final String PROP_THEME_NAME = "routerconsole.theme";
public static final String DEFAULT_THEME = "light"; public static final String DEFAULT_THEME = "light";
public static final String BASE_THEME_PATH = "/themes/console/"; public static final String BASE_THEME_PATH = "/themes/console/";
@ -31,7 +32,7 @@ public class CSSHelper extends HelperBase {
// This is the first thing to use _context on most pages // This is the first thing to use _context on most pages
if (_context == null) if (_context == null)
throw new IllegalStateException("No contexts. This is usually because the router is either starting up or shutting down."); throw new IllegalStateException("No contexts. This is usually because the router is either starting up or shutting down.");
String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME); String theme = _context.readConfigFile(THEME_CONFIG_FILE).getProperty(PROP_THEME_NAME, DEFAULT_THEME);
url += theme + "/"; url += theme + "/";
} }
return url; return url;

10
apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java
View File

@ -1,5 +1,7 @@
package net.i2p.router.web; package net.i2p.router.web;
import java.util.Properties;
/** set the theme */ /** set the theme */
public class ConfigUIHandler extends FormHandler { public class ConfigUIHandler extends FormHandler {
private boolean _shouldSave; private boolean _shouldSave;
@ -21,12 +23,14 @@ public class ConfigUIHandler extends FormHandler {
private void saveChanges() { private void saveChanges() {
if (_config == null) if (_config == null)
return; return;
String oldTheme = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME); Properties props = _context.readConfigFile(CSSHelper.THEME_CONFIG_FILE);
String oldTheme = props.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);
boolean ok; boolean ok;
if (_config.equals("default")) // obsolete if (_config.equals("default")) // obsolete
ok = _context.router().saveConfig(CSSHelper.PROP_THEME_NAME, null); props.put(CSSHelper.PROP_THEME_NAME, null);
else else
ok = _context.router().saveConfig(CSSHelper.PROP_THEME_NAME, _config); props.put(CSSHelper.PROP_THEME_NAME, _config);
ok = _context.writeConfigFile("themes.config", props);
if (ok) { if (ok) {
if (!oldTheme.equals(_config)) if (!oldTheme.equals(_config))
addFormNotice(_("Theme change saved.") + addFormNotice(_("Theme change saved.") +

2
apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
View File

@ -9,7 +9,7 @@ public class ConfigUIHelper extends HelperBase {
public String getSettings() { public String getSettings() {
StringBuilder buf = new StringBuilder(512); StringBuilder buf = new StringBuilder(512);
String current = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME); String current = _context.readConfigFile(CSSHelper.THEME_CONFIG_FILE).getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);
Set<String> themes = themeSet(); Set<String> themes = themeSet();
for (String theme : themes) { for (String theme : themes) {
buf.append("<input type=\"radio\" class=\"optbox\" name=\"theme\" "); buf.append("<input type=\"radio\" class=\"optbox\" name=\"theme\" ");