From 93fe76e5f459e352ae542aab212702d0db980463 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Wed, 24 Jun 2015 13:46:05 +0200
Subject: [PATCH] Shortened 'arsnova-slogan' config option name to 'slogan'
---
.../java/de/thm/arsnova/controller/ConfigurationController.java | 2 +-
src/main/resources/arsnova.properties.example | 2 +-
src/test/resources/arsnova.properties.example | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 4ea65eab..99b5d3cb 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -136,7 +136,7 @@ public class ConfigurationController extends AbstractController {
@Value("${session.demo-id:}")
private String demoSessionKey;
- @Value("${ui.arsnova-slogan:}")
+ @Value("${ui.slogan:}")
private String arsnovaSlogan;
@Value("${pp.session-levels.de}")
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index 75ebbcfd..2829c2d7 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -211,7 +211,7 @@ question.parse-answer-option-formatting=false
session.demo-id=
# Label underneath ARSnova logo
-ui.arsnova-slogan=Audience Response System
+ui.slogan=Audience Response System
# 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 75ebbcfd..2829c2d7 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -211,7 +211,7 @@ question.parse-answer-option-formatting=false
session.demo-id=
# Label underneath ARSnova logo
-ui.arsnova-slogan=Audience Response System
+ui.slogan=Audience Response System
# Links which are displayed in the frontend applications
#
--
GitLab