From 324f14a4f6842d0fc20331acd611c125a3c152dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de> Date: Thu, 29 Aug 2019 15:01:48 +0200 Subject: [PATCH] Rearrange icons in comment --- .../shared/comment/comment.component.html | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html index 5346e7197..aa111ac2a 100644 --- a/src/app/components/shared/comment/comment.component.html +++ b/src/app/components/shared/comment/comment.component.html @@ -10,15 +10,12 @@ {{comment.timestamp | date: 'h:mm a'}} </ng-template> </div> - <span class="fill-remaining-space"></span> - <button mat-icon-button *ngIf="!isStudent || comment.correct === 2" [disabled]="isStudent" - (click)="markCorrect(comment, 2)"> - <mat-icon [ngClass]="{'wrong-icon' : comment.correct === 2, - 'not-marked' : (comment.correct === 0 || comment.correct === 1)}" - [matTooltip]="comment.correct != 2 ? ('comment-page.mark-wrong' | translate) - : ('comment-page.mark-not-wrong' | translate)">not_interested + <button mat-icon-button *ngIf="comment.read" [disabled]="true" (click)="setRead(comment)"> + <mat-icon [ngClass]="{'read-icon': comment.read, 'not-marked' : !comment.read}" + matTooltip="{{ 'comment-page.mark-read' | translate }}">speaker_notes </mat-icon> </button> + <span class="fill-remaining-space"></span> <button mat-icon-button *ngIf="!isStudent || comment.correct === 1" [disabled]="isStudent" (click)="markCorrect(comment, 1)"> <mat-icon [ngClass]="{'correct-icon' : comment.correct === 1, @@ -27,6 +24,14 @@ : ('comment-page.mark-not-correct' | translate)">check_circle </mat-icon> </button> + <button mat-icon-button *ngIf="!isStudent || comment.correct === 2" [disabled]="isStudent" + (click)="markCorrect(comment, 2)"> + <mat-icon [ngClass]="{'wrong-icon' : comment.correct === 2, + 'not-marked' : (comment.correct === 0 || comment.correct === 1)}" + [matTooltip]="comment.correct != 2 ? ('comment-page.mark-wrong' | translate) + : ('comment-page.mark-not-wrong' | translate)">not_interested + </mat-icon> + </button> <button mat-icon-button *ngIf="!isStudent || comment.favorite" [disabled]="isStudent" (click)="setFavorite(comment)"> <mat-icon [ngClass]="{'favorite-icon' : comment.favorite, 'not-marked' : !comment.favorite}" @@ -34,11 +39,6 @@ : ('comment-page.mark-not-favorite' | translate)">grade </mat-icon> </button> - <button mat-icon-button *ngIf="comment.read" [disabled]="true" (click)="setRead(comment)"> - <mat-icon [ngClass]="{'read-icon': comment.read, 'not-marked' : !comment.read}" - matTooltip="{{ 'comment-page.mark-read' | translate }}">speaker_notes - </mat-icon> - </button> <button mat-icon-button *ngIf="!isStudent" (click)="openDeleteCommentDialog()"> <mat-icon class="not-marked" matTooltip="{{ 'comment-page.delete' | translate }}">delete </mat-icon> -- GitLab