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

Merge pull request #3439 from FinnStutzenstein/PdfInsertFix

Browse Source 
Fixed indention of inserted paragraphes
This commit is contained in:
Norman Jäckel 2017-10-12 20:29:41 +02:00 committed by GitHub
commit 3c9ae628e8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openslides/core/static/js/core/pdf.js
View File

@ -128,11 +128,14 @@ angular.module('OpenSlidesApp.core.pdf', [])
}); });
}; };
//checks if str is valid HTML. Returns valid HTML if not, //checks if str is valid HTML. Returns valid HTML if not,
//return emptystring if empty //return emptystring if empty
HTMLValidizer.validize = function(str) { HTMLValidizer.validize = function(str) {
if (str) { if (str) {
str = HTMLValidizer.replaceMalformedUmlauts(str); str = HTMLValidizer.replaceMalformedUmlauts(str);
// Sometimes, some \n are in the text instead of whitespaces. Replace them.
str = str.replace(/\n/g, ' ');
var a = document.createElement('div'); var a = document.createElement('div');
a.innerHTML = str; a.innerHTML = str;
@ -143,7 +146,7 @@ angular.module('OpenSlidesApp.core.pdf', [])
}); });
return "<p>" + str + "</p>"; return "<p>" + str + "</p>";
} else { } else {
return ""; //needed for blank "reaons" field return ""; //needed for blank "reasons" field
} }
}; };
return HTMLValidizer; return HTMLValidizer;
@ -823,6 +826,9 @@ angular.module('OpenSlidesApp.core.pdf', [])
if (classes.indexOf('os-split-before') === -1) { if (classes.indexOf('os-split-before') === -1) {
currentParagraph.margin[1] = 8; currentParagraph.margin[1] = 8;
} }
if (classes.indexOf('insert') > -1) {
currentParagraph.margin[0] = 20;
}
} }
currentParagraph.lineHeight = 1.25; currentParagraph.lineHeight = 1.25;
var stackP = create("stack"); var stackP = create("stack");

1
openslides/motions/static/js/motions/base.js
View File

@ -505,6 +505,7 @@ angular.module('OpenSlidesApp.motions', [
case 'create_poll': case 'create_poll':
return ( return (
operator.hasPerms('motions.can_manage') && operator.hasPerms('motions.can_manage') &&
this.state &&
this.state.allow_create_poll this.state.allow_create_poll
); );
case 'support': case 'support':