From 112caf7305e1e81c3a5afb65afd6b3f1182578fb Mon Sep 17 00:00:00 2001
From: Michael Sann <michael.sann@mni.thm.de>
Date: Fri, 27 Mar 2015 14:40:44 +0100
Subject: [PATCH] Changed Variable Names
---
.../controller/ConfigurationController.java | 16 ++++++++--------
src/main/resources/arsnova.properties.example | 4 ++--
src/test/resources/arsnova.properties.example | 4 ++++
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 540bb0e96..45f3062ff 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -139,11 +139,11 @@ public class ConfigurationController extends AbstractController {
@Value("${optional.arsnova-slogan:}")
private String arsnovaSlogan;
- @Value("${optional.uni-enabled:}")
- private String uniEnabled;
+ @Value("${optional.unipanel-enabled:}")
+ private String uniPanelEnabled;
- @Value("${optional.uni-text:}")
- private String uniText;
+ @Value("${optional.unipanel-text:}")
+ private String uniPanelText;
@Value("${pp.session-levels.de}")
private String ppLevelsDe;
@@ -201,11 +201,11 @@ public class ConfigurationController extends AbstractController {
if (!"".equals(arsnovaSlogan)) {
config.put("arsnovaSlogan", arsnovaSlogan);
}
- if (!"".equals(uniEnabled)) {
- config.put("uniEnabled", uniEnabled);
+ if (!"".equals(uniPanelEnabled)) {
+ config.put("uniPanelEnabled", uniPanelEnabled);
}
- if (!"".equals(uniText)) {
- config.put("uniText", uniText);
+ if (!"".equals(uniPanelText)) {
+ config.put("uniPanelText", uniPanelText);
}
if (!"".equals(maxUploadFilesize)) {
config.put("maxUploadFilesize", maxUploadFilesize);
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index c807d47a5..237bcb4c1 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -214,8 +214,8 @@ session.demo-id=
optional.arsnova-slogan=Audience Response System
# optional: Panel with Text about the University
-optional.uni-enabled=false
-optional.uni-text=Placeholder for UniPanel-Text
+optional.unipanel-enabled=false
+optional.unipanel-text=Placeholder for UniPanel-Text
# Links which are displayed in the frontend applications
#
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 8c43c2b65..237bcb4c1 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -213,6 +213,10 @@ session.demo-id=
# label underneath ARSnova logo
optional.arsnova-slogan=Audience Response System
+# optional: Panel with Text about the University
+optional.unipanel-enabled=false
+optional.unipanel-text=Placeholder for UniPanel-Text
+
# Links which are displayed in the frontend applications
#
links.blog.url=https://arsnova.eu/blog/
--
GitLab