diff --git a/openslides/assignments/static/js/assignments/pdf.js b/openslides/assignments/static/js/assignments/pdf.js index 8253da308..be89f1978 100644 --- a/openslides/assignments/static/js/assignments/pdf.js +++ b/openslides/assignments/static/js/assignments/pdf.js @@ -80,7 +80,7 @@ angular.module('OpenSlidesApp.assignments.pdf', ['OpenSlidesApp.core.pdf']) style: 'textItem' }, { - ol: userList, + ul: userList, style: 'textItem' } ] diff --git a/openslides/assignments/static/js/assignments/projector.js b/openslides/assignments/static/js/assignments/projector.js index d93021c64..2be4c2749 100644 --- a/openslides/assignments/static/js/assignments/projector.js +++ b/openslides/assignments/static/js/assignments/projector.js @@ -22,7 +22,7 @@ angular.module('OpenSlidesApp.assignments.projector', ['OpenSlidesApp.assignment // Add it to the coresponding get_requirements method of the ProjectorElement // class. var id = $scope.element.id; - var poll = $scope.element.poll; + $scope.showResult = $scope.element.poll; Assignment.bindOne(id, $scope, 'assignment'); Assignment.getPhases().then(function(phases) { diff --git a/openslides/assignments/static/js/assignments/site.js b/openslides/assignments/static/js/assignments/site.js index 520b966ad..160db603d 100644 --- a/openslides/assignments/static/js/assignments/site.js +++ b/openslides/assignments/static/js/assignments/site.js @@ -361,7 +361,7 @@ angular.module('OpenSlidesApp.assignments.site', [ display_name: gettext('Title')}, {name: 'phase', display_name: gettext('Phase')}, - {name: 'assignment.assignment_related_users.length', + {name: 'assignment_related_users.length', display_name: gettext('Number of candidates')}, ]; $scope.hasTag = function (assignment, tag) { diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html index ffd8db61f..900e1e4a5 100644 --- a/openslides/assignments/static/templates/assignments/assignment-detail.html +++ b/openslides/assignments/static/templates/assignments/assignment-detail.html @@ -82,7 +82,7 @@

Candidates

-
    +
+
diff --git a/openslides/assignments/static/templates/assignments/slide_assignment.html b/openslides/assignments/static/templates/assignments/slide_assignment.html index 0c8dc016d..877d7f6aa 100644 --- a/openslides/assignments/static/templates/assignments/slide_assignment.html +++ b/openslides/assignments/static/templates/assignments/slide_assignment.html @@ -9,22 +9,22 @@
-
+
{{ assignment.description }}
-
+

Candidates

-
    +
    • {{ related_user.user.get_full_name() }} -
+
-
+
Candidates diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index dcb8e9615..48c05dd92 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -370,7 +370,7 @@ img { max-width: 100%; height: auto; } -.col1 ol { +.col1 ol, .col1 ul { margin-left: 15px; } .ballot-tabs ul { @@ -437,10 +437,6 @@ img { .motion-text .highlight { background-color: #ff0; } - -.motion-text li { - margin-left: 30px; -} .motion-text ins { color: green; text-decoration: underline; diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index aa0a438f1..7c738ca57 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1405,6 +1405,8 @@ angular.module('OpenSlidesApp.motions.site', [ } $scope.model.title = $scope.$parent.motion.getTitle(); $scope.model.parent_id = $scope.$parent.motion.id; + $scope.model.category_id = $scope.$parent.motion.category_id; + $scope.model.motion_block_id = $scope.$parent.motion.motion_block_id; Motion.bindOne($scope.model.parent_id, $scope, 'parent'); } // ... preselect default workflow