diff --git a/CHANGELOG b/CHANGELOG index e96fbefab..c51d10445 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,7 +38,7 @@ Other: for generic Django REST Framework views in OpenSlides apps. - Removed most of the Django views and templates. - Removed Django error pages. -- Added page for legal notes. +- Added page for legal notice. - Refactored projector API using metaclasses now. - Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API). diff --git a/openslides/core/signals.py b/openslides/core/signals.py index f920d63ff..f1dc70b64 100644 --- a/openslides/core/signals.py +++ b/openslides/core/signals.py @@ -64,13 +64,36 @@ def setup_general_config(sender, **kwargs): subgroup=ugettext_lazy('Event')) yield ConfigVariable( - name='general_event_legal_notes', - default_value='', + name='general_event_legal_notice', + default_value=_( + 'OpenSlides 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 notes'), + 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/js/core/site.js b/openslides/core/static/js/core/site.js index f1576393d..f5b97d411 100644 --- a/openslides/core/static/js/core/site.js +++ b/openslides/core/static/js/core/site.js @@ -205,10 +205,10 @@ angular.module('OpenSlidesApp.core.site', [ abstract: true, template: "", }) - // version - .state('version', { - url: '/version', - controller: 'VersionCtrl', + // legal notice and version + .state('legalnotice', { + url: '/legalnotice', + controller: 'LegalNoticeCtrl', }) //config .state('config', { @@ -425,8 +425,8 @@ angular.module('OpenSlidesApp.core.site', [ } ]) -// Version Controller -.controller('VersionCtrl', [ +// Legal Notice Controller +.controller('LegalNoticeCtrl', [ '$scope', '$http', function ($scope, $http) { diff --git a/openslides/core/static/templates/config-form-field.html b/openslides/core/static/templates/config-form-field.html index c079fec21..12614798a 100644 --- a/openslides/core/static/templates/config-form-field.html +++ b/openslides/core/static/templates/config-form-field.html @@ -6,6 +6,7 @@ type="{{ type }}" class="form-control">