From bee73d3a282111aff9ff562b5380cc9fc3c901b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Tue, 13 Mar 2018 17:31:06 +0100
Subject: [PATCH] Layout improvements for agenda and motions

- Use more compact agenda on projector (reduce line height)
- Fixed sorting of motions and limit motion title lenght in recommendation dropdown menu.
- Improved CSS for using tables in topic text (site and projector).
---
 .../agenda/static/css/agenda/_projector.scss  | 30 +++++++------------
 .../templates/agenda/slide-item-list.html     |  5 ----
 openslides/core/static/css/_helper.scss       |  7 +++++
 .../templates/motions/motion-detail.html      |  5 ++--
 .../static/templates/topics/slide_topic.html  |  2 +-
 .../static/templates/topics/topic-detail.html |  2 +-
 6 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/openslides/agenda/static/css/agenda/_projector.scss b/openslides/agenda/static/css/agenda/_projector.scss
index 3546680d0..815771cf5 100644
--- a/openslides/agenda/static/css/agenda/_projector.scss
+++ b/openslides/agenda/static/css/agenda/_projector.scss
@@ -1,30 +1,22 @@
 @import 'list_of_speakers';
 
 /* Agenda list */
-.agendalist {
-    line-height: 1.5em;
-
-    p {
-        font-size: 140%;
-    }
-
-    .mainitem {
-        margin-top: 25px;
-    }
-
-    .subitem {
-        font-size: 100%;
-        margin-bottom: 4px;
-    }
-}
 .agendalist-table {
     td {
         vertical-align: top;
-        padding-left: 5px;
+        padding-left: 15px;
     }
 
-    .number {
-        padding: 0;
+    td.number {
+        padding-left: 0;
         white-space: nowrap;
     }
+
+    p.mainitem {
+        font-size: 140%;
+    }
+
+    p.subitem {
+        font-size: 100%;
+    }
 }
diff --git a/openslides/agenda/static/templates/agenda/slide-item-list.html b/openslides/agenda/static/templates/agenda/slide-item-list.html
index bcd1013bb..86ec80868 100644
--- a/openslides/agenda/static/templates/agenda/slide-item-list.html
+++ b/openslides/agenda/static/templates/agenda/slide-item-list.html
@@ -16,11 +16,6 @@
       {{ node.item.item_number }}
     </p>
   </td>
-  <td ng-if="!node.item.closed">
-    <p ng-class="{mainitem: node.item.parent_id === null}" ng-if="node.item.item_number">
-      &middot;
-    </p>
-  </td>
   <td ng-if="!node.item.closed">
     <p ng-class="{mainitem: node.item.parent_id === null, subitem: node.item.parent_id !== null}">
       {{ node.item.title }}
diff --git a/openslides/core/static/css/_helper.scss b/openslides/core/static/css/_helper.scss
index 62e946e10..503b54066 100644
--- a/openslides/core/static/css/_helper.scss
+++ b/openslides/core/static/css/_helper.scss
@@ -10,6 +10,8 @@
 
 .dropdown-menu {
     margin-left: 0px !important;
+    max-height: 300px;
+    overflow-y: auto;
 }
 
 .slimDropDown {
@@ -162,6 +164,11 @@
 }
 
 /* tables */
+.topictext table {
+    border-spacing: 10px 0;
+    border-collapse: separate;
+}
+
 .minimum {
     width: 1px;
 }
diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html
index ac799681f..eaffec05a 100644
--- a/openslides/motions/static/templates/motions/motion-detail.html
+++ b/openslides/motions/static/templates/motions/motion-detail.html
@@ -251,9 +251,10 @@
                     <translate>Motion</translate>
                   </span>
                   <ul uib-dropdown-menu class="dropdown-menu" aria-labelledby="motion-dropdown">
-                    <li ng-repeat="m in motions | orderBy: identifier">
+                    <li ng-repeat="m in motions | orderBy: 'identifier'">
                       <a href ng-click="addMotionToRecommendationField(m)">
-                        {{ m.identifier ? m.identifier + ':' : '' }} {{ m.getTitle() }}
+                        {{ m.identifier ? m.identifier + ':' : '' }}
+                        {{ m.getTitle() | limitTo: 35 }}{{ m.getTitle().length > 35 ? '...' : '' }}
                       </a>
                     </li>
                   </ul>
diff --git a/openslides/topics/static/templates/topics/slide_topic.html b/openslides/topics/static/templates/topics/slide_topic.html
index 272c5bf7c..29da04115 100644
--- a/openslides/topics/static/templates/topics/slide_topic.html
+++ b/openslides/topics/static/templates/topics/slide_topic.html
@@ -1,4 +1,4 @@
 <div ng-controller="SlideTopicCtrl" class="content scrollcontent">
   <h1>{{ topic.agenda_item.getTitle() }}</h1>
-  <div ng-bind-html="topic.text | trusted" class="zoomcontent"></div>
+  <div ng-bind-html="topic.text | trusted" class="zoomcontent topictext"></div>
 </div>
diff --git a/openslides/topics/static/templates/topics/topic-detail.html b/openslides/topics/static/templates/topics/topic-detail.html
index 3d0792f56..daf4ce012 100644
--- a/openslides/topics/static/templates/topics/topic-detail.html
+++ b/openslides/topics/static/templates/topics/topic-detail.html
@@ -26,7 +26,7 @@
 </div>
 
 <div class="details">
-  <div ng-bind-html="topic.text | trusted"></div>
+  <div ng-bind-html="topic.text | trusted" class="topictext"></div>
   <h3 ng-if="topic.attachments.length > 0" translate>Attachments</h3>
   <ul>
     <li ng-repeat="attachment in topic.attachments">