From 3d75fa3e15b2b922073bb44fe2c10348e6a9a20a Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Wed, 24 Jun 2015 13:42:34 +0200
Subject: [PATCH] Adjust configuration for consistency
Renamed optional.arsnova to ui.arsnova-slogan and made comments start
with an uppercase letter.
---
.../controller/ConfigurationController.java | 2 +-
src/main/resources/arsnova.properties.example | 14 +++++++-------
src/test/resources/arsnova.properties.example | 14 +++++++-------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 2ef02817..4ea65eab 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("${optional.arsnova-slogan:}")
+ @Value("${ui.arsnova-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 8c43c2b6..75ebbcfd 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -188,17 +188,17 @@ features.public-pool.enabled=false
################################################################################
# Customization
################################################################################
-# minutes, after which the feedback is deleted
+# Minutes, after which the feedback is deleted
feedback.cleanup=10
-# maximal filesize in bytes
+# Maximal filesize in bytes
upload.filesize_b=1048576
-# maximal thumbnail size in pixels
+# Maximal thumbnail size in pixels
imageupload.thumbnail.width=200
imageupload.thumbnail.height=200
-# maximal number of answer options allowed for a skill question
+# Maximal number of answer options allowed for a skill question
question.answer-option-limit=8
# Enable Markdown and MathJax parsing in answer options. Formatting in answer
@@ -207,11 +207,11 @@ question.answer-option-limit=8
# effect if neither MathJax nor Markdown are enabled.
question.parse-answer-option-formatting=false
-# optional: demo session id to show above session login button
+# Demo session id to show above session login button
session.demo-id=
-# label underneath ARSnova logo
-optional.arsnova-slogan=Audience Response System
+# Label underneath ARSnova logo
+ui.arsnova-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 8c43c2b6..75ebbcfd 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -188,17 +188,17 @@ features.public-pool.enabled=false
################################################################################
# Customization
################################################################################
-# minutes, after which the feedback is deleted
+# Minutes, after which the feedback is deleted
feedback.cleanup=10
-# maximal filesize in bytes
+# Maximal filesize in bytes
upload.filesize_b=1048576
-# maximal thumbnail size in pixels
+# Maximal thumbnail size in pixels
imageupload.thumbnail.width=200
imageupload.thumbnail.height=200
-# maximal number of answer options allowed for a skill question
+# Maximal number of answer options allowed for a skill question
question.answer-option-limit=8
# Enable Markdown and MathJax parsing in answer options. Formatting in answer
@@ -207,11 +207,11 @@ question.answer-option-limit=8
# effect if neither MathJax nor Markdown are enabled.
question.parse-answer-option-formatting=false
-# optional: demo session id to show above session login button
+# Demo session id to show above session login button
session.demo-id=
-# label underneath ARSnova logo
-optional.arsnova-slogan=Audience Response System
+# Label underneath ARSnova logo
+ui.arsnova-slogan=Audience Response System
# Links which are displayed in the frontend applications
#
--
GitLab