diff --git a/CHANGELOG b/CHANGELOG
index 925a060b2..9898678af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@ Motions:
- Added blocks for motions which can set as agenda item.
Set states for multiple motions of a motion block by following
the recommendations of each motion.
+- Used global config variable for preamble.
Users:
- Added field is_committee and new default group Committees.
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index 48c05dd92..8404ec490 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -1155,7 +1155,9 @@ img {
.spacer-left-lg {
margin-left: 10px;
}
-
+.no-padding {
+ padding: 0px;
+}
.lead-div {
margin-bottom: 20px;
}
diff --git a/openslides/motions/config_variables.py b/openslides/motions/config_variables.py
index 7085b3bb1..0e8550f0f 100644
--- a/openslides/motions/config_variables.py
+++ b/openslides/motions/config_variables.py
@@ -49,7 +49,7 @@ def get_config_variables():
yield ConfigVariable(
name='motions_preamble',
- default_value='The assembly may decide,',
+ default_value='The assembly may decide:',
label='Motion preamble',
weight=320,
group='Motions',
diff --git a/openslides/motions/static/js/motions/docx.js b/openslides/motions/static/js/motions/docx.js
index a02d5bb9d..1720903ac 100644
--- a/openslides/motions/static/js/motions/docx.js
+++ b/openslides/motions/static/js/motions/docx.js
@@ -11,7 +11,7 @@ angular.module('OpenSlidesApp.motions.docx', [])
'gettextCatalog',
'FileSaver',
function ($http, $q, Config, gettextCatalog, FileSaver) {
-
+
var PAGEBREAK = '
' + Config.translate(Config.get('motions_preamble').value) + '
' + }, { key: 'text', type: 'editor', @@ -1396,8 +1399,6 @@ angular.module('OpenSlidesApp.motions.site', [ var isAmendment = $scope.$parent.motion && $scope.$parent.motion.id; // Set default values for create form - // ... set preamble config value as text - $scope.model.text = gettextCatalog.getString(Config.get('motions_preamble').value); // ... for amendments add parent_id if (isAmendment) { if (Config.get('motions_amendments_apply_text').value) { @@ -1946,7 +1947,7 @@ angular.module('OpenSlidesApp.motions.site', [ gettext('Serially numbered'); gettext('Set it manually'); gettext('Motion preamble'); - gettext('The assembly may decide,'); + gettext('The assembly may decide:'); gettext('Default line numbering'); /// Line numbering: Outside gettext('Outside'); diff --git a/openslides/motions/static/templates/docx/motions.docx b/openslides/motions/static/templates/docx/motions.docx index 200f37e9c..6d5ca9936 100644 Binary files a/openslides/motions/static/templates/docx/motions.docx and b/openslides/motions/static/templates/docx/motions.docx differ diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html index 0e7b6bf3e..b4e9b305d 100644 --- a/openslides/motions/static/templates/motions/motion-detail.html +++ b/openslides/motions/static/templates/motions/motion-detail.html @@ -343,6 +343,9 @@{{ config('motions_preamble') | translate }}
{{ config('motions_preamble') | translate }}