ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move welcome config values to general section.

Browse Source 
Use textarea for welcome text.
This commit is contained in:
Emanuel Schuetze 2016-01-09 15:22:34 +01:00
parent b035ee7d7c
commit 11470d3b57
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
openslides/core/signals.py
View File

@ -65,12 +65,35 @@ def setup_general_config(sender, **kwargs):
yield ConfigVariable( yield ConfigVariable(
name='general_event_legal_notice', 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', input_type='text',
label=ugettext_lazy('Legal notice'), label=ugettext_lazy('Legal notice'),
weight=132, weight=132,
group=ugettext_lazy('General'), 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 # General System
@ -79,7 +102,7 @@ def setup_general_config(sender, **kwargs):
default_value=False, default_value=False,
input_type='boolean', input_type='boolean',
label=ugettext_lazy('Allow access for anonymous guest users'), label=ugettext_lazy('Allow access for anonymous guest users'),
weight=135, weight=138,
group=ugettext_lazy('General'), group=ugettext_lazy('General'),
subgroup=ugettext_lazy('System')) subgroup=ugettext_lazy('System'))
@ -136,23 +159,6 @@ def setup_general_config(sender, **kwargs):
weight=170, weight=170,
group=ugettext_lazy('Projector')) 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( yield ConfigVariable(
name='projector_default_countdown', name='projector_default_countdown',
default_value=60, default_value=60,

6
openslides/core/static/templates/dashboard.html
View File

@ -1,9 +1,7 @@
<div class="header"> <div class="header">
<div class="title"> <div class="title">
<h1>{{ config('projector_welcome_title') }}</h1> <h1>{{ config('general_event_welcome_title') }}</h1>
</div> </div>
</div> </div>
<div class="details"> <div class="details" ng-bind-html="config('general_event_welcome_text')"></div>
{{ config('projector_welcome_text') }}
</div>