ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5674 from jwinzer/cinema-speaker-list

Browse Source 
Cinema needs perm to show list of speakers. Use content-container.
This commit is contained in:
Emanuel Schütze 2020-11-05 22:48:00 +01:00 committed by GitHub
commit a49ed17b45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/src/app/site/cinema/components/cinema/cinema.component.html
View File

@ -3,9 +3,9 @@
<h2>{{ 'Autopilot' | translate }}</h2> <h2>{{ 'Autopilot' | translate }}</h2>
</div> </div>
</os-head-bar> </os-head-bar>
<div class="content-container">
<!-- Title Card --> <!-- Title Card -->
<mat-card class="os-card"> <mat-card class="os-card">
<h1 class="line-and-icon"> <h1 class="line-and-icon">
{{ title }} {{ title }}
<a <a
@ -18,10 +18,13 @@
<mat-icon>open_in_new</mat-icon> <mat-icon>open_in_new</mat-icon>
</a> </a>
</h1> </h1>
</mat-card> </mat-card>
<!-- List of speakers --> <!-- List of speakers -->
<os-list-of-speakers-content [customTitle]="true" [speakers]="listOfSpeakers"> <os-list-of-speakers-content
[customTitle]="true" [speakers]="listOfSpeakers"
*osPerms="'agenda.can_see_list_of_speakers'"
>
<p class="subtitle-text line-and-icon"> <p class="subtitle-text line-and-icon">
<a [routerLink]="closUrl" [class.disabled]="!closUrl"> <a [routerLink]="closUrl" [class.disabled]="!closUrl">
{{ 'List of speakers' | translate }} {{ 'List of speakers' | translate }}
@ -30,16 +33,17 @@
lock lock
</mat-icon> </mat-icon>
</p> </p>
</os-list-of-speakers-content> </os-list-of-speakers-content>
<os-poll-collection [currentProjection]="projectedViewModel"></os-poll-collection> <os-poll-collection [currentProjection]="projectedViewModel"></os-poll-collection>
<!-- Projector --> <!-- Projector -->
<mat-card class="os-card spacer-bottom-60"> <mat-card class="os-card spacer-bottom-60">
<p class="subtitle-text">{{ projectorTitle | translate }}</p> <p class="subtitle-text">{{ projectorTitle | translate }}</p>
<a [routerLink]="projectorUrl" [target]="projectionTarget"> <a [routerLink]="projectorUrl" [target]="projectionTarget">
<div class="projector"> <div class="projector">
<os-projector *ngIf="projector" [projector]="projector"></os-projector> <os-projector *ngIf="projector" [projector]="projector"></os-projector>
</div> </div>
</a> </a>
</mat-card> </mat-card>
</div>