Reverted routerconsole to storing theme itself, also store universal theming boolean

This commit is contained in:
str4d
2012-08-01 01:50:59 +00:00
parent 3d69d2bf63
commit a623d924fa
3 changed files with 17 additions and 19 deletions

View File

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