Commit 2ac25c7f authored by Andreas Gärtner's avatar Andreas Gärtner

Add further configuration options to arsnova.properties

parent 4a8964ad
......@@ -148,12 +148,18 @@ public class ConfigurationController extends AbstractController {
@Value("${splashscreen.slogan:}")
private String splashscreenSlogan;
@Value("${splashscreen.slogan-color:}")
private String splashscreenSloganColor;
@Value("${splashscreen.background-color:}")
private String splashscreenBgColor;
@Value("${splashscreen.loading-ind-color:}")
private String splashscreenLoadingIndColor;
@Value("${splashscreen.min-delay:}")
private String splashscreenDelay;
@Value("${pp.session-levels.de}")
private String ppLevelsDe;
......@@ -166,7 +172,7 @@ public class ConfigurationController extends AbstractController {
HashMap<String, Object> config = new HashMap<String, Object>();
HashMap<String, Boolean> features = new HashMap<String, Boolean>();
HashMap<String, String> publicPool = new HashMap<String, String>();
HashMap<String, String> splashscreen = new HashMap<String, String>();
HashMap<String, Object> splashscreen = new HashMap<String, Object>();
/* The API path could be unknown to the client in case the request was forwarded */
if ("".equals(apiPath)) {
......@@ -251,12 +257,18 @@ public class ConfigurationController extends AbstractController {
if (!"".equals(splashscreenSlogan)) {
splashscreen.put("slogan", splashscreenSlogan);
}
if (!"".equals(splashscreenSloganColor)) {
splashscreen.put("sloganColor", splashscreenSloganColor);
}
if (!"".equals(splashscreenBgColor)) {
splashscreen.put("bgcolor", splashscreenBgColor);
}
if (!"".equals(splashscreenLoadingIndColor)) {
splashscreen.put("loadIndColor", splashscreenLoadingIndColor);
}
if (!"".equals(splashscreenDelay)) {
splashscreen.put("minDelay", Integer.valueOf(splashscreenDelay));
}
if (!"".equals(trackingTrackerUrl)) {
HashMap<String, String> tracking = new HashMap<String, String>();
......
......@@ -218,8 +218,10 @@ ui.slogan=Audience Response System
# Best results are achieved with logos that have the same width and height.
splashscreen.logo-path=resources/images/arsnova-logo.png
splashscreen.slogan=Audience Response System
splashscreen.slogan-color=#4A5C66
splashscreen.background-color=#E0E0E0
splashscreen.loading-ind-color=#4A5C66
splashscreen.min-delay=3000
# Links which are displayed in the frontend applications
#
......
......@@ -218,8 +218,10 @@ ui.slogan=Audience Response System
# Best results are achieved with logos that have the same width and height.
splashscreen.logo-path=resources/images/arsnova-logo.png
splashscreen.slogan=Audience Response System
splashscreen.slogan-color=#4A5C66
splashscreen.background-color=#E0E0E0
splashscreen.loading-ind-color=#4A5C66
splashscreen.min-delay=3000
# Links which are displayed in the frontend applications
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment