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

Template fixes for motion preamble (#2760).

Browse Source
This commit is contained in:
Emanuel Schütze 2016-12-12 14:21:22 +01:00
parent 7772f60bd4
commit 32b7ddedce
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/core/static/css/app.css
View File

@ -1159,7 +1159,9 @@ img {
.spacer-left-lg {
margin-left: 10px;
}
.no-padding {
padding: 0px;
}
.lead-div {
margin-bottom: 20px;
}

2
openslides/motions/config_variables.py
View File

@ -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',

2
openslides/motions/static/js/motions/pdf.js
View File

@ -252,7 +252,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
var motionPreamble = function () {
return {
text: Config.translate(Config.get('motions_preamble').value),
style: 'textItem',
margin: [0, 10, 0, 0]
};
};

5
openslides/motions/static/js/motions/site.js
View File

@ -481,6 +481,9 @@ angular.module('OpenSlidesApp.motions.site', [
required: true
}
},
{
template: '<p class="spacer-top-lg no-padding">' + Config.translate(Config.get('motions_preamble').value) + '</p>'
},
{
key: 'text',
type: 'editor',
@ -1942,7 +1945,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');