Merge pull request #3700 from FinnStutzenstein/titleInMotionBlockSlide

Added a short title in the motion block slide

CHANGELOG

@@ -68,6 +68,7 @@ Motions:
 - Save pagination sate to session storage [#3569].
 - Split up 'can_see_and_manage_comments' permission in two seperate
   ones [#3565].
+- Added (shortened) motion title to motion block slide [#3700].
 
 Elections:
 - Added pagination for list view [#3393].

openslides/motions/static/js/motions/motion-block-projector.js

@@ -26,6 +26,33 @@ angular.module('OpenSlidesApp.motions.motionBlockProjector', [])
         // class.
         var id = $scope.element.id;
         MotionBlock.bindOne(id, $scope, 'motionBlock');
+
+        // Returns a shortened motion title. If the title is longer then maxLength, it is
+        // split at the last whitespace that is in maxLength. Three dots are added then.
+        $scope.getShortTitle = function (motion) {
+            var maxLength = 40;
+            var title = motion.getTitle();
+
+            if (title.length <= maxLength) {
+                return title;
+            }
+
+            // Find last whitespace that is before maxLength. Split the title
+            // there and append dots.
+            var whitespaceIndex = -1;
+            for (var i = 0; i < maxLength+1; i++) {
+                if (title[i] === ' ') {
+                    whitespaceIndex = i;
+                }
+            }
+
+            if (whitespaceIndex === -1) {
+                // just one long word.. split it :/
+                return title.substr(0, maxLength) + '...';
+            } else {
+                return title.substr(0, whitespaceIndex) + '...';
+            }
+        };
     }
 ]);
 

openslides/motions/static/templates/motions/slide_motion_block.html

@@ -8,7 +8,8 @@
   <!-- motion list -->
   <div class="motion-block zoomcontent">
     <div ng-repeat="motion in motionBlock.motions">
-      {{ motion.identifier }}
+      {{ motion.identifier }}:
+      {{ getShortTitle(motion) }}
       <br>
       <span class="label" ng-class="'label-'+motion.recommendation.css_class">
         {{ motion.getRecommendationName() }}