Commit 8e4b752e authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel
Browse files

Merge branch 'staging' into 'master'

show question fokus button for alle roles

See merge request arsnova/frag.jetzt!544
parents f4849d8f 3ed71d75
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<span>{{'header.create-question' | translate}}</span> <span>{{'header.create-question' | translate}}</span>
</button> </button>
<ng-container *ngIf="user && user.role > 0"> <ng-container>
<button mat-menu-item <button mat-menu-item
tabindex="0" tabindex="0"
...@@ -118,17 +118,15 @@ ...@@ -118,17 +118,15 @@
<button mat-menu-item <button mat-menu-item
tabindex="0" tabindex="0"
*ngIf="deviceType !== 'mobile' && !router.url.includes('/participant/')" *ngIf="deviceType !== 'mobile'"
routerLink="participant/room/{{shortId}}/comments/questionwall"> routerLink="participant/room/{{shortId}}/comments/questionwall">
<mat-icon <mat-icon
svgIcon="beamer"> svgIcon="beamer">
comment
</mat-icon> </mat-icon>
<span>{{'header.questionwall' | translate}}</span> <span>{{'header.questionwall' | translate}}</span>
</button> </button>
</ng-container> </ng-container>
<ng-container *ngIf="router.url.includes('/participant/room/')"> <ng-container *ngIf="router.url.includes('/participant/room/')">
</ng-container> </ng-container>
<ng-container *ngIf="router.url.includes('/moderator/room/')"> <ng-container *ngIf="router.url.includes('/moderator/room/')">
...@@ -196,7 +194,7 @@ ...@@ -196,7 +194,7 @@
<!-- Room General Options - bot --> <!-- Room General Options - bot -->
<ng-container *ngIf="user && user.role > 0 && !router.url.includes('/participant') && !router.url.includes('/comment/')" > <ng-container *ngIf="user && user.role > 0 && !router.url.includes('/participant') && !router.url.includes('/comment/')">
<button mat-menu-item <button mat-menu-item
*ngIf="user" *ngIf="user"
...@@ -220,7 +218,8 @@ ...@@ -220,7 +218,8 @@
*ngIf="user && user.role > 0 && !router.url.includes('/comment/')" *ngIf="user && user.role > 0 && !router.url.includes('/comment/')"
tabindex="0" tabindex="0"
(click)="showQRDialog();"> (click)="showQRDialog();">
<mat-icon svgIcon="qrcode" class="header-icons qrcode"> <mat-icon svgIcon="qrcode"
class="header-icons qrcode">
</mat-icon> </mat-icon>
<span>{{'header.room-qr' | translate}}</span> <span>{{'header.room-qr' | translate}}</span>
</button> </button>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment