diff --git a/lang/en.json b/lang/en.json
index 1813d86038171ddcb8fb9e06c7eef49730c6a59c..9f7eb362cb6508acb16e1fe624dc0eae0698e0a1 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -5,6 +5,10 @@
"administrations" : "Administrations",
"afterClickingSendLinkChangePassword": "After clicking on <b>Send</b>, you will receive an email containing a link to change your password. This link will be active <b>1 hour</b>.",
"annotateDocument" : "Annotate this document",
+ "lockEdition" : "Lock edition",
+ "unlockEdition" : "Unlock edition",
+ "originalSize" : "Originale size",
+ "screenSize" : "Screen size",
"annotation" : "Annotation",
"annotationAdded" : "Annotation added",
"annotationMode" : "Annotation mode",
diff --git a/lang/fr.json b/lang/fr.json
index 21f2474cd2e67d17b1d21a4965ecf22e93c0def4..e4fd56c0aa7cdf5df527ad3612a07fce82ae0499 100755
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -4,7 +4,11 @@
"actionDoneInPlaceOf" : "Action effectuée à la place de",
"administrations" : "Administrations",
"afterClickingSendLinkChangePassword": "Après avoir cliqué sur <b>Envoyer</b>, vous recevrez un courriel contenant un lien pour modifier votre mot de passe. Ce lien sera actif <b>1 heure</b>.",
- "annotateDocument" : "Annoter ce document",
+ "annotateDocument" : "Annoter le document",
+ "lockEdition" : "Verrouiller l'édition",
+ "unlockEdition" : "Déverrouiller l'édtiion",
+ "originalSize" : "Taille originale",
+ "screenSize" : "Taille écran",
"annotation" : "Annotation",
"annotationAdded" : "Annotation ajoutée",
"annotationMode" : "Mode de l'annotation",
diff --git a/src/frontend/app/documentNotePad/document-note-pad.component.html b/src/frontend/app/documentNotePad/document-note-pad.component.html
index 712a3fdc1bb2473bb127caf95164e7ab87c971b5..51fcabb4bb30dc986a5a4f17f2be95c8612a5c58 100644
--- a/src/frontend/app/documentNotePad/document-note-pad.component.html
+++ b/src/frontend/app/documentNotePad/document-note-pad.component.html
@@ -1,6 +1,6 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
- <ion-title>Annoter le document</ion-title>
+ <ion-title>{{'lang.annotateDocument' | translate}}</ion-title>
<ion-buttons slot="end">
<ion-button (click)="dismissModal()">
<ion-icon slot="icon-only" name="close-outline"></ion-icon>
@@ -23,15 +23,14 @@
</ion-fab-button>
<ion-fab-list side="bottom">
<ion-fab-button [color]="editMode ? 'danger' : 'success'"
- [title]="editMode ? 'Verrouiller l\'édition' : 'Déverrouiller l\'édition'"
+ [title]="editMode ? ('lang.lockEdition' | translate) : ('lang.unlockEdition' | translate)"
(click)="$event.stopPropagation();editMode=!editMode">
- <ion-icon [name]="editMode ? 'lock-closed-outline' : 'lock-open-outline'" [title]="'Verouiller l\'édition'">
+ <ion-icon [name]="editMode ? 'lock-closed-outline' : 'lock-open-outline'">
</ion-icon>
</ion-fab-button>
- <ion-fab-button [title]="originalSize ? 'taille originale' : 'taille écran'"
+ <ion-fab-button [title]="originalSize ? ('lang.originalSize' | translate) : ('lang.screenSize' | translate)"
(click)="$event.stopPropagation();getImageDimensions(!originalSize)">
- <ion-icon [name]="originalSize ? 'scan-outline' : 'crop-outline'"
- [title]="originalSize ? 'taille originale' : 'taille écran'"></ion-icon>
+ <ion-icon [name]="originalSize ? 'scan-outline' : 'crop-outline'"></ion-icon>
</ion-fab-button>
</ion-fab-list>
</ion-fab>
@@ -47,14 +46,10 @@
</drag-scroll>
</div>
</ion-content>
-<ion-footer class="ion-no-border">
- <ion-toolbar>
- <ion-buttons class="ion-justify-content-center">
- <ion-button color="primary" (click)="validateAnnotation()">
- <ion-label>{{'lang.save' | translate}}</ion-label>
- </ion-button>
- </ion-buttons>
- </ion-toolbar>
+<ion-footer class="ion-no-border footer-buttons">
+ <ion-button color="success" (click)="validateAnnotation()" shape="round" fill="outline" size="large">
+ <ion-label style="font-size: 13px;">{{'lang.save' | translate}}</ion-label>
+ </ion-button>
</ion-footer>
<!--<div *ngIf="signaturesService.annotationMode" [style.width.px]="this.areaWidth*this.signaturesService.scale" [style.height.px]="this.areaHeight*this.signaturesService.scale"
style="top:0;position: absolute;border: dashed 1px grey;overflow: hidden;" [ngClass]="{
diff --git a/src/frontend/app/documentNotePad/document-note-pad.component.scss b/src/frontend/app/documentNotePad/document-note-pad.component.scss
index d1ab0a9c31e457401b28e2ba1f273dd950f2bb15..7433393cfe41768d24a70da8c067d9fc7c141f43 100644
--- a/src/frontend/app/documentNotePad/document-note-pad.component.scss
+++ b/src/frontend/app/documentNotePad/document-note-pad.component.scss
@@ -96,4 +96,14 @@
&:hover {
transform: scale(1.5);
}
+}
+
+.footer-buttons {
+ display: grid;
+ padding: 10px;
+
+ ion-button {
+ margin: auto;
+ width: 150px;
+ }
}
\ No newline at end of file
diff --git a/src/frontend/app/pad/pad.component.html b/src/frontend/app/pad/pad.component.html
index f4ba0653c78a0b0784a725aa5369ef4e0234fa11..e80220be323e884938a484e02c378ad265450198 100755
--- a/src/frontend/app/pad/pad.component.html
+++ b/src/frontend/app/pad/pad.component.html
@@ -1,6 +1,6 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
- <ion-title>Créer une signature</ion-title>
+ <ion-title>{{'lang.createNewSignature' | translate}}</ion-title>
<ion-buttons slot="end">
<ion-button (click)="closePad()">
<ion-icon slot="icon-only" name="close-outline"></ion-icon>
diff --git a/src/frontend/app/sidebar/sidebar.component.html b/src/frontend/app/sidebar/sidebar.component.html
index 5377cf38916a0eeb4602399c710efb74e04af915..054acd75de7c5a27810aa20d2677556664080f25 100755
--- a/src/frontend/app/sidebar/sidebar.component.html
+++ b/src/frontend/app/sidebar/sidebar.component.html
@@ -10,13 +10,13 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
<ion-buttons slot="start">
- <ion-button (click)="authService.logout()">
+ <ion-button (click)="authService.logout()" [title]="'lang.logout' | translate">
<ion-icon slot="icon-only" name="power"></ion-icon>
</ion-button>
- <ion-button *ngIf="!isAdminRoute() && authService.user.administrativePrivileges.length > 0" (click)="openAdmin()">
+ <ion-button *ngIf="!isAdminRoute() && authService.user.administrativePrivileges.length > 0" (click)="openAdmin()" [title]="'lang.administration' | translate">
<ion-icon slot="icon-only" name="build-outline"></ion-icon>
</ion-button>
- <ion-button *ngIf="isAdminRoute()" (click)="openHome()">
+ <ion-button *ngIf="isAdminRoute()" (click)="openHome()" [title]="'lang.homePage' | translate">
<ion-icon slot="icon-only" name="home"></ion-icon>
</ion-button>
</ion-buttons>
@@ -35,7 +35,7 @@
</ion-avatar>
<ion-header *ngIf="!isAdminRoute()">
<ion-toolbar color="light">
- <ion-title *ngIf="!searchMode" (click)="search();" [title]="'lang.search' | translate" style="text-align: center;font-size: 14px;">
+ <ion-title *ngIf="!searchMode" (click)="search();" [title]="'lang.filterInfo' | translate" style="text-align: center;font-size: 14px;">
<span [class.primary]="signaturesService.mode != ''">{{signaturesService.documentsListCount.current}}</span>
{{'lang.documents' | translate}}
<span class="primary"
diff --git a/src/frontend/app/signatures/signatures.component.html b/src/frontend/app/signatures/signatures.component.html
index dbe4b5059bb829e01b152ee31255630e9bf0e294..a4d02264a7bfaba5774a8cc0f6a097ec0ae46ea3 100755
--- a/src/frontend/app/signatures/signatures.component.html
+++ b/src/frontend/app/signatures/signatures.component.html
@@ -1,6 +1,6 @@
<ion-header [translucent]="true">
<ion-toolbar color="primary">
- <ion-title>Signatures</ion-title>
+ <ion-title>{{'lang.signatures' | translate}}</ion-title>
<ion-buttons slot="end">
<ion-button (click)="dismissModal()">
<ion-icon slot="icon-only" name="close-outline"></ion-icon>