From 9518d1dab606a8a95579aa051868fd366eb70bf8 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@hotmail.de>
Date: Mon, 2 Sep 2019 08:05:45 +0200
Subject: [PATCH] Small changes

---
 .../common/common-list-of-speakers-slide-data.ts |  2 +-
 .../common-list-of-speakers-slide.component.scss |  4 ++--
 ...t-list-of-speakers-overlay-slide.component.ts | 16 +++-------------
 client/src/assets/styles/projector.scss          |  4 ++--
 openslides/agenda/config_variables.py            |  6 +++---
 openslides/agenda/projector.py                   |  7 +++----
 6 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/client/src/app/slides/agenda/common/common-list-of-speakers-slide-data.ts b/client/src/app/slides/agenda/common/common-list-of-speakers-slide-data.ts
index c328de2ee..45707de0c 100644
--- a/client/src/app/slides/agenda/common/common-list-of-speakers-slide-data.ts
+++ b/client/src/app/slides/agenda/common/common-list-of-speakers-slide-data.ts
@@ -1,4 +1,4 @@
-interface SlideSpeaker {
+export interface SlideSpeaker {
     user: string;
     marked: boolean;
 }
diff --git a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.scss b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.scss
index 31109a835..9a4d35aa0 100644
--- a/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.scss
+++ b/client/src/app/slides/agenda/common/common-list-of-speakers-slide.component.scss
@@ -1,7 +1,6 @@
 .lastSpeakers {
     color: #9a9898;
-    margin-left: 33px;
-    margin-bottom: 10px;
+    margin: 20px 0 10px 33px;
 }
 
 .currentSpeaker {
@@ -20,6 +19,7 @@
 .nextSpeakers {
     margin: 0;
     padding-left: 6px;
+    margin-top: 20px !important;
 
     li {
         list-style-position: inside;
diff --git a/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.component.ts b/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.component.ts
index 63bd16b89..13520a33f 100644
--- a/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.component.ts
+++ b/client/src/app/slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.component.ts
@@ -1,17 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 import { BaseSlideComponent } from 'app/slides/base-slide-component';
-import { CommonListOfSpeakersSlideData } from '../common/common-list-of-speakers-slide-data';
-
-/**
- * Interface, that describes how the speaker-objects look like.
- */
-interface SpeakerObject {
-    user: string;
-    marked: boolean;
-    end_time: number | null;
-    weight: number | null;
-}
+import { CommonListOfSpeakersSlideData, SlideSpeaker } from '../common/common-list-of-speakers-slide-data';
 
 @Component({
     selector: 'os-current-list-of-speakers-overlay-slide',
@@ -37,12 +27,12 @@ export class CurrentListOfSpeakersOverlaySlideComponent extends BaseSlideCompone
     /**
      * The current speaker.
      */
-    public currentSpeaker: SpeakerObject;
+    public currentSpeaker: SlideSpeaker;
 
     /**
      * List with the next speakers for this list.
      */
-    public nextSpeakers: SpeakerObject[] = [];
+    public nextSpeakers: SlideSpeaker[] = [];
 
     public constructor() {
         super();
diff --git a/client/src/assets/styles/projector.scss b/client/src/assets/styles/projector.scss
index dfc1b56de..a9ff06d87 100644
--- a/client/src/assets/styles/projector.scss
+++ b/client/src/assets/styles/projector.scss
@@ -23,7 +23,7 @@
 
     .slidetitle {
         border-bottom: 2px solid #d3d3d3;
-        padding-bottom: 20px;
+        padding-bottom: 10px;
 
         h1 {
             margin-bottom: 0;
@@ -34,7 +34,7 @@
         h2 {
             color: #9a9898;
             margin-top: 10px;
-            margin-bottom: 2px;
+            margin-bottom: -10px;
             font-size: 28px;
             font-weight: normal;
             display: block;
diff --git a/openslides/agenda/config_variables.py b/openslides/agenda/config_variables.py
index 2d2580db2..3b7991b7e 100644
--- a/openslides/agenda/config_variables.py
+++ b/openslides/agenda/config_variables.py
@@ -118,14 +118,14 @@ def get_config_variables():
 
     yield ConfigVariable(
         name="agenda_show_next_speakers",
-        default_value=0,
+        default_value=-1,
         input_type="integer",
         label="Number of the next speakers to be shown on the projector",
-        help_text="Enter number of the next shown speakers. Choose 0 to disable this.",
+        help_text="Enter number of the next shown speakers. Choose -1 to show all next speakers.",
         weight=222,
         group="Agenda",
         subgroup="List of speakers",
-        validators=(MinValueValidator(0),),
+        validators=(MinValueValidator(-1),),
     )
 
     yield ConfigVariable(
diff --git a/openslides/agenda/projector.py b/openslides/agenda/projector.py
index 3a08b6e56..9443acffc 100644
--- a/openslides/agenda/projector.py
+++ b/openslides/agenda/projector.py
@@ -157,11 +157,10 @@ async def get_list_of_speakers_slide_data(
     if number_of_last_speakers == 0:
         speakers_finished = []
     else:
-        speakers_finished = speakers_finished[
-            -number_of_last_speakers:
-        ]  # Take the last speakers
+        # Take the last speakers
+        speakers_finished = speakers_finished[-number_of_last_speakers:]
 
-    if number_of_next_speakers != 0:
+    if number_of_next_speakers != -1:
         speakers_waiting = speakers_waiting[:number_of_next_speakers]
 
     return {