From 5a960f58a8a34d802bff6fc82b304eeba2794120 Mon Sep 17 00:00:00 2001
From: Hamza HRAMCHI <hamza.hramchi@xelians.fr>
Date: Thu, 15 Sep 2022 14:46:21 +0200
Subject: [PATCH] FIX #21740 TIME 0:10 wording + fix css
---
src/frontend/app/viewer/document-viewer.component.html | 9 +++++----
src/frontend/app/viewer/document-viewer.component.scss | 4 ++++
src/lang/lang-en.json | 4 +++-
src/lang/lang-fr.json | 4 +++-
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/frontend/app/viewer/document-viewer.component.html b/src/frontend/app/viewer/document-viewer.component.html
index 4f9532fcbde..02b2db2e065 100644
--- a/src/frontend/app/viewer/document-viewer.component.html
+++ b/src/frontend/app/viewer/document-viewer.component.html
@@ -70,6 +70,7 @@
<button mat-icon-button [matMenuTriggerFor]="menuOptions">
<mat-icon class="fas fa-chevron-down"></mat-icon>
</button>
+ <div class="divider"></div>
<mat-menu #menuOptions="matMenu" [class]="'optionsListMenu'">
<button mat-menu-item *ngIf="file.contentView !== undefined || base64 !== null" (click)="openPdfInTab()">
<mat-icon color="primary" class="fas fa-external-link-alt"></mat-icon>
@@ -103,13 +104,13 @@
<span>{{'lang.version' | translate}} {{version}}</span>
</button>
</mat-menu>
- <button *ngIf="file.subinfos.signedDocVersions" mat-button
+ <button *ngIf="file.subinfos.signedDocVersions" mat-button class="originalVersion" [title]="'lang.unsignedVersionDesc' | translate"
(click)="openResourceVersion(file.subinfos.mainDocVersions[file.subinfos.mainDocVersions.length -1],'SIGN')">
- {{'lang.SIGN_version' | translate}}
+ {{'lang.unsignedVersionDesc' | translate}}
</button>
- <button *ngIf="file.subinfos.commentedDocVersions > 0" mat-button
+ <button *ngIf="file.subinfos.commentedDocVersions > 0" mat-button class="originalVersion" [title]="'lang.unannotatedVersionDesc' | translate"
(click)="openResourceVersion(file.subinfos.mainDocVersions[file.subinfos.mainDocVersions.length -1],'NOTE')">
- {{'lang.NOTE_version' | translate}}
+ {{'lang.unannotatedVersionDesc' | translate}}
</button>
</ng-container>
</div>
diff --git a/src/frontend/app/viewer/document-viewer.component.scss b/src/frontend/app/viewer/document-viewer.component.scss
index 257ccc2b145..7b1a7c825db 100644
--- a/src/frontend/app/viewer/document-viewer.component.scss
+++ b/src/frontend/app/viewer/document-viewer.component.scss
@@ -229,4 +229,8 @@
padding: 0.02em;
margin-top: 10px;
margin-bottom: 10px;
+}
+
+.originalVersion {
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/src/lang/lang-en.json b/src/lang/lang-en.json
index f2b81ae2df3..c5e7375158a 100644
--- a/src/lang/lang-en.json
+++ b/src/lang/lang-en.json
@@ -2659,5 +2659,7 @@
"nextRes": "Next mail",
"previousRes": "Previous mail",
"canGoToNextRes": "Move to next mail when action is complete",
- "canGoToNextResDesc": "Activating this option saves this choice in your session"
+ "canGoToNextResDesc": "Activating this option saves this choice in your session",
+ "unsignedVersionDesc": "See the unsigned version",
+ "unannotatedVersionDesc": "See the unannotated version"
}
diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json
index 2a39d339fac..4cc2d477a54 100644
--- a/src/lang/lang-fr.json
+++ b/src/lang/lang-fr.json
@@ -2658,5 +2658,7 @@
"canGoToNextResDesc": "L'activation de cette option permet de sauvegarder ce choix dans votre session",
"processDelayEnabled": "Délai de traitement activé",
"processDelayDisabled": "Délai de traitement désactivé",
- "disableProcessDelayDesc": "Ce type de document n'est plus pris en compte pour le calcul de la date limite de traitement"
+ "disableProcessDelayDesc": "Ce type de document n'est plus pris en compte pour le calcul de la date limite de traitement",
+ "unsignedVersionDesc": "Voir la version non signée",
+ "unannotatedVersionDesc": "Voir la version non annotée"
}
--
GitLab