From 4432ee0613119ef886e5d91c6b0ca4d96c6e21d6 Mon Sep 17 00:00:00 2001
From: agrt56 <andreas.gaertner@mni.thm.de>
Date: Fri, 6 Feb 2015 17:06:03 +0100
Subject: [PATCH] Added arsnova-slogan configuration. ARSnova Mobile Task
 #14605

---
 .../de/thm/arsnova/controller/ConfigurationController.java  | 6 ++++++
 src/main/resources/arsnova.properties.example               | 3 +++
 src/test/resources/arsnova.properties.example               | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 3ffb0aabf..790a1b37f 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -133,6 +133,9 @@ public class ConfigurationController extends AbstractController {
 	@Value("${optional.demoSessionKey:}")
 	private String demoSessionKey;
 
+	@Value("${optional.arsnova-slogan:}")
+	private String arsnovaSlogan;
+
 	@Value("${pp.session-levels.de}")
 	private String ppLevelsDe;
 
@@ -186,6 +189,9 @@ public class ConfigurationController extends AbstractController {
 		if (!"".equals(demoSessionKey)) {
 			config.put("demoSessionKey", demoSessionKey);
 		}
+		if (!"".equals(arsnovaSlogan)) {
+			config.put("arsnovaSlogan", arsnovaSlogan);
+		}
 		if (!"".equals(maxUploadFilesize)) {
 			config.put("maxUploadFilesize", maxUploadFilesize);
 		}
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index 40f9bc76f..8efcea2ba 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -204,6 +204,9 @@ question.parse-answer-option-formatting=false
 # optional: demo session keyword to show above session login button
 optional.demoSessionKey=
 
+# label underneath ARSnova logo
+optional.arsnova-slogan=Audience Response System
+
 # Links which are displayed in the frontend applications
 #
 links.blog.url=https://arsnova.eu/blog/
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 40f9bc76f..8efcea2ba 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -204,6 +204,9 @@ question.parse-answer-option-formatting=false
 # optional: demo session keyword to show above session login button
 optional.demoSessionKey=
 
+# label underneath ARSnova logo
+optional.arsnova-slogan=Audience Response System
+
 # Links which are displayed in the frontend applications
 #
 links.blog.url=https://arsnova.eu/blog/
-- 
GitLab