From 80a061db3847c085dc8d62084f15f1a0e24172f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Thu, 21 Feb 2019 15:06:14 +0100
Subject: [PATCH] Motion block slide template

---
 .../projector-button.component.html             |  2 +-
 .../projector-button.component.ts               |  6 ++++--
 .../projector/projector.component.scss          |  4 ++--
 .../motion-block-detail.component.html          |  6 ++----
 .../motion-list/motion-list.component.ts        |  5 ++++-
 .../motion-block-slide.component.html           | 17 ++++++++++++-----
 .../motion-block-slide.component.ts             |  4 ++--
 client/src/styles.scss                          |  2 +-
 openslides/motions/projector.py                 |  2 +-
 9 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/client/src/app/shared/components/projector-button/projector-button.component.html b/client/src/app/shared/components/projector-button/projector-button.component.html
index cea226f54..9336d7e63 100644
--- a/client/src/app/shared/components/projector-button/projector-button.component.html
+++ b/client/src/app/shared/components/projector-button/projector-button.component.html
@@ -3,7 +3,7 @@
         [ngClass]="isProjected() ? 'projector-active' : 'projector-inactive'">
         <mat-icon>videocam</mat-icon>
     </button>
-    <button type="button" *ngIf="menuItem" mat-menu-item (click)="onClick($event)"
+    <button type="button" *ngIf="menuItem" mat-menu-item (click)="onClick()"
         [ngClass]="isProjected() ? 'projector-active' : 'projector-inactive'">
         <mat-icon>videocam</mat-icon>
         <span translate>Project</span>
