From 965be08828028c4e67059fc43d6b88bbe8f12ace Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Thu, 7 Jan 2016 11:07:32 +0100
Subject: [PATCH] Adjust configuartion for consistency

Added 'ui' prefix for splash screen settings.
---
 .../controller/ConfigurationController.java   | 12 ++++++------
 src/main/resources/arsnova.properties.example | 19 ++++++++++---------
 src/test/resources/arsnova.properties.example | 16 ++++++++++------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 3068c20b..1c6b8628 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -142,22 +142,22 @@ public class ConfigurationController extends AbstractController {
 	@Value("${ui.slogan:}")
 	private String arsnovaSlogan;
 
-	@Value("${splashscreen.logo-path:}")
+	@Value("${ui.splashscreen.logo-path:}")
 	private String splashscreenLogo;
 
-	@Value("${splashscreen.slogan:}")
+	@Value("${ui.splashscreen.slogan:}")
 	private String splashscreenSlogan;
 
-	@Value("${splashscreen.slogan-color:}")
+	@Value("${ui.splashscreen.slogan-color:}")
 	private String splashscreenSloganColor;
 
-	@Value("${splashscreen.background-color:}")
+	@Value("${ui.splashscreen.background-color:}")
 	private String splashscreenBgColor;
 
-	@Value("${splashscreen.loading-ind-color:}")
+	@Value("${ui.splashscreen.loading-ind-color:}")
 	private String splashscreenLoadingIndColor;
 
-	@Value("${splashscreen.min-delay:}")
+	@Value("${ui.splashscreen.min-delay:}")
 	private String splashscreenDelay;
 
 	@Value("${pp.session-levels.de}")
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index 3e3ea5fb..aa373274 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -213,8 +213,8 @@ question.answer-option-limit=8
 question.parse-answer-option-formatting=true
 
 # Demo session id to show above session login button
-# You can freely use the demo session of arsnova.eu/mobile 
-# which can be imported from the repro:
+# You can freely use the demo session of https://arsnova.eu/mobile which can be
+# imported from the repro:
 # https://github.com/thm-projects/arsnova-mobile/tree/master/demo-sessions
 session.demo-id=
 
@@ -223,16 +223,17 @@ ui.slogan=Audience Response System
 
 # Splashscreen configuration
 # 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.min-delay=3000
+#
+ui.splashscreen.logo-path=resources/images/arsnova-logo.png
+ui.splashscreen.slogan=Audience Response System
+ui.splashscreen.min-delay=3000
 
 # Splash screen colors
 # These settings override the default colors of the frontend theme.
 #
-#splashscreen.slogan-color=
-#splashscreen.background-color=
-#splashscreen.loading-ind-color=
+#ui.splashscreen.slogan-color=
+#ui.splashscreen.background-color=
+#ui.splashscreen.loading-ind-color=
 
 # Links which are displayed in the frontend applications
 #
@@ -283,4 +284,4 @@ pp.session-levels.en = General Education,\
 #
 tracking.provider=piwik
 tracking.tracker-url=
-tracking.site-id=
\ No newline at end of file
+tracking.site-id=
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 8e24d35b..aa373274 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -213,6 +213,9 @@ question.answer-option-limit=8
 question.parse-answer-option-formatting=true
 
 # Demo session id to show above session login button
+# You can freely use the demo session of https://arsnova.eu/mobile which can be
+# imported from the repro:
+# https://github.com/thm-projects/arsnova-mobile/tree/master/demo-sessions
 session.demo-id=
 
 # Label underneath ARSnova logo
@@ -220,16 +223,17 @@ ui.slogan=Audience Response System
 
 # Splashscreen configuration
 # 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.min-delay=3000
+#
+ui.splashscreen.logo-path=resources/images/arsnova-logo.png
+ui.splashscreen.slogan=Audience Response System
+ui.splashscreen.min-delay=3000
 
 # Splash screen colors
 # These settings override the default colors of the frontend theme.
 #
-#splashscreen.slogan-color=
-#splashscreen.background-color=
-#splashscreen.loading-ind-color=
+#ui.splashscreen.slogan-color=
+#ui.splashscreen.background-color=
+#ui.splashscreen.loading-ind-color=
 
 # Links which are displayed in the frontend applications
 #
-- 
GitLab