diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index 827827b59..c082cd255 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -1331,6 +1331,10 @@ img { .scroll-x-container { overflow-x: auto; } +.import-preview p { + margin: 0; + padding: 0; +} /* user details */ .user_details fieldset { diff --git a/openslides/motions/static/js/motions/motion-services.js b/openslides/motions/static/js/motions/motion-services.js index 3deb3c3cd..c728fb46b 100644 --- a/openslides/motions/static/js/motions/motion-services.js +++ b/openslides/motions/static/js/motions/motion-services.js @@ -79,8 +79,8 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions', motion = _motion; // If this is not updated, obj.originalHtml = motion.getTextWithLineBreaks(versionId); obj.changed = false; - obj.editor.setReadOnly(true); if (obj.editor) { + obj.editor.setReadOnly(true); obj.editor.setData(obj.originalHtml); } }; diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index c762353b7..923c5fc37 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1263,7 +1263,7 @@ angular.module('OpenSlidesApp.motions.site', [ {headers: {'Content-Type': 'application/json'}, data: JSON.stringify({version_number: version.version_number})}) .then(function(success) { - $scope.showVersion(motion.active_version); + $scope.showVersion({id: motion.active_version}); }); }; // check if user is allowed to see at least one comment field diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html index 0317185d9..4bb5feb7a 100644 --- a/openslides/motions/static/templates/motions/motion-detail.html +++ b/openslides/motions/static/templates/motions/motion-detail.html @@ -495,7 +495,7 @@ Version {{ version.version_number }} - + Version {{ version.version_number }} diff --git a/openslides/motions/static/templates/motions/motion-detail/toolbar.html b/openslides/motions/static/templates/motions/motion-detail/toolbar.html index ef927e572..a90b6e900 100644 --- a/openslides/motions/static/templates/motions/motion-detail/toolbar.html +++ b/openslides/motions/static/templates/motions/motion-detail/toolbar.html @@ -54,7 +54,9 @@ diff --git a/openslides/motions/static/templates/motions/motion-import.html b/openslides/motions/static/templates/motions/motion-import.html index 31a9cb325..dd68b318f 100644 --- a/openslides/motions/static/templates/motions/motion-import.html +++ b/openslides/motions/static/templates/motions/motion-import.html @@ -77,8 +77,11 @@ - {{ motion.text | limitTo:80 }}{{ motion.text.length > 80 ? '...' : '' }} - {{ motion.reason | limitTo:80 }}{{ motion.reason.length > 80 ? '...' : '' }} + + {{ motion.text.length > 90 ? '...' : '' }} + + + {{ motion.reason.length > 90 ? '...' : '' }}