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

Adds the correct icon to the mobile action button

Browse Source 
Fixes an error where the name of an icon was shown instead of the icons
Adds the projector to agenda detail
This commit is contained in:
Sean Engelhardt 2019-09-05 12:49:21 +02:00 committed by Emanuel Schütze
parent 8ff03044de
commit 466c72bee8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/app/shared/components/head-bar/head-bar.component.html
View File

@ -66,10 +66,10 @@
(click)="sendMainEvent()" (click)="sendMainEvent()"
matTooltip="{{ mainActionTooltip | translate }}" matTooltip="{{ mainActionTooltip | translate }}"
> >
<mat-icon *ngIf="mainButtonIcon === 'add_circle'; else mainIconBlock"> <mat-icon *ngIf="mainButtonIcon === 'add_circle'">
add add
</mat-icon> </mat-icon>
<mat-icon *ngIf="mainButtonIcon !== 'add_circle'">
{{ mainButtonIcon }}
</mat-icon>
</button> </button>
<ng-template #mainIconBlock>
{{ mainButtonIcon }}
</ng-template>

1
client/src/app/site/topics/components/topic-detail/topic-detail.component.html
View File

@ -101,6 +101,7 @@
</mat-card> </mat-card>
<mat-menu #topicExtraMenu="matMenu"> <mat-menu #topicExtraMenu="matMenu">
<os-projector-button [object]="topic" [menuItem]="true"></os-projector-button>
<os-speaker-button [object]="topic" [menuItem]="true"></os-speaker-button> <os-speaker-button [object]="topic" [menuItem]="true"></os-speaker-button>
<div> <div>
<mat-divider></mat-divider> <mat-divider></mat-divider>