Fixed missplaced comma in pdf header (Fixed #2639)
This commit is contained in:
parent
e8bf67b185
commit
f9f9934722
@ -172,11 +172,11 @@ angular.module('OpenSlidesApp.core.pdf', [])
|
|||||||
var line1 = [
|
var line1 = [
|
||||||
Config.get('general_event_name').value,
|
Config.get('general_event_name').value,
|
||||||
Config.get('general_event_description').value
|
Config.get('general_event_description').value
|
||||||
].join(' – ');
|
].filter(Boolean).join(' – ');
|
||||||
var line2 = [
|
var line2 = [
|
||||||
Config.get('general_event_location').value,
|
Config.get('general_event_location').value,
|
||||||
Config.get('general_event_date').value
|
Config.get('general_event_date').value
|
||||||
].join(', ');
|
].filter(Boolean).join(', ');
|
||||||
var text = [line1, line2].join('\n');
|
var text = [line1, line2].join('\n');
|
||||||
columns.push({
|
columns.push({
|
||||||
text: text,
|
text: text,
|
||||||
@ -224,6 +224,7 @@ angular.module('OpenSlidesApp.core.pdf', [])
|
|||||||
subtitle: {
|
subtitle: {
|
||||||
fontSize: 9,
|
fontSize: 9,
|
||||||
margin: [0,-20,0,20],
|
margin: [0,-20,0,20],
|
||||||
|
color: 'grey'
|
||||||
},
|
},
|
||||||
preamble: {
|
preamble: {
|
||||||
fontSize: 10,
|
fontSize: 10,
|
||||||
|
@ -215,11 +215,14 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
|||||||
|
|
||||||
// motion reason heading
|
// motion reason heading
|
||||||
var motionReason = function() {
|
var motionReason = function() {
|
||||||
var reason = [{
|
var reason = [];
|
||||||
text: gettextCatalog.getString('Reason'),
|
if (motion.getReason($scope.version)) {
|
||||||
style: 'heading3'
|
reason.push({
|
||||||
}];
|
text: gettextCatalog.getString('Reason'),
|
||||||
reason.push(converter.convertHTML(motion.getReason($scope.version), $scope));
|
style: 'heading3'
|
||||||
|
});
|
||||||
|
reason.push(converter.convertHTML(motion.getReason($scope.version), $scope));
|
||||||
|
}
|
||||||
return reason;
|
return reason;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user