From 7a73b301891111d16f61482afd9369ce228ac2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Wed, 15 Feb 2017 22:14:37 +0100
Subject: [PATCH] More layout fixes for motion diff view slide.

- Fixed wrong text order.
- Improved change summary box.
---
 openslides/core/static/css/app.css            | 10 +++---
 openslides/core/static/css/projector.css      | 35 ++-----------------
 .../templates/motions/motion-detail.html      |  3 ++
 .../motions/motion-detail/change-summary.html | 11 +++---
 .../motions/motion-detail/view-diff.html      |  1 -
 .../templates/motions/slide_motion.html       |  8 ++---
 6 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index 89ca1993e..45da3ff8d 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -609,11 +609,11 @@ img {
     padding-top: 5px;
 }
 .change-recommendation-overview {
-    margin-bottom: 50px;
-    padding: 10px;
+    margin-bottom: 30px;
+    padding: 10px 15px 0 10px;
 }
-.change-recommendation-overview h2 {
-    margin-top: 0;
+.change-recommendation-overview h3 {
+    margin-top: 10px;
 }
 .change-recommendation-overview ul {
     list-style: none;
@@ -628,7 +628,7 @@ img {
 }
 .change-recommendation-overview li > * {
     display: table-cell;
-    padding: 4px;
+    padding: 1px;
 }
 .change-recommendation-overview .status {
     color: gray;
diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css
index 5ea021930..ce5b52ad8 100644
--- a/openslides/core/static/css/projector.css
+++ b/openslides/core/static/css/projector.css
@@ -534,12 +534,9 @@ tr.elected td {
 }
 
 .diff-box {
-    background-color: #f9f9f9;
-    border: solid 1px #eee;
-    border-radius: 3px;
-    margin-bottom: 10px;
+    margin-left: 25px;
     padding-top: 0;
-    padding-right: 155px;
+    margin-top: -10px;
 }
 .motion-text-with-diffs .original-text {
     min-height: 30px; // Spacer between .diff-box, in case .original-text is empty
@@ -553,34 +550,6 @@ tr.elected td {
 .diff-box:hover {
     background-color: #f0f0f0;
 }
-.diff-box .action-row {
-    font-size: 0.8em;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    float: right;
-    width: 150px;
-    text-align: right;
-    margin-right: -150px;
-    opacity: 0.5;
-}
-.diff-box:hover .action-row {
-    opacity: 1;
-}
-.diff-box .action-row .btn-delete {
-    margin-left: 5px;
-    color: red;
-}
-.diff-box .action-row .btn-edit {
-    margin-left: 5px;
-}
-.diff-box .status-row {
-    font-style: italic;
-    color: gray;
-}
-.diff-box .status-row > *:after {
-    content: ':';
-}
-
 .motion-text-diff .delete {
     color: red;
     text-decoration: line-through;
diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html
index 12ee27aaf..55dc4c4fe 100644
--- a/openslides/motions/static/templates/motions/motion-detail.html
+++ b/openslides/motions/static/templates/motions/motion-detail.html
@@ -378,6 +378,9 @@
 
     <div ng-class="{'col-sm-8': (lineNumberMode != 'outside'), 'col-sm-12': (lineNumberMode == 'outside')}">
 
+      <ng-include ng-if="viewChangeRecommendations.mode == 'diff'"
+          src="'static/templates/motions/motion-detail/change-summary.html'"></ng-include>
+
       <div><p>{{ config('motions_preamble') | translate }}</p></div>
 
       <div class="motion-text-holder">
diff --git a/openslides/motions/static/templates/motions/motion-detail/change-summary.html b/openslides/motions/static/templates/motions/motion-detail/change-summary.html
index 14cef260d..a3a0d55e5 100644
--- a/openslides/motions/static/templates/motions/motion-detail/change-summary.html
+++ b/openslides/motions/static/templates/motions/motion-detail/change-summary.html
@@ -1,11 +1,11 @@
 <!-- A summary of all changes -->
 <section class="change-recommendation-overview">
-    <h2>
-        <translate>Summary of change recommendations</translate>
-    </h2>
+    <strong>
+        <translate>Summary of change recommendations</translate>:
+    </strong>
     <ul ng-if="change_recommendations.length > 0">
-        <li ng-repeat="change in (changes = (change_recommendations | filter:{motion_version_id:version}:true | orderBy: 'line_from')) "
-            ng-click="viewChangeRecommendations.scrollToDiffBox(change.id)">
+        <li ng-repeat="change in (changes = (change_recommendations | filter:{motion_version_id:version}:true | orderBy: 'line_from')) ">
+          <a href='' ng-click="viewChangeRecommendations.scrollToDiffBox(change.id)">
             <span ng-if="change.line_from >= change.line_to - 1" class="line-number">
                 <translate>Line</translate> {{ change.line_from }}:
             </span>
@@ -20,6 +20,7 @@
             <span class="status">
                 <translate ng-if="change.rejected">Rejected</translate>
             </span>
+          </a>
         </li>
     </ul>
     <div ng-if="change_recommendations.length == 0" class="no-changes">
diff --git a/openslides/motions/static/templates/motions/motion-detail/view-diff.html b/openslides/motions/static/templates/motions/motion-detail/view-diff.html
index 29efbc21f..448825d76 100644
--- a/openslides/motions/static/templates/motions/motion-detail/view-diff.html
+++ b/openslides/motions/static/templates/motions/motion-detail/view-diff.html
@@ -1,5 +1,4 @@
 <div ng-if="viewChangeRecommendations.mode == 'diff'">
-    <ng-include src="'static/templates/motions/motion-detail/change-summary.html'"></ng-include>
 
     <!-- The actual diff view -->
     <div class="motion-text-with-diffs line-numbers-{{ lineNumberMode }}">
diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html
index f757a7dfc..bc0c83b81 100644
--- a/openslides/motions/static/templates/motions/slide_motion.html
+++ b/openslides/motions/static/templates/motions/slide_motion.html
@@ -103,11 +103,11 @@
             ng-bind-html="change.getDiff(motion, null, line) | trusted">
           </div>
         </div>
-        <div class="motion-text original-text line-numbers-{{ config('motions_default_line_numbering') }}"
-          ng-bind-html="motion.getTextRemainderAfterLastChangeRecommendation(null, changes, line) | trusted">
-        </div>
-
       </div>
+      <div class="motion-text original-text line-numbers-{{ config('motions_default_line_numbering') }}"
+        ng-bind-html="motion.getTextRemainderAfterLastChangeRecommendation(null, changes, line) | trusted">
+      </div>
+
     </div>
   </div>