Merge pull request #3078 from emanuelschuetze/template-fixes

Several template fixes

openslides/assignments/static/templates/assignments/assignment-detail.html

@@ -232,7 +232,9 @@
                     <span ng-if="poll.pollmethod == 'yna' || poll.pollmethod == 'yn'">{{ vote.label }}:</span>
                     {{ vote.value }} {{ vote.percentStr }}
                     <div ng-if="vote.percentNumber >= 0">
-                      <uib-progressbar value="vote.percentNumber" type="success"></uib-progressbar>
+                      <uib-progressbar ng-if="$index == 0" value="vote.percentNumber" type="success"></uib-progressbar>
+                      <uib-progressbar ng-if="$index == 1" value="vote.percentNumber" type="danger"></uib-progressbar>
+                      <uib-progressbar ng-if="$index == 2" value="vote.percentNumber" type="warning"></uib-progressbar>
                     </div>
                   </div>
                 </div>

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;

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: [

openslides/motions/static/templates/motions/motion-detail/change-summary.html

@@ -4,7 +4,7 @@
         <translate>Summary of change recommendations</translate>:
     </strong>
 
-    <button class="btn btn-sm btn-default pull-right"
+    <button os-perms="motions.can_manage" class="btn btn-sm btn-default pull-right"
         uib-tooltip="{{ 'Note: You have to reject all change recommendations if the plenum does not follow the recommendation.' | translate }}"
         ng-click="viewChangeRecommendations.rejectAll(motion)">
       <i class="fa fa-thumbs-down"></i>