Commit e243d260 authored by naji's avatar naji
Browse files

fix: ng Tooltip

parent a861826b
......@@ -96,8 +96,8 @@
"@ngx-translate/http-loader": "^6.0.0",
"@types/d3": "^3.5.43",
"@types/uuid": "^7.0.0",
"autoprefixer": "^9.7.5",
"angular-svg-icon": "^11.2.0",
"autoprefixer": "^9.7.5",
"bootstrap": "^4.5.0",
"bufferutil": "^4.0.1",
"classlist.js": "^1.1.20150312",
......@@ -113,7 +113,6 @@
"ng2-date-picker": "^8.0.0",
"ng2-file-upload": "^1.4.0",
"ng2-nvd3": "^2.0.0",
"ng2-tooltip-directive": "^2.9.22",
"ngx-color-picker": "^9.0.0",
"ngx-filesize": "^2.0.2",
"ngx-quicklink": "^0.2.1",
......
......@@ -20,19 +20,14 @@
</div>
<!--Top right panel container-->
<div class="pastis-metadata-option-entete-2">
<!--Button open-->
<!-- <div class="panel-buttons" tooltip="Importer un profil" placement="top" show-delay="0"
tooltip-class="pastis-tooltip-class">
<pastis-user-action-upload></pastis-user-action-upload>
</div> -->
<!--Button save-->
<div class="panel-buttons" tooltip="Enregistrer le profil" placement="top" show-delay="0"
tooltip-class="pastis-tooltip-class">
<div class="panel-buttons" matTooltip="Enregistrer le profil" placement="top" [matTooltipShowDelay]="0"
matTooltipClass="pastis-tooltip-class">
<pastis-user-action-save-profile></pastis-user-action-save-profile>
</div>
<!--Button setting-->
<div class="panel-buttons" tooltip="Paramètres" placement="top"
show-delay="0" tooltip-class="pastis-tooltip-class">
<div class="panel-buttons" matTooltip="Paramètres" placement="top"
[matTooltipShowDelay]="0" matTooltipClass="pastis-tooltip-class">
<pastis-user-action-download-doc (click)="openChoicePopup()"></pastis-user-action-download-doc>
<div class="vitamui-pastis-choice-language">
<pastis-popup-metadata-language *ngIf="languagePopup"
......
......@@ -25,21 +25,16 @@
<!--Top right panel container-->
<div class="pastis-metadata-option-entete-2">
<!--Button open-->
<!-- <div class="panel-buttons" tooltip="Importer un profil" placement="top" show-delay="0"
tooltip-class="pastis-tooltip-class">
<pastis-user-action-upload></pastis-user-action-upload>
</div> -->
<!--Button save-->
<div class="panel-buttons" tooltip="{{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.ENREGISTRER_PROFIL_TOOLTIP' |
<div class="panel-buttons" matTooltip="{{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.ENREGISTRER_PROFIL_TOOLTIP' |
translate}}" placement="top" show-delay="0"
tooltip-class="pastis-tooltip-class">
matTooltipClass="pastis-matTooltipClass">
<pastis-user-action-save-profile></pastis-user-action-save-profile>
</div>
<!--Button setting-->
<div class="panel-buttons" tooltip="{{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.TELECHARGER_MANUEL_TOOLTIP' |
<div class="panel-buttons" matTooltip="{{'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA.TELECHARGER_MANUEL_TOOLTIP' |
translate}}" placement="top"
show-delay="0" tooltip-class="pastis-tooltip-class">
show-delay="0" matTooltipClass="pastis-matTooltipClass">
<pastis-user-action-download-doc (click)="openChoicePopup()"></pastis-user-action-download-doc>
<div class="vitamui-pastis-choice-language">
<pastis-popup-metadata-language *ngIf="languagePopup"
......@@ -73,8 +68,8 @@
<span
[ngClass]="{'pastis-table-content': isSedaCardinalityConform(element.cardinalite,selectedCardinalities[j]),
'pastis-table-content-with-errors': !isSedaCardinalityConform(element.cardinalite,selectedCardinalities[j])}"
tooltip="{{getSedaDefinition(element.nomDuChamp)}}" placement="right" show-delay="0"
tooltip-class="pastis-tooltip-class">
matTooltip="{{getSedaDefinition(element.nomDuChamp)}}" placement="right" [matTooltipShowDelay]="0"
matTooltipClass="pastis-matTooltipClass">
<i *ngIf="isElementComplex(element.nomDuChamp)" class="vitamui-icon vitamui-icon-complex-element-1-1">
<span class="path1"></span><span class="path2"></span
><span class="path3"></span><span class="path4"></span
......
......@@ -47,8 +47,8 @@
[ngClass]="{'text-medium-normal':!selectedItem(node),'text-medium-primary':selectedItem(node)}">{{onResolveName(node)}}</span>
<span *ngIf="node.name === 'ArchiveUnit'"
style="float: right;"
tooltip="Ajouter une UA"
tooltip-class="pastis-tooltip-class">
matTooltip="Ajouter une UA"
matTooltipClass="pastis-tooltip-class">
<!--Button plus-->
<button class="pastis-btn-add-ua" *ngIf="this.profileService.profileMode === 'PA'" (click)= "addArchiveUnit(node)">
<i class="vitamui-icon vitamui-icon-add" style="color: var(--vitamui-primary);"></i>
......
......@@ -38,9 +38,7 @@ knowledge of the CeCILL-C license and that you accept its terms.
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { TooltipModule } from 'ng2-tooltip-directive';
import { PastisMaterialModule} from '../material.module'
import { PastisSpinnerComponent } from './pastis-spinner/pastis-spinner.component';
import { PastisUnderConstructionComponent } from './pastis-under-construction/pastis-under-construction.component';
import { PastisDialogConfirmComponent } from './pastis-dialog/pastis-dialog-confirm/pastis-dialog-confirm.component';
......@@ -53,6 +51,7 @@ import { PastisPopupMetadataLanguageComponent } from './pastis-popup-metadata-la
import { PastisBreadcrumbComponent } from './pastis-breadcrumb-components/pastis-breadcrumb/pastis-breadcrumb.component';
import { PastisTitleBreadcrumbComponent } from './pastis-breadcrumb-components/pastis-title-breadcrumb/pastis-title-breadcrumb.component';
import { TranslateModule } from '@ngx-translate/core';
import { MatTooltipModule } from '@angular/material/tooltip';
@NgModule({
declarations: [
......@@ -68,7 +67,7 @@ import { TranslateModule } from '@ngx-translate/core';
],
imports: [CommonModule,
FormsModule,
TooltipModule,
MatTooltipModule,
PastisMaterialModule,
MatSlideToggleModule,
PortalModule,
......@@ -78,7 +77,7 @@ import { TranslateModule } from '@ngx-translate/core';
exports: [
PastisSpinnerComponent,
PastisUnderConstructionComponent,
TooltipModule,
MatTooltipModule,
PastisMaterialModule,
PastisToggleButtonComponent,
PastisNoticeToggleButtonComponent,
......
......@@ -40,11 +40,11 @@
</i>
<span
class="text normal"
tooltip={{getDefinition(element)}}
placement="right"
show-delay="0"
tooltip-class="pastis-tooltip-class">{{onResolveName(element)}}</span>
class="text normal"
matTooltip={{getDefinition(element)}}
placement="right"
[matTooltipShowDelay]="0"
matTooltipClass="pastis-tooltip-class">{{onResolveName(element)}}</span>
</span>
<span class="ajouter" (click)="onAddSelectedElement(element)">{{'USER_ACTION.ADD_METADATA.BOUTON_AJOUTER' | translate}}</span>
<mat-divider class="pastis-popup-separator"></mat-divider>
......
Supports Markdown
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