diff --git a/src/i18n/de/translation.json b/src/i18n/de/translation.json
index c90a105cb7951cf1c98cecf80ccf0ac39e6e2073..f1ad26fa03f7b15a86393c09f50b8d00ec9357aa 100644
--- a/src/i18n/de/translation.json
+++ b/src/i18n/de/translation.json
@@ -22,7 +22,8 @@
"queued-files-empty2": "Sie können jetzt neues Dokument hochladen",
"remove-failed-file-button-title": "Fehlgeschlagenes Dokument entfernen",
"remove-queued-file-button-title": "Dokument aus der Warteschlange entfernen",
- "start-signing-process-button": "Signaturvorgang starten",
+ "clear-all": "Alle entfernen",
+ "start-signing-process-button": "Alle signieren",
"stop-signing-process-button": "Signaturvorgang unterbrechen",
"show-preview": "Dokument anzeigen",
"positioning-automatic": "Automatisch",
@@ -33,14 +34,14 @@
"start-signing-process-button-running-title": "Signaturvorgang läuft gerade",
"remove-current-file-button-title": "Aktuellen Signaturprozess abbrechen",
"signed-files-label": "Signierte Dokumente",
- "download-zip-button": "Als ZIP Datei herunterladen",
+ "download-zip-button": "Alle herunterladen",
"download-zip-button-tooltip": "Alle signierten Dokumente als ZIP Datei herunterladen",
"upload-button-label": "PDF-Dokumente auswählen",
"download-file-button-title": "Signiertes PDF Dokument herunterladen",
- "error-files-label": "Fehlgeschlagene Signaturvorgänge",
+ "error-files-label": "Fehlgeschlagene Dokumente",
"re-upload-file-button-title": "Erneut in die Warteschlange stellen",
"upload-status-file-text": "({{fileSize}}) wird hochgeladen und verarbeitet...",
- "re-upload-all-button": "Alle erneut in die Warteschlange stellen",
+ "re-upload-all-button": "Alle wiederholen",
"re-upload-all-button-title": "Alle fehlgeschlagen Signaturvorgänge erneut in die Warteschlange stellen",
"signature-placement-label": "Signatur platzieren",
"positioning": "Positionierung",
diff --git a/src/i18n/en/translation.json b/src/i18n/en/translation.json
index 709f4171f8806fd2c59242968abdc7804dbf6b27..d538c296a66f96e4c78bd74a94d753bf13b20459 100644
--- a/src/i18n/en/translation.json
+++ b/src/i18n/en/translation.json
@@ -14,15 +14,16 @@
"re-upload-all-button-title": "Upload all failed uploads again"
},
"qualified-pdf-upload": {
- "upload-field-label": "Upload PDF-files to sign",
- "upload-area-text": "In this area you can upload PDF-files via Drag & Drop or by selecting them directly",
+ "upload-field-label": "Upload PDF-documents to sign",
+ "upload-area-text": "In this area you can upload PDF-documents via Drag & Drop or by selecting them directly",
"current-signing-process-label": "Current signing process",
- "queued-files-label": "Queued files",
- "queued-files-empty1": "No queued files",
- "queued-files-empty2": "You can now upload more files",
- "remove-failed-file-button-title": "Remove failed file",
- "remove-queued-file-button-title": "Remove file from queue",
- "start-signing-process-button": "Start signing process",
+ "queued-files-label": "Queued documents",
+ "queued-files-empty1": "No queued documents",
+ "queued-files-empty2": "You can now upload more documents",
+ "remove-failed-file-button-title": "Remove failed document",
+ "remove-queued-file-button-title": "Remove document from queue",
+ "clear-all": "Clear all",
+ "start-signing-process-button": "Sign all",
"stop-signing-process-button": "Stop signing process",
"show-preview": "Show document",
"positioning-automatic": "Automatic",
@@ -31,19 +32,19 @@
"preview": "Preview",
"start-signing-process-button-running-title": "Signing process running",
"remove-current-file-button-title": "Cancel current signing process",
- "signed-files-label": "Signed files",
- "download-zip-button": "Download ZIP",
- "download-zip-button-tooltip": "Download all signed files as ZIP file",
- "upload-button-label": "Select PDF-files",
+ "signed-files-label": "Signed documents",
+ "download-zip-button": "Download all",
+ "download-zip-button-tooltip": "Download all signed documents as ZIP file",
+ "upload-button-label": "Select PDF-documents",
"download-file-button-title": "Download signed PDF",
- "error-files-label": "Failed signing processes",
+ "error-files-label": "Failed documents",
"re-upload-file-button-title": "Queue again",
"upload-status-file-text": "({{fileSize}}) is currently uploading and being processed...",
"re-upload-all-button": "Queue all",
"re-upload-all-button-title": "Queue all failed signing processes again",
"signature-placement-label": "Preview",
"positioning": "Positioning",
- "file-label": "File"
+ "file-label": "document"
},
"pdf-preview": {
"first": "First",
diff --git a/src/textswitch.js b/src/textswitch.js
index 1bb52364b0f2675fba20a051b9110e30444f9760..f3503f9e62888f8229c8b06015e352c140a767e1 100644
--- a/src/textswitch.js
+++ b/src/textswitch.js
@@ -52,7 +52,7 @@ export class TextSwitch extends LitElement {
}
.active {
- background-color: var(--vpu-primary-bg-color) !important;
+ background-color: black !important;
color: var(--vpu-primary-text-color) !important;
}
`;
diff --git a/src/vpu-pdf-preview.js b/src/vpu-pdf-preview.js
index a3ce00b8cb058c330cddec2af6309ac1400abff9..72a47227b8b597840e3fdaea07f15e0235093c64 100644
--- a/src/vpu-pdf-preview.js
+++ b/src/vpu-pdf-preview.js
@@ -409,6 +409,10 @@ export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
white-space: nowrap;
margin: auto 0 auto auto;
}
+
+ .button.is-cancel {
+ color: #e4154b;
+ }
`;
}
@@ -443,8 +447,10 @@ export class PdfPreview extends ScopedElementsMixin(VPULitElement) {
?disabled="${this.isPageRenderingInProgress || this.currentPage === this.totalPages}">${i18n.t('pdf-preview.last')}</button>
<button class="button is-primary ${classMap({hidden: !this.isShowPlacement})}"
@click="${() => { this.sendAcceptEvent(); } }">${i18n.t('pdf-preview.continue')}</button>
- <button class="button is-danger"
+<!--
+ <button class="button is-cancel"
@click="${() => { this.sendCancelEvent(); } }">${i18n.t('pdf-preview.cancel')}</button>
+-->
<div class="page-info">${i18n.t('pdf-preview.page-count', {currentPage: this.currentPage, totalPages: this.totalPages, })}</div>
</div>
diff --git a/src/vpu-qualified-signature-pdf-upload.js b/src/vpu-qualified-signature-pdf-upload.js
index a5db519a4c6a67e36cada8a7af766991c687208d..5b7df195cc0822513caf864d3be23bfb6b0f1377 100644
--- a/src/vpu-qualified-signature-pdf-upload.js
+++ b/src/vpu-qualified-signature-pdf-upload.js
@@ -455,6 +455,22 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
return file;
}
+ clearQueuedFiles() {
+ this.queuedFilesSignaturePlacements = [];
+ this.queuedFilesPlacementModes = [];
+ this._("#file-upload").clearQueuedFiles();
+ }
+
+ clearSignedFiles() {
+ this.signedFiles = [];
+ this.signedFilesCount = 0;
+ }
+
+ clearErrorFiles() {
+ this.errorFiles = [];
+ this.errorFilesCount = 0;
+ }
+
static get styles() {
// language=css
return css`
@@ -467,6 +483,10 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
min-width: 320px;
}
+ h2 {
+ margin-bottom: 10px;
+ }
+
#pdf-preview .file {
border: 1px solid #000;
border-bottom-width: 0;
@@ -485,6 +505,10 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
max-width: 335px;
}
+ .files-block.field:not(:last-child) {
+ margin-bottom: 40px;
+ }
+
.files-block .file {
margin: 10px 0;
}
@@ -598,6 +622,20 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
overflow: hidden;
white-space: nowrap;
}
+
+ #pdf-preview .button.is-cancel {
+ color: #e4154b;
+ float: right;
+ margin-right: 10px;
+ }
+
+ .is-right {
+ float: right;
+ }
+
+ .error-files .header {
+ color: black;
+ }
`;
}
@@ -617,7 +655,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
<div class="file-block">
<div class="header">
<span class="filename"><strong>${file.name}</strong> (${humanFileSize(file.size)})</span>
- <button class="button close is-danger"
+ <button class="button close"
?disabled="${this.signingProcessEnabled}"
title="${i18n.t('qualified-pdf-upload.remove-queued-file-button-title')}"
@click="${() => { this.takeFileFromQueue(id); }}">
@@ -692,10 +730,10 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
<button class="button"
title="${i18n.t('qualified-pdf-upload.re-upload-file-button-title')}"
@click="${() => {this.fileQueueingClickHandler(data.file, id);}}"><vpu-icon name="reload"></vpu-icon></button>
- <button class="button is-danger"
+ <button class="button"
title="${i18n.t('qualified-pdf-upload.remove-failed-file-button-title')}"
@click="${() => { this.takeFailedFileFromQueue(id); }}">
- <vpu-icon name="close"></vpu-icon></button>
+ <vpu-icon name="trash"></vpu-icon></button>
</div>
</div>
<div class="bottom-line">
@@ -758,18 +796,25 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
style="font-size: 0.7em"
class="${classMap({hidden: !this.queueingInProgress})}"></vpu-mini-spinner>
</h2>
- <!-- Buttons to start/stop signing process -->
+ <!-- Buttons to start/stop signing process and clear queue -->
<div class="control field">
+ <button @click="${this.clearQueuedFiles}"
+ ?disabled="${this.queuedFilesCount === 0}"
+ class="button ${classMap({hidden: this.signingProcessActive})}">
+ ${i18n.t('qualified-pdf-upload.clear-all')}
+ </button>
<button @click="${() => { this.signingProcessEnabled = true; this.signingProcessActive = true; }}"
?disabled="${this.queuedFilesCount === 0}"
- class="button is-primary ${classMap({hidden: this.signingProcessActive})}">
+ class="button is-right is-primary ${classMap({hidden: this.signingProcessActive})}">
${i18n.t('qualified-pdf-upload.start-signing-process-button')}
</button>
+ <!--
<button @click="${() => { this.stopSigningProcess(); }}"
?disabled="${this.uploadInProgress}"
- class="button is-danger ${classMap({hidden: !this.signingProcessActive})}">
+ class="button ${classMap({hidden: !this.signingProcessActive})}">
${i18n.t('qualified-pdf-upload.stop-signing-process-button')}
</button>
+ -->
</div>
<!-- List of queued files -->
<div class="control file-list">
@@ -787,7 +832,16 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
<!-- Button to download all signed PDFs -->
<div class="field ${classMap({hidden: this.signedFilesCount === 0})}">
<div class="control">
- <vpu-button id="zip-download-button" value="${i18n.t('qualified-pdf-upload.download-zip-button')}" title="${i18n.t('qualified-pdf-upload.download-zip-button-tooltip')}" @click="${this.zipDownloadClickHandler}" type="is-primary"></vpu-button>
+ <button @click="${this.clearSignedFiles}"
+ class="button">
+ ${i18n.t('qualified-pdf-upload.clear-all')}
+ </button>
+ <vpu-button id="zip-download-button"
+ value="${i18n.t('qualified-pdf-upload.download-zip-button')}"
+ title="${i18n.t('qualified-pdf-upload.download-zip-button-tooltip')}"
+ class="is-right"
+ @click="${this.zipDownloadClickHandler}"
+ type="is-primary"></vpu-button>
</div>
</div>
<div class="control">
@@ -800,7 +854,17 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
<!-- Button to upload errored files again -->
<div class="field ${classMap({hidden: this.errorFilesCount === 0})}">
<div class="control">
- <vpu-button id="re-upload-all-button" ?disabled="${this.uploadInProgress}" value="${i18n.t('qualified-pdf-upload.re-upload-all-button')}" title="${i18n.t('qualified-pdf-upload.re-upload-all-button-title')}" @click="${this.reUploadAllClickHandler}" type="is-primary"></vpu-button>
+ <button @click="${this.clearErrorFiles}"
+ class="button">
+ ${i18n.t('qualified-pdf-upload.clear-all')}
+ </button>
+ <vpu-button id="re-upload-all-button"
+ ?disabled="${this.uploadInProgress}"
+ value="${i18n.t('qualified-pdf-upload.re-upload-all-button')}"
+ title="${i18n.t('qualified-pdf-upload.re-upload-all-button-title')}"
+ class="is-right"
+ @click="${this.reUploadAllClickHandler}"
+ type="is-primary"></vpu-button>
</div>
</div>
<div class="control">
@@ -813,7 +877,9 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
<div id="pdf-preview" class="field ${classMap({hidden: !this.signaturePlacementInProgress})}">
<h2>${this.withSigBlock ? i18n.t('qualified-pdf-upload.signature-placement-label') : i18n.t('qualified-pdf-upload.preview-label')}</h2>
<div class="file">
- <strong>${this.currentFile.name}</strong> (${humanFileSize(this.currentFile !== undefined ? this.currentFile.size : 0)})
+ <strong>${this.currentFile.name}</strong> (${humanFileSize(this.currentFile !== undefined ? this.currentFile.size : 0)})
+ <button class="button is-cancel"
+ @click="${this.hidePDF}">${i18n.t('pdf-preview.cancel')}</button>
</div>
<vpu-pdf-preview lang="${this.lang}"
@vpu-pdf-preview-accept="${this.storePDFData}"
diff --git a/vendor/file-upload b/vendor/file-upload
index a361e5e044fd4fd87b076ce6d559ddf7cf7ab47d..09a7f982afc752d637218813e01d0f2e60b1a563 160000
--- a/vendor/file-upload
+++ b/vendor/file-upload
@@ -1 +1 @@
-Subproject commit a361e5e044fd4fd87b076ce6d559ddf7cf7ab47d
+Subproject commit 09a7f982afc752d637218813e01d0f2e60b1a563