diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html index 3582f7dc7..c6f3b8dbc 100644 --- a/openslides/assignments/static/templates/assignments/assignment-detail.html +++ b/openslides/assignments/static/templates/assignments/assignment-detail.html @@ -232,7 +232,9 @@ {{ vote.label }}: {{ vote.value }} {{ vote.percentStr }}
- + + +
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index 8529c7949..538b71cf8 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -545,7 +545,6 @@ img { border-radius: 0.25em; top: 4px; left: 43px; - cursor: pointer; font-family: FontAwesome; font-size: 12px; color: white; diff --git a/openslides/motions/static/js/motions/pdf.js b/openslides/motions/static/js/motions/pdf.js index b559a593a..f541f94c1 100644 --- a/openslides/motions/static/js/motions/pdf.js +++ b/openslides/motions/static/js/motions/pdf.js @@ -495,14 +495,22 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) // function to create the table of catergories (if any) var createTOCategories = function() { - if (Category.getAll().length > 1) { + var categories = []; + _.forEach(allMotions, function(motion) { + var category = motion.getCategory(); + if (category) { + categories.push(category); + } + }); + categories = _.uniqBy(categories, 'id'); + if (categories.length > 1) { var heading = { text: gettextCatalog.getString("Categories"), style: "heading2" }; var toc = []; - angular.forEach(Category.filter({orderBy: 'prefix'}) , function(cat) { + angular.forEach(_.orderBy(categories, ['prefix']), function(cat) { toc.push( { columns: [ diff --git a/openslides/motions/static/templates/motions/motion-detail/change-summary.html b/openslides/motions/static/templates/motions/motion-detail/change-summary.html index 653cbbfeb..3e2ef77e8 100644 --- a/openslides/motions/static/templates/motions/motion-detail/change-summary.html +++ b/openslides/motions/static/templates/motions/motion-detail/change-summary.html @@ -4,7 +4,7 @@ Summary of change recommendations: -