diff --git a/openslides/assignments/static/templates/assignments/slide_assignment.html b/openslides/assignments/static/templates/assignments/slide_assignment.html
index 628436781..b4d700348 100644
--- a/openslides/assignments/static/templates/assignments/slide_assignment.html
+++ b/openslides/assignments/static/templates/assignments/slide_assignment.html
@@ -77,20 +77,22 @@
-
+
Valid ballots
- |
+ |
{{ vote.value }} {{ vote.percentStr }}
- |
+
+
Invalid ballots
- |
+ |
{{ vote.value }} {{ vote.percentStr }}
- |
+
+
Casted ballots
- |
+ |
{{ vote.value }} {{ vote.percentStr }}
diff --git a/openslides/core/static/js/core/projector.js b/openslides/core/static/js/core/projector.js
index 1146b6998..b31fcbb7c 100644
--- a/openslides/core/static/js/core/projector.js
+++ b/openslides/core/static/js/core/projector.js
@@ -218,7 +218,8 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
if (matchingElement) {
// copy all changed properties.
_.forEach(newElement, function (value, key) {
- if (newElement.hasOwnProperty(key) && !key.startsWith('$')) {
+ // key has own property and does not start with a '$'.
+ if (newElement.hasOwnProperty(key) && key.indexOf('$') != 0) {
if (typeof matchingElement[key] === 'undefined' || matchingElement[key] !== value) {
matchingElement[key] = value;
}
diff --git a/openslides/motions/static/js/motions/pdf.js b/openslides/motions/static/js/motions/pdf.js
index 7f8fd39cb..bdef6a492 100644
--- a/openslides/motions/static/js/motions/pdf.js
+++ b/openslides/motions/static/js/motions/pdf.js
@@ -312,7 +312,14 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
style: 'heading3',
marginTop: 25,
});
- reason.push(converter.convertHTML(motion.getReason(motionVersion), 'none'));
+ reason.push({
+ columns: [
+ {
+ width: '80%',
+ stack: converter.convertHTML(motion.getReason(motionVersion), 'none'),
+ },
+ ]
+ });
}
return reason;
}
|