diff --git a/apps/maarch_entreprise/Views/menu-top.component.html b/apps/maarch_entreprise/Views/menu-top.component.html index 3a5954d81ee1a5583914d289f1f10b494de61c66..3b5c8280d40dd3ee07dfbda7d053620e84758a65 100644 --- a/apps/maarch_entreprise/Views/menu-top.component.html +++ b/apps/maarch_entreprise/Views/menu-top.component.html @@ -1,31 +1,30 @@ -<button mat-button [matMenuTriggerFor]="menu"><mat-icon mat-list-icon class="fa fa-user fa-2x" style="color:white; margin:0px 12px 8px 0px;"></mat-icon>{{user.firstname.charAt(0) | uppercase}}. {{user.lastname | uppercase}}</button> +<button mat-button [matMenuTriggerFor]="menu"> + <mat-icon mat-list-icon class="fa fa-user fa-2x" style="color:white; margin:0px 12px 8px 0px;"></mat-icon>{{user.firstname.charAt(0) | uppercase}}. {{user.lastname | uppercase}}</button> <mat-menu #menu="matMenu" class="headerMaarch"> <canvas class="header-bg" width="250" height="70" style="margin-top:-8px;background-image: url('static.php?filename=login-banner.jpg');background-size:cover;border-bottom: solid 1px white;"></canvas> - <i style="z-index:1;color:white;position: absolute;left: 85px;top: 17px;background-image: url('static.php?filename=logo_only.svg');width: 70px;height: 70px;background-size: cover;background-position: top center;border-radius: 50%;border: solid white;background-color:white;"></i> + <i title="{{lang.myProfileAccess}}" routerLink="/profile" style="cursor:pointer;z-index:1;color:white;position: absolute;left: 85px;top: 17px;background-image: url('static.php?filename=logo_only.svg');width: 70px;height: 70px;background-size: cover;background-position: top center;border-radius: 50%;border: solid white;background-color:white;"></i> <div class="content" style="padding-top:10px;color:white;max-height:250px;overflow-y:auto;overflow-x:hidden;"> - <p class="text-center">{{user.firstname}} {{user.lastname | uppercase}}</p> + <p routerLink="/profile" class="text-center" style="cursor:pointer;">{{user.firstname}} {{user.lastname | uppercase}}</p> <mat-list> - <h3 mat-subheader>{{lang.groups}}</h3> + <h3 mat-subheader style="color:white;">{{lang.groups}}</h3> + <mat-divider></mat-divider> <mat-list-item *ngFor="let group of user.groups"> <p mat-line style="color:white;opacity:0.5;"> {{group.group_desc}} </p> </mat-list-item> + <h3 mat-subheader style="color:white;">{{lang.entities}}</h3> <mat-divider></mat-divider> - <h3 mat-subheader>{{lang.entities}}</h3> <mat-list-item *ngFor="let entity of user.entities"> <p mat-line style="color:white;opacity:0.5;"> {{entity.entity_label}} </p> </mat-list-item> - - <h3 mat-subheader>{{lang.myMenu}}</h3> - <a mat-list-item routerLink="/profile"> - <p mat-line style="color:white;opacity:0.5;"> - {{lang.myProfile}} - </p> - </a> - <a mat-list-item href="index.php?display=true&page=logout&logout=true"> - <p mat-line style="color:white;opacity:0.5;"> - {{lang.logout}} - </p> - </a> </mat-list> </div> + <div style="display:flex;padding: 5px 5px 0 5px;"> + <div style="text-align:left;flex:1"> + <a routerLink="/profile" style="color: white;padding-left: 10px;"><span class="badge" style="background:white;" color="primary">{{lang.myProfile}}</span></a> + </div> + <div style="text-align:right;flex:2;"> + <a href="index.php?display=true&page=logout&logout=true" style="color: white;padding-right: 10px;"><span class="badge" style="background:white;" color="primary">{{lang.logout}}</span></a> + </div> + </div> + </mat-menu> \ No newline at end of file diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts index 3e27de5dc84310753e82738bb45140895702c584..9536de3fe5d9c9c260f95115a84e8bc2747d74fa 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts @@ -199,6 +199,7 @@ export const LANG_EN = { "move" : "Move", "myMenu" : "Personal menu", "myProfile" : "My profile", + "myProfileAccess" : "Access to my profile", "newAction" : "New action", "newElement" : "New element", "newPsw" : "New password", diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts index f9b23392c467a8d2d6501efd8ef2c5fcf9bca19d..0678d6fe86753a9d6640398c1165f22bdaaba2d3 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts @@ -214,6 +214,7 @@ export const LANG_FR = { "move" : "Déplacer", "myMenu" : "Menu personnel", "myProfile" : "Mon profil", + "myProfileAccess" : "Accéder à mon profil", "newAction" : "Nouvelle action", "newElement" : "Nouvel élément", "newPsw" : "Nouveau mot de passe",