diff --git a/client/src/app/shared/components/projector-button/projector-button.component.ts b/client/src/app/shared/components/projector-button/projector-button.component.ts
index 57c6047a8..620839034 100644
--- a/client/src/app/shared/components/projector-button/projector-button.component.ts
+++ b/client/src/app/shared/components/projector-button/projector-button.component.ts
@@ -63,8 +63,10 @@ export class ProjectorButtonComponent implements OnInit {
      *
      * @param event  the click event
      */
-    public onClick(event: Event): void {
-        event.stopPropagation();
+    public onClick(event?: Event): void {
+        if (event) {
+            event.stopPropagation();
+        }
         if (this.object) {
             this.projectionDialogService.openProjectDialogFor(this.object);
         }
diff --git a/client/src/app/shared/components/projector/projector.component.scss b/client/src/app/shared/components/projector/projector.component.scss
index a57cbc37c..9cd237ea2 100644
--- a/client/src/app/shared/components/projector/projector.component.scss
+++ b/client/src/app/shared/components/projector/projector.component.scss
@@ -21,7 +21,7 @@
             background-repeat: no-repeat;
             background-size: 100% 100%;
             margin-bottom: 20px;
-            z-index: 1;
+            z-index: 9;
 
             .projector-logo-main {
                 height: 50px;
@@ -59,7 +59,7 @@
             width: 100%;
             height: 35px;
             bottom: 0;
-            z-index: 1;
+            z-index: 9;
 
             .footertext {
                 font-size: 16px;
diff --git a/client/src/app/site/motions/components/motion-block-detail/motion-block-detail.component.html b/client/src/app/site/motions/components/motion-block-detail/motion-block-detail.component.html
index f0b5ea0af..bf080dfce 100644
--- a/client/src/app/site/motions/components/motion-block-detail/motion-block-detail.component.html
+++ b/client/src/app/site/motions/components/motion-block-detail/motion-block-detail.component.html
@@ -104,10 +104,8 @@
         <span translate>List of speakers</span>
     </button>
 
-    <button mat-menu-item *osPerms="'core.can_manage_projector'">
-        <mat-icon>videocam</mat-icon>
-        <span translate>Project</span>
-    </button>
+    <os-projector-button *ngIf="block" [object]="block" [menuItem]="true"></os-projector-button>
+
     <div *osPerms="['motions.can_manage', 'motions.can_manage_metadata']">
         <button mat-menu-item (click)="toggleEditMode()">
             <mat-icon>edit</mat-icon>
diff --git a/client/src/app/site/motions/components/motion-list/motion-list.component.ts b/client/src/app/site/motions/components/motion-list/motion-list.component.ts
index f62e35d49..04bbc373e 100644
--- a/client/src/app/site/motions/components/motion-list/motion-list.component.ts
+++ b/client/src/app/site/motions/components/motion-list/motion-list.component.ts
@@ -41,7 +41,7 @@ export class MotionListComponent extends ListViewBaseComponent<ViewMotion, Motio
     /**
      * Columns to display in table when desktop view is available
      */
-    public displayedColumnsDesktop: string[] = ['identifier', 'title', 'state', 'speakers'];
+    public displayedColumnsDesktop: string[] = ['identifier', 'title', 'state'];
 
     /**
      * Columns to display in table when mobile view is available
@@ -237,6 +237,9 @@ export class MotionListComponent extends ListViewBaseComponent<ViewMotion, Motio
         if (this.isMultiSelect) {
             columns = ['selector'].concat(columns);
         }
+        if (this.operator.hasPerms('agenda.can_see')) {
+            columns = columns.concat(['speakers']);
+        }
         return columns;
     }
 
diff --git a/client/src/app/slides/motions/motion-block/motion-block-slide.component.html b/client/src/app/slides/motions/motion-block/motion-block-slide.component.html
index da0370bb4..9389b057a 100644
--- a/client/src/app/slides/motions/motion-block/motion-block-slide.component.html
+++ b/client/src/app/slides/motions/motion-block/motion-block-slide.component.html
@@ -1,10 +1,17 @@
 <div *ngIf="data">
-    <h1>{{ data.data.title }}</h1>
+    <div class="slidetitle">
+        <h1>{{ data.data.title }}</h1>
+        <h2><span translate>Motion block</span> – {{ data.data.motions.length }} <span translate>motions</span></h2>
+    </div>
 
     <div *ngFor="let motion of data.data.motions">
-        {{ getMotionTitle(motion) }}
-        <mat-basic-chip *ngIf="motion.recommendation" disableRipple [ngClass]="getStateCssColor(motion)">
-            {{ getStateLabel(motion) }}
-        </mat-basic-chip>
+        <div class="ellipsis-overflow">
+            {{ motion.identifier }}: {{ motion.title }}
+        </div>
+        <div class="white ellipsis-overflow">
+            <mat-basic-chip *ngIf="motion.recommendation" disableRipple [ngClass]="getStateCssColor(motion)">
+                {{ getRecommendationLabel(motion) }}
+            </mat-basic-chip>
+        </div>
     </div>
 </div>
diff --git a/client/src/app/slides/motions/motion-block/motion-block-slide.component.ts b/client/src/app/slides/motions/motion-block/motion-block-slide.component.ts
index 8c228fb4f..037d458a8 100644
--- a/client/src/app/slides/motions/motion-block/motion-block-slide.component.ts
+++ b/client/src/app/slides/motions/motion-block/motion-block-slide.component.ts
@@ -25,10 +25,10 @@ export class MotionBlockSlideComponent extends BaseSlideComponent<MotionBlockSli
         return StateCssClassMapping[motion.recommendation.css_class] || '';
     }
 
-    public getStateLabel(motion: MotionBlockSlideMotionRepresentation): string {
+    public getRecommendationLabel(motion: MotionBlockSlideMotionRepresentation): string {
         let recommendation = this.translate.instant(motion.recommendation.name);
         if (motion.recommendation_extension) {
-            recommendation += ' ' + motion.recommendation_extension;
+            recommendation += ' ' + this.motionRepo.solveExtensionPlaceHolder(motion.recommendation_extension);
         }
         return recommendation;
     }
diff --git a/client/src/styles.scss b/client/src/styles.scss
index aedcb0ac9..95c7e5177 100644
--- a/client/src/styles.scss
+++ b/client/src/styles.scss
@@ -617,7 +617,7 @@ button.mat-menu-item.selected {
         margin-bottom: 40px;
 
         h1 {
-            font-size: 2em;
+            font-size: 1.8em;
             line-height: 1.1em;
             margin-bottom: 0;
             padding-bottom: 0;
diff --git a/openslides/motions/projector.py b/openslides/motions/projector.py
index bca0e7897..e46e6d08a 100644
--- a/openslides/motions/projector.py
+++ b/openslides/motions/projector.py
@@ -234,7 +234,7 @@ def motion_block_slide(all_data: AllData, element: Dict[str, Any]) -> Dict[str,
                     all_data, motion, motion["recommendation_id"]
                 )
                 motion_object["recommendation"] = {
-                    "name": recommendation["name"],
+                    "name": recommendation["recommendation_label"],
                     "css_class": recommendation["css_class"],
                 }
                 if recommendation["show_recommendation_extension_field"]: