From 11470d3b57f5e0355e3e326fe83627426e0f8d31 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 9 Jan 2016 15:22:34 +0100
Subject: [PATCH] Move welcome config values to general section.

Use textarea for welcome text.
---
 openslides/core/signals.py                    | 46 +++++++++++--------
 .../core/static/templates/dashboard.html      |  6 +--
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/openslides/core/signals.py b/openslides/core/signals.py
index c69061640..f1dc70b64 100644
--- a/openslides/core/signals.py
+++ b/openslides/core/signals.py
@@ -65,12 +65,35 @@ def setup_general_config(sender, **kwargs):
 
     yield ConfigVariable(
         name='general_event_legal_notice',
-        default_value=_('<a href="http://www.openslides.org">OpenSlides</a> is a free web based presentation and assembly system for visualizing and controlling agenda, motions and elections of an assembly.'),
+        default_value=_(
+            '<a href="http://www.openslides.org">OpenSlides</a> is a free web based '
+            'presentation and assembly system for visualizing and controlling agenda, '
+            'motions and elections of an assembly.'),
         input_type='text',
         label=ugettext_lazy('Legal notice'),
         weight=132,
         group=ugettext_lazy('General'),
-        subgroup=ugettext_lazy('Event'))
+        subgroup=ugettext_lazy('Event'),
+        translatable=True)
+
+    yield ConfigVariable(
+        name='general_event_welcome_title',
+        default_value=_('Welcome to OpenSlides'),
+        label=ugettext_lazy('Front page title'),
+        weight=134,
+        group=ugettext_lazy('General'),
+        subgroup=ugettext_lazy('Event'),
+        translatable=True)
+
+    yield ConfigVariable(
+        name='general_event_welcome_text',
+        default_value=_('[Space for your welcome text.]'),
+        input_type='text',
+        label=ugettext_lazy('Front page text'),
+        weight=136,
+        group=ugettext_lazy('General'),
+        subgroup=ugettext_lazy('Event'),
+        translatable=True)
 
     # General System
 
@@ -79,7 +102,7 @@ def setup_general_config(sender, **kwargs):
         default_value=False,
         input_type='boolean',
         label=ugettext_lazy('Allow access for anonymous guest users'),
-        weight=135,
+        weight=138,
         group=ugettext_lazy('General'),
         subgroup=ugettext_lazy('System'))
 
@@ -136,23 +159,6 @@ def setup_general_config(sender, **kwargs):
         weight=170,
         group=ugettext_lazy('Projector'))
 
-    yield ConfigVariable(
-        name='projector_welcome_title',
-        default_value=_('Welcome to OpenSlides'),
-        label=ugettext_lazy('Title'),
-        help_text=ugettext_lazy('Also used for the default welcome slide.'),
-        weight=175,
-        group=ugettext_lazy('Projector'),
-        translatable=True)
-
-    yield ConfigVariable(
-        name='projector_welcome_text',
-        default_value=_('[Space for your welcome text.]'),
-        label=ugettext_lazy('Welcome text'),
-        weight=180,
-        group=ugettext_lazy('Projector'),
-        translatable=True)
-
     yield ConfigVariable(
         name='projector_default_countdown',
         default_value=60,
diff --git a/openslides/core/static/templates/dashboard.html b/openslides/core/static/templates/dashboard.html
index 249084720..76333fdda 100644
--- a/openslides/core/static/templates/dashboard.html
+++ b/openslides/core/static/templates/dashboard.html
@@ -1,9 +1,7 @@
 <div class="header">
   <div class="title">
-    <h1>{{ config('projector_welcome_title') }}</h1>
+    <h1>{{ config('general_event_welcome_title') }}</h1>
   </div>
 </div>
 
-<div class="details">
-  {{ config('projector_welcome_text') }}
-</div>
+<div class="details" ng-bind-html="config('general_event_welcome_text')"></div>