Merge pull request #2760 from normanjaeckel/MotionTextIntro
Added global config for motion preamble.
This commit is contained in:
commit
99db9b71b7
@ -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.
|
||||
|
@ -1155,7 +1155,9 @@ img {
|
||||
.spacer-left-lg {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.no-padding {
|
||||
padding: 0px;
|
||||
}
|
||||
.lead-div {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
@ -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',
|
||||
|
@ -11,7 +11,7 @@ angular.module('OpenSlidesApp.motions.docx', [])
|
||||
'gettextCatalog',
|
||||
'FileSaver',
|
||||
function ($http, $q, Config, gettextCatalog, FileSaver) {
|
||||
|
||||
|
||||
var PAGEBREAK = '<w:p><w:r><w:br w:type="page" /></w:r></w:p>';
|
||||
var TAGS_NO_PARAM = ['b', 'strong', 'em', 'i'];
|
||||
|
||||
@ -30,8 +30,8 @@ angular.module('OpenSlidesApp.motions.docx', [])
|
||||
var d = today.getDate();
|
||||
var m = today.getMonth()+1; //January is 0!
|
||||
var y = today.getFullYear();
|
||||
if (d<10) { d='0'+d; }
|
||||
if (m<10) { m='0'+m; }
|
||||
if (d<10) { d='0'+d; }
|
||||
if (m<10) { m='0'+m; }
|
||||
return d+'.'+m+'.'+y;
|
||||
}();
|
||||
data.pagebreak_main = motions.length === 0 ? '' : PAGEBREAK;
|
||||
@ -44,7 +44,7 @@ angular.module('OpenSlidesApp.motions.docx', [])
|
||||
|
||||
return data;
|
||||
};
|
||||
|
||||
|
||||
var getCategoriesData = function (categories) {
|
||||
return _.map(categories, function (category) {
|
||||
return {
|
||||
@ -83,6 +83,7 @@ angular.module('OpenSlidesApp.motions.docx', [])
|
||||
signature_translation: signature_translation,
|
||||
status_translation: status_translation,
|
||||
status: motion.getStateName(),
|
||||
preamble: gettextCatalog.getString(Config.get('motions_preamble').value),
|
||||
text: html2docx(motion.getText()),
|
||||
reason_translation: motion.getReason().length === 0 ? '' : reason_translation,
|
||||
reason: html2docx(motion.getReason()),
|
||||
|
@ -248,6 +248,14 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
||||
}];
|
||||
};
|
||||
|
||||
// motion preamble
|
||||
var motionPreamble = function () {
|
||||
return {
|
||||
text: Config.translate(Config.get('motions_preamble').value),
|
||||
margin: [0, 10, 0, 0]
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
// motion text (with line-numbers)
|
||||
var motionText = function() {
|
||||
@ -299,6 +307,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
||||
subtitle,
|
||||
metaTable(),
|
||||
motionTitle(),
|
||||
motionPreamble(),
|
||||
motionText(),
|
||||
];
|
||||
if (motionReason()) {
|
||||
|
@ -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',
|
||||
@ -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');
|
||||
|
Binary file not shown.
@ -343,6 +343,9 @@
|
||||
<ng-include src="'static/templates/motions/motion-detail/toolbar.html'"></ng-include>
|
||||
|
||||
<div ng-class="{'col-sm-8': (lineNumberMode != 'outside'), 'col-sm-12': (lineNumberMode == 'outside')}">
|
||||
|
||||
<div><p>{{ config('motions_preamble') | translate }}</p></div>
|
||||
|
||||
<div class="motion-text-holder">
|
||||
|
||||
<!-- Original view -->
|
||||
|
@ -75,6 +75,9 @@
|
||||
</h2>
|
||||
</div>
|
||||
|
||||
<!-- Preamble -->
|
||||
<div><p>{{ config('motions_preamble') | translate }}</p></div>
|
||||
|
||||
<!-- Text -->
|
||||
<div ng-bind-html="motion.getTextWithLineBreaks(null, line, scroll) | trusted"
|
||||
class="motion-text line-numbers-{{ config('motions_default_line_numbering') }}"></div>
|
||||
|
Loading…
Reference in New Issue
Block a user