Merge pull request #3034 from FinnStutzenstein/TemplateFixes

Small template improvements

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 {

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);
                 }
             };

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

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

@@ -495,7 +495,7 @@
               <span ng-if="$parent.version == version.id">
                 <strong><translate>Version</translate> {{ version.version_number }}</strong>
               </span>
-              <a ng-if="$parent.version != version.id" ng-click="showVersion(version)">
+              <a href="" ng-if="$parent.version != version.id" ng-click="showVersion(version)">
                 <translate>Version</translate> {{ version.version_number }}
               </a>
               <!-- active version -->

openslides/motions/static/templates/motions/motion-detail/toolbar.html

@@ -54,7 +54,9 @@
             </span>
             <button type="button" class="btn btn-sm btn-default"
                 ng-click="lineNumberForm.$show()"
-                ng-if="lineNumberMode != 'none'">
+                ng-if="lineNumberMode != 'none'"
+                uib-tooltip="{{ 'Jump to a given line' | translate }}"
+                tooltip-class="nobr">
                 <i class="fa fa-share"></i>
                 <translate>go</translate>
             </button>

openslides/motions/static/templates/motions/motion-import.html

@@ -77,8 +77,11 @@
               <span ng-if="motion.text_error" title="{{ motion.text_error | translate }}">
                 <i class="fa fa-exclamation-triangle"></i>
               </span>
-              {{ motion.text | limitTo:80 }}{{ motion.text.length > 80 ? '...' : '' }}
-            <td>{{ motion.reason | limitTo:80 }}{{ motion.reason.length > 80 ? '...' : '' }}
+              <span class="import-preview" ng-bind-html="motion.text | limitTo:90 | trusted"></span>
+              {{ motion.text.length > 90 ? '...' : '' }}
+            <td>
+              <span class="import-preview" ng-bind-html="motion.reason | limitTo:90 | trusted"></span>
+              {{ motion.reason.length > 90 ? '...' : '' }}
             <td ng-class="{ 'text-warning': motion.submitter_create }">
               <span ng-if="motion.submitter_create" title="{{ motion.submitter_create | translate }}">
                 <i class="fa fa-plus-circle"></i>