Merge pull request #3808 from FinnStutzenstein/diverses

Layout changes for motion detail view and PDF

openslides/core/static/js/core/pdf.js

@@ -962,7 +962,9 @@ angular.module('OpenSlidesApp.core.pdf', [])
                                             currentParagraph.text.push(create('text', ' '));
                                         } else if (isInsideAList(element) && lineNumberMode === 'none') {
                                             // Put a spacer there, if there is one BR in a list
-                                            alreadyConverted.push(create('text', ' '));
+                                            var spacer = create('text', ' ');
+                                            spacer.lineHeight = 0.25;
+                                            alreadyConverted.push(spacer);
                                         }
                                         currentParagraph.lineHeight = 1.25;
                                         alreadyConverted.push(currentParagraph);

openslides/motions/static/css/motions/_site.scss

@@ -112,7 +112,7 @@
 }
 
 .motion-text.line-numbers-none li > br {
-    margin-top: 8px;
+    margin-top: 6px;
     content: " ";
     display: block;
     &.os-line-break {

openslides/motions/static/js/motions/site.js

@@ -843,6 +843,10 @@ angular.module('OpenSlidesApp.motions.site', [
                 var someMotionsHaveAmendments = _.some(motions, function (motion) {
                     return motion.hasAmendments();
                 });
+                // if amendments amendments are already included. We owudl have them twice, if the option is enabled.
+                if (Config.get('motions_amendments_main_table').value) {
+                    someMotionsHaveAmendments = false;
+                }
                 var getMetaInformationOptions = function (disabled) {
                     if (!disabled) {
                         disabled = {};

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

@@ -174,7 +174,7 @@
           <div ng-if="!motion.isAmendment && motion.isAllowed('can_see_amendments')">
             <h3 translate>Amendments</h3>
             <a ng-if="motion.hasAmendments()" ui-sref="motions.motion.amendment-list({id: motion.id})">
-              {{ motion.getAmendments().length }} <translate>Amendments</translate><br>
+              {{ motion.getAmendments().length }} {{ (motion.getAmendments().length === 1 ? 'Amendment' : 'Amendments') | translate }}<br>
             </a>
             <button ng-if="motion.isAllowed('can_create_amendment')" ng-click="newAmendment()" class="btn btn-default btn-sm">
               <i class="fa fa-plus"></i>
@@ -556,16 +556,16 @@
           </div>
 
           <div style="text-align: right;" ng-if="(change_recommendations | filter:{motion_version_id:version}:true).length > 0">
-            <button class="btn btn-default"
+            <button class="btn btn-default btn-sm" os-perms="motions.can_manage"
-                    ng-bootbox-confirm="{{ 'Do you want to copy the final version to the modified final version field?' | translate }}"
+                    ng-bootbox-confirm="{{ 'Do you want to copy the final version to the final print template?' | translate }}"
                     ng-bootbox-confirm-action="viewChangeRecommendations.copyToModifiedFinalVersion(motion, version)">
               <i class="fa fa-file-text"></i>
-              <translate>Copy to modified final version</translate>
+              <translate>Create final print template</translate>
             </button>
           </div>
 
           <div style="text-align: right;" ng-if="motion.state.versioning && (change_recommendations | filter:{motion_version_id:version}:true).length > 0">
-            <button class="btn btn-default"
+            <button class="btn btn-default btn-sm"
                     ng-bootbox-confirm="{{ 'Do you want to create a new version of this motion based on this changes?' | translate }}"
                     ng-bootbox-confirm-action="viewChangeRecommendations.newVersionIncludingChanges(motion, version, false)">
               <i class="fa fa-file-text"></i>

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

@@ -103,13 +103,14 @@
                        ng-checked="viewChangeRecommendations.mode == 'agreed'">
                 <translate>Final version</translate>
             </label>
-            <label class="btn btn-sm btn-default" ng-if="motion.getModifiedFinalVersion()"
+            <label class="btn btn-sm btn-default" os-perms="motions.can_manage"
+                   ng-show="motion.getModifiedFinalVersion()"
                    ng-class="{active: (viewChangeRecommendations.mode == 'modified_agreed')}"
                    ng-click="viewChangeRecommendations.mode = 'modified_agreed'">
                 <input type="radio" name="viewChangeRecommendations.mode" value="modified_agreed"
                        ng-model="viewChangeRecommendations.mode"
                        ng-checked="viewChangeRecommendations.mode == 'modified_agreed'">
-                <translate>Modified final version</translate>
+                <translate>Final print template</translate>
             </label>
         </div>
 
@@ -141,6 +142,11 @@
                 <i class="fa fa-check" ng-if="viewChangeRecommendations.mode == 'agreed'"></i>
                 <translate>Final version</translate>
               </a>
+            <li os-perms="motions.can_manage">
+              <a href="" ng-click="viewChangeRecommendations.mode = 'modified_agreed'">
+                <i class="fa fa-check" ng-if="viewChangeRecommendations.mode == 'modified_agreed'"></i>
+                <translate>Final print template</translate>
+              </a>
           </ul>
         </div>
     </div>

openslides/motions/static/templates/motions/motion-detail/view-modified-agreed.html

@@ -1,17 +1,17 @@
 <!-- Modified agreed view -->
 <div ng-if="viewChangeRecommendations.mode == 'modified_agreed'">
+    <div style="text-align: right;">
+      <button class="btn btn-default btn-danger btn-sm"
+          ng-bootbox-confirm="{{ 'Do you want to delete the final print template?' | translate }}"
+          ng-bootbox-confirm-action="viewChangeRecommendations.deleteModifiedFinalVersion(motion, version)">
+        <i class="fa fa-trash"></i>
+        <translate>Delete final print template</translate>
+      </button>
+    </div>
     <div id="view-modified-agreed-inline-editor" ng-bind-html="motion.getModifiedFinalVersionWithLineBreaks(version) | trusted"
       class="motion-text motion-text-original line-numbers-{{ lineNumberMode }}"
       contenteditable="{{ modifiedFinalVersionInlineEditing.isEditable }}">
     </div>
-    <div style="text-align: right;">
-      <button class="btn btn-default btn-danger"
-          ng-bootbox-confirm="{{ 'Do you want to delete the modified final version?' | translate }}"
-          ng-bootbox-confirm-action="viewChangeRecommendations.deleteModifiedFinalVersion(motion, version)">
-        <i class="fa fa-trash"></i>
-        <translate>Delete modified final version</translate>
-      </button>
-    </div>
     <div class="motion-save-toolbar" ng-class="{ 'visible': modifiedFinalVersionInlineEditing.active && modifiedFinalVersionInlineEditing.changed }">
         <div class="changed-hint" translate>The modified final version have been changed.</div>
         <button type="button" ng-click="modifiedFinalVersionInlineEditing.save()" class="btn btn-primary" translate>