Skip to content
Snippets Groups Projects
Commit b1c8040f authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel
Browse files

Merge branch...

Merge branch '466-students-should-not-see-the-edit-button-but-the-old-display-of-the-icons' into 'master'

edit button when userrole >= 2 and mobile

Closes #466

See merge request arsnova/frag.jetzt!437
parents 3995c1d4 cb831374
Branches
Tags
No related merge requests found
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</mat-icon> </mat-icon>
</button> </button>
<span class="fill-remaining-space"></span> <span class="fill-remaining-space"></span>
<ng-container *ngIf="isMobile"> <ng-container *ngIf="user.role>=2&&isMobile">
<button mat-flat-button class="edit-button" [matMenuTriggerFor]="editMenu" aria-label="Example icon-button with a menu"> <button mat-flat-button class="edit-button" [matMenuTriggerFor]="editMenu" aria-label="Example icon-button with a menu">
<mat-icon>edit</mat-icon> <mat-icon>edit</mat-icon>
<span>{{'comment-page.edit' | translate}}</span> <span>{{'comment-page.edit' | translate}}</span>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</button> </button>
</mat-menu> </mat-menu>
</ng-container> </ng-container>
<ng-container *ngIf="!isMobile"> <ng-container *ngIf="userRole<2||!isMobile">
<button mat-icon-button *ngIf="(isCreator || isModerator || comment.answer) && !inAnswerView" <button mat-icon-button *ngIf="(isCreator || isModerator || comment.answer) && !inAnswerView"
(click)="answerComment()" tabindex="0" attr.aria-labelledby="comment_answer{{ comment.id }}"> (click)="answerComment()" tabindex="0" attr.aria-labelledby="comment_answer{{ comment.id }}">
<mat-icon class="not-marked" [ngClass]="{'answered-icon' : comment.answer}" <mat-icon class="not-marked" [ngClass]="{'answered-icon' : comment.answer}"
......
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