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

Merge branch '401-role-related-identifiers-and-icons-for-account-menu' into 'master'

Resolve "Role-related identifiers and icons for account menu"

Closes #401

See merge request !396
parents b5805911 912a0fce
1 merge request!396Resolve "Role-related identifiers and icons for account menu"
Pipeline #30329 passed with stages
in 8 minutes and 42 seconds
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
<mat-menu #userMenu="matMenu" [overlapTrigger]="false"> <mat-menu #userMenu="matMenu" [overlapTrigger]="false">
<button mat-menu-item *ngIf="user" routerLink="/user"> <button mat-menu-item *ngIf="user" routerLink="/user">
<mat-icon class="sessions">work</mat-icon> <mat-icon class="sessions">work</mat-icon>
<span>{{'header.my-sessions' | translate}}</span> <span *ngIf="!user.isGuest">{{'header.my-sessions' | translate}}</span>
<span *ngIf="user.isGuest">{{'header.visited-sessions' | translate}}</span>
</button> </button>
<button mat-menu-item *ngIf="user && !user.isGuest" (click)="openDeleteUserDialog()"> <button mat-menu-item *ngIf="user && !user.isGuest" (click)="openDeleteUserDialog()">
<mat-icon color="warn">delete_sweep</mat-icon> <mat-icon color="warn">delete_sweep</mat-icon>
...@@ -41,13 +42,16 @@ ...@@ -41,13 +42,16 @@
<button mat-button *ngIf="user && deviceType === 'desktop'" [matMenuTriggerFor]="userMenu"> <button mat-button *ngIf="user && deviceType === 'desktop'" [matMenuTriggerFor]="userMenu">
<div class="label-icon"> <div class="label-icon">
<mat-icon class="header-icons">account_box</mat-icon> <mat-icon *ngIf="!user.isGuest" class="header-icons">account_box</mat-icon>
<h3>{{'header.my-account' | translate}}</h3> <mat-icon *ngIf="user.isGuest" class="header-icons">folder</mat-icon>
<h3 *ngIf="!user.isGuest">{{'header.my-account' | translate}}</h3>
<h3 *ngIf="user.isGuest">{{'header.my-guest-account' | translate}}</h3>
</div> </div>
</button> </button>
<button mat-icon-button *ngIf="user && deviceType === 'mobile'" [matMenuTriggerFor]="userMenu"> <button mat-icon-button *ngIf="user && deviceType === 'mobile'" [matMenuTriggerFor]="userMenu">
<mat-icon class="header-icons">account_box</mat-icon> <mat-icon *ngIf="!user.isGuest" class="header-icons">account_box</mat-icon>
<mat-icon *ngIf="user.isGuest" class="header-icons">folder</mat-icon>
</button> </button>
<button mat-button *ngIf="!user && deviceType === 'desktop'" (click)=login(false)> <button mat-button *ngIf="!user && deviceType === 'desktop'" (click)=login(false)>
...@@ -60,6 +64,5 @@ ...@@ -60,6 +64,5 @@
<button mat-icon-button *ngIf="!user && deviceType === 'mobile'" (click)=login(false)> <button mat-icon-button *ngIf="!user && deviceType === 'mobile'" (click)=login(false)>
<mat-icon class="header-icons">account_box</mat-icon> <mat-icon class="header-icons">account_box</mat-icon>
</button> </button>
</mat-toolbar-row> </mat-toolbar-row>
</mat-toolbar> </mat-toolbar>
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
"visited-sessions": "Besuchte Sessions", "visited-sessions": "Besuchte Sessions",
"login": "Login", "login": "Login",
"my-account": "Konto", "my-account": "Konto",
"my-guest-account": "Sessions",
"id": "ID", "id": "ID",
"moderation-enabled": "Moderiert", "moderation-enabled": "Moderiert",
"delete-account": "Account löschen", "delete-account": "Account löschen",
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
"visited-sessions": "Visited sessions", "visited-sessions": "Visited sessions",
"login": "Login", "login": "Login",
"my-account": "My account", "my-account": "My account",
"my-guest-account": "Sessions",
"id": "ID", "id": "ID",
"moderation-enabled": "Moderated", "moderation-enabled": "Moderated",
"delete-account": "Delete account", "delete-account": "Delete account",
......
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