Marmelator/common-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RED-6436: Corrected tooltips positions.

Browse Source
This commit is contained in:
Nicoleta Panaghiu 2023-03-28 15:21:22 +03:00
parent ba21886e27
commit bb562d63fd
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/listing/page-header/page-header.component.html
View File

@ -63,7 +63,6 @@
[icon]="config.icon" [icon]="config.icon"
[iqserHelpMode]="config.helpModeKey" [iqserHelpMode]="config.helpModeKey"
[overlappingElements]="config.overlappingElements" [overlappingElements]="config.overlappingElements"
[tooltipPosition]="'below'"
[tooltip]="config.label" [tooltip]="config.label"
></iqser-circle-button> ></iqser-circle-button>
</ng-container> </ng-container>
@ -79,7 +78,6 @@
[icon]="'iqser:close'" [icon]="'iqser:close'"
[iqserHelpMode]="'edit_dossier_in_dossier'" [iqserHelpMode]="'edit_dossier_in_dossier'"
[overlappingElements]="['USER_MENU']" [overlappingElements]="['USER_MENU']"
[tooltipPosition]="'below'"
[tooltip]="'common.close' | translate" [tooltip]="'common.close' | translate"
></iqser-circle-button> ></iqser-circle-button>
</div> </div>

2
src/lib/users/components/initials-avatar/initials-avatar.component.html
View File

@ -2,7 +2,7 @@
<div <div
[className]="colorClass + ' oval ' + size + (hasBorder ? ' border' : '')" [className]="colorClass + ' oval ' + size + (hasBorder ? ' border' : '')"
[matTooltipPosition]="tooltipPosition" [matTooltipPosition]="tooltipPosition"
[matTooltip]="userName" [matTooltip]="showTooltip ? userName : ''"
> >
{{ _user | name : { showInitials: true } }} {{ _user | name : { showInitials: true } }}
</div> </div>

1
src/lib/users/components/initials-avatar/initials-avatar.component.ts
View File

@ -20,6 +20,7 @@ export class InitialsAvatarComponent<Interface extends IIqserUser = IIqserUser,
@Input() showYou = false; @Input() showYou = false;
@Input() tooltipPosition: 'below' | 'above' = 'above'; @Input() tooltipPosition: 'below' | 'above' = 'above';
@Input() defaultValue: string = this._translateService.instant('initials-avatar.unassigned'); @Input() defaultValue: string = this._translateService.instant('initials-avatar.unassigned');
@Input() showTooltip = true;
colorClass?: string; colorClass?: string;
namePipeOptions?: NamePipeOptions; namePipeOptions?: NamePipeOptions;

4
src/lib/users/components/user-button/user-button.component.html
View File

@ -1,4 +1,4 @@
<button [class.overlay]="showDot" mat-button> <button [class.overlay]="showDot" [matTooltipPosition]="'below'" [matTooltip]="'user-menu.button-text' | translate" mat-button>
<ng-container *ngIf="icon; else initialsAvatar"> <ng-container *ngIf="icon; else initialsAvatar">
<mat-icon [svgIcon]="icon" class="mr-8"></mat-icon> <mat-icon [svgIcon]="icon" class="mr-8"></mat-icon>
{{ userService.currentUser$ | async | name }} {{ userService.currentUser$ | async | name }}
@ -10,5 +10,5 @@
<div *ngIf="showDot" class="dot"></div> <div *ngIf="showDot" class="dot"></div>
<ng-template #initialsAvatar> <ng-template #initialsAvatar>
<iqser-initials-avatar [user]="userService.currentUser$ | async" [withName]="true"></iqser-initials-avatar> <iqser-initials-avatar [user]="userService.currentUser$ | async" [withName]="true" [showTooltip]="false"></iqser-initials-avatar>
</ng-template> </ng-template>

3
src/lib/users/iqser-users.module.ts
View File

@ -17,6 +17,7 @@ import { CommonModule } from '@angular/common';
import { UserButtonComponent } from './components/user-button/user-button.component'; import { UserButtonComponent } from './components/user-button/user-button.component';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
import { TranslateModule } from '@ngx-translate/core';
function getKeycloakOptions(baseUrl: string, configService: IqserConfigService): KeycloakOptions { function getKeycloakOptions(baseUrl: string, configService: IqserConfigService): KeycloakOptions {
let url: string = configService.values.OAUTH_URL; let url: string = configService.values.OAUTH_URL;
@ -60,7 +61,7 @@ export function keycloakInitializer(
const components = [NamePipe, InitialsAvatarComponent, UserButtonComponent]; const components = [NamePipe, InitialsAvatarComponent, UserButtonComponent];
@NgModule({ @NgModule({
imports: [KeycloakAngularModule, MatTooltipModule, CommonModule, MatIconModule, MatButtonModule], imports: [KeycloakAngularModule, MatTooltipModule, CommonModule, MatIconModule, MatButtonModule, TranslateModule],
declarations: [...components], declarations: [...components],
exports: [...components], exports: [...components],
}) })