From aee8ed2f3b0e2fc496b1c61d5f7e0faf2b540f92 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 10 Feb 2016 17:49:44 +0100
Subject: [PATCH] Template fixes

- Show correct last speakers on list of speakers slide.
- Fixes config input type.
- Fixes config style for checkboxes.
- Improved line-height on projector for scaling.
---
 openslides/agenda/static/templates/agenda/item-detail.html    | 2 +-
 .../static/templates/agenda/slide-list-of-speakers.html       | 4 ++--
 openslides/core/static/css/projector.css                      | 2 +-
 openslides/core/static/templates/config-form-field.html       | 3 ++-
 openslides/motions/signals.py                                 | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/openslides/agenda/static/templates/agenda/item-detail.html b/openslides/agenda/static/templates/agenda/item-detail.html
index e19ca9bb7..797323d63 100644
--- a/openslides/agenda/static/templates/agenda/item-detail.html
+++ b/openslides/agenda/static/templates/agenda/item-detail.html
@@ -107,7 +107,7 @@
   <!-- Next speakers -->
   <h3 translate>Next speakers</h3>
   <div ng-show="speakers.length > 0">
-    <div ui-tree="treeOptions" class="halfWidth">
+    <div ui-tree="treeOptions">
       <ol ui-tree-nodes="" ng-model="speakers">
         <li ng-repeat="speaker in speakers | filter: {begin_time: null}" ui-tree-node>
           <i os-perms="agenda.can_manage" ui-tree-handle="" class="fa fa-arrows-v"></i>
diff --git a/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html b/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html
index 18fc7b90e..0eb2acb5f 100644
--- a/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html
+++ b/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html
@@ -12,8 +12,8 @@
   </div>
 
   <!-- Last speakers -->
-  <p ng-repeat="speaker in item.speakers | filter: {end_time: '!!', begin_time: '!!'} |
-      limitTo: config('agenda_show_last_speakers')" class="lastSpeakers">
+  <p ng-repeat="speaker in lastSpeakers = (item.speakers | filter: {end_time: '!!', begin_time: '!!'}) |
+      limitTo: config('agenda_show_last_speakers') : (lastSpeakers.length - config('agenda_show_last_speakers'))" class="lastSpeakers">
       {{ speaker.user.get_full_name() }}
 
   <!-- Current speaker -->
diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css
index 5d78bb6ca..d0a745789 100644
--- a/openslides/core/static/css/projector.css
+++ b/openslides/core/static/css/projector.css
@@ -82,7 +82,7 @@ body{
     top: 150px;
     right: 50px;
     z-index: -1;
-    line-height: 28px;
+    line-height: 1.3em;
 }
 .scrollcontent {
     transition-property: margin, font-size;
diff --git a/openslides/core/static/templates/config-form-field.html b/openslides/core/static/templates/config-form-field.html
index c1e4172ca..1e9c10952 100644
--- a/openslides/core/static/templates/config-form-field.html
+++ b/openslides/core/static/templates/config-form-field.html
@@ -5,8 +5,9 @@
     <input ng-if="type != 'choice' && type != 'textarea'"
            ng-model="$parent.value"
            ng-change="save(configOption.key, $parent.value)"
+           ng-class="{ 'form-control': type != 'checkbox' }"
            id="{{ key }}"
-        type="{{ type }}" class="form-control">
+        type="{{ type }}">
 
     <textarea ng-if="type == 'textarea'"
               ng-model="$parent.value"
diff --git a/openslides/motions/signals.py b/openslides/motions/signals.py
index 27f7e5e55..c2719cdfb 100644
--- a/openslides/motions/signals.py
+++ b/openslides/motions/signals.py
@@ -68,7 +68,7 @@ def setup_motion_config(sender, **kwargs):
         subgroup=ugettext_lazy('General'))
 
     # Amendments
-
+    # Amendments currently not implemented. (TODO: Implement it like in OpenSlides 1.7.)
     yield ConfigVariable(
         name='motions_amendments_enabled',
         default_value=False,
@@ -167,6 +167,7 @@ def setup_motion_config(sender, **kwargs):
     yield ConfigVariable(
         name='motions_pdf_paragraph_numbering',
         default_value=False,
+        input_type='boolean',
         label=ugettext_lazy('Show paragraph numbering (only in PDF)'),
         weight=380,
         group=ugettext_lazy('Motion'),