diff --git a/lang/en.json b/lang/en.json index b0b43bb66b3caf80d376f4704219d8129aea77df..458d09fe5ad9de97969a9552b9d0f69308e5fe4d 100755 --- a/lang/en.json +++ b/lang/en.json @@ -148,6 +148,13 @@ "noteUser": "Note user", "mainDocument": "main document", "search": "Search", - "substitution": "Délégation" + "substitute": "Substitue user", + "substitution": "Délégation", + "signSubstituted": "Signatures to substitute", + "chooseSubstitute": "Choose a substitute", + "noResult": "No result", + "informations": "Informations", + "circuit": "Circuit", + "actions": "Actions" } } diff --git a/lang/fr.json b/lang/fr.json index 08564c8bee5792224f06aff57fd1d56453454815..120818951580887da48025a631f639bd01182d70 100755 --- a/lang/fr.json +++ b/lang/fr.json @@ -148,6 +148,13 @@ "noteUser": "Annotateur", "mainDocument": "document principal", "search": "Rechercher", - "substitution": "Délégation" + "substitution": "Délégation", + "substitute": "Utilisateur délégataire", + "signSubstituted": "Signature(s) à déléguer", + "chooseSubstitute": "Choisissez un remplaçant", + "noResult": "Aucun résultat", + "informations": "Informations", + "circuit": "Circuit", + "actions": "Actions" } } diff --git a/src/frontend/app/document/document.component.html b/src/frontend/app/document/document.component.html index 6fb58da458f6edb497da6ee38d283f022202916a..f4e19dfd3679913a911efd937ab9e2d8dd2f8ea1 100755 --- a/src/frontend/app/document/document.component.html +++ b/src/frontend/app/document/document.component.html @@ -17,19 +17,19 @@ <mat-icon fontSet="fas" fontIcon="fa-bars"></mat-icon> </button> <button mat-button (click)="openMainDocumentDetail();"> - <i class="fas fa-info-circle fa-2x"></i><span style="display: block;line-height: 10px;">Informations</span> + <i class="fas fa-info-circle fa-2x"></i><span style="display: block;line-height: 10px;">{{'lang.informations' | translate}}</span> </button> </section> <section class="header-action"> <button mat-button (click)="openDocumentList();"> - <i class="fas fa-file fa-2x" [matBadge]="mainDocument.attachments.length + 1"></i><span style="display: block;line-height: 10px;">Documents</span> + <i class="fas fa-file fa-2x" [matBadge]="mainDocument.attachments.length + 1"></i><span style="display: block;line-height: 10px;">{{'lang.documents' | translate | titlecase}}</span> </button> <button mat-button (click)="openVisaWorkflow();"> - <i class="fas fa-list-ol fa-2x" [matBadge]="mainDocument.workflow.length"></i><span style="display: block;line-height: 10px;">Circuit</span> + <i class="fas fa-list-ol fa-2x" [matBadge]="mainDocument.workflow.length"></i><span style="display: block;line-height: 10px;">{{'lang.circuit' | translate}}</span> </button> <button mat-button [matMenuTriggerFor]="menu"> - <i class="fas fa-cog fa-2x"></i><span style="display: block;line-height: 10px;">Actions</span> + <i class="fas fa-cog fa-2x"></i><span style="display: block;line-height: 10px;">{{'lang.actions' | translate}}</span> </button> <mat-menu #menu="matMenu"> <button [disabled]="checkEmptiness()" mat-menu-item diff --git a/src/frontend/app/document/main-document-detail/main-document-detail.component.html b/src/frontend/app/document/main-document-detail/main-document-detail.component.html index a25b03def3ebbd16ccbc780bec3d27a3ed1d3c48..fa463ca9608267fa5f1e384af8c961baa4211f9b 100644 --- a/src/frontend/app/document/main-document-detail/main-document-detail.component.html +++ b/src/frontend/app/document/main-document-detail/main-document-detail.component.html @@ -3,7 +3,7 @@ <button *ngIf="signaturesService.mobileMode" class="closePanel" mat-icon-button type="button" (tap)="snavRightComponent.close();"> <mat-icon fontSet="fas" fontIcon="fa-arrow-right fa-2x"></mat-icon> </button> - <mat-icon fontSet="fas" fontIcon="fa-info-circle fa-2x"></mat-icon> Informations + <mat-icon fontSet="fas" fontIcon="fa-info-circle fa-2x"></mat-icon> {{'lang.informations' | translate}} </div> <div class="panel-content" *ngIf="mainDocument.id"> <mat-list> diff --git a/src/frontend/app/profile/profile.component.html b/src/frontend/app/profile/profile.component.html index 3fe299baf61327d5b008add772557ce60082659d..0b5d001cf100cba67e0d5816b9f4eaf51d56d1c1 100644 --- a/src/frontend/app/profile/profile.component.html +++ b/src/frontend/app/profile/profile.component.html @@ -236,11 +236,11 @@ <legend align="left">{{'lang.substitution' | translate}}</legend> <div class="form-container"> <div class="form-2-col"> - Utilisateur délégataire + {{'lang.substitute' | translate}} </div> <div class="form-2-col"> - <mat-form-field> - <mat-select placeholder="Choisissez un remplaçant" name="usersRest" + <mat-form-field style="width:100%"> + <mat-select placeholder="{{'lang.chooseSubstitute' | translate}}" name="usersRest" [(ngModel)]="profileInfo.substitute"> <mat-option value=""></mat-option> <ng-container *ngFor="let userRest of usersRest"> @@ -253,9 +253,12 @@ </mat-form-field> </div> </div> - <ng-container *ngIf="this.profileInfo.substitute !== '' && this.profileInfo.substitute !== undefined"> - <button type="button" class="signListButton" mat-stroked-button *ngFor="let signature of signaturesService.signaturesList; let i=index" (click)="toggleSignature(i)" [class.selected]="signature.substituted"><img [src]="sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + signature.encodedSignature)"/></button> - </ng-container> + <fieldset *ngIf="this.profileInfo.substitute !== '' && this.profileInfo.substitute !== undefined"> + <legend align="left">{{'lang.signSubstituted' | translate}} :</legend> + <ng-container> + <button type="button" class="signListButton" mat-stroked-button *ngFor="let signature of signaturesService.signaturesList; let i=index" (click)="toggleSignature(i)" [class.selected]="signature.substituted"><img [src]="sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + signature.encodedSignature)"/></button> + </ng-container> + </fieldset> </fieldset> </div> </div> diff --git a/src/frontend/app/sidebar/sidebar.component.html b/src/frontend/app/sidebar/sidebar.component.html index 39afae27f9aaa18603fb8a2c27967896357d0200..9b9f3719d0ff485b5d25421b7f2542b932c9a9f1 100755 --- a/src/frontend/app/sidebar/sidebar.component.html +++ b/src/frontend/app/sidebar/sidebar.component.html @@ -69,7 +69,7 @@ </li> </ng-container> <span *ngIf="signaturesService.documentsList.length == 0" class="noResult"> - Aucun résultat + {{'lang.noResult' | translate | titlecase}} </span> </ul> </nav> \ No newline at end of file