diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js index 3e1d6f3dae8c2883b8f32d3d6e21e3b13937c709..f81ec202d70b920e4c6a27622c95fbbab560fff8 100644 --- a/src/dbp-official-signature-pdf-upload.js +++ b/src/dbp-official-signature-pdf-upload.js @@ -589,11 +589,13 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem #grid-container{ margin-top: 2rem; - padding-top: 2rem; + /*padding-top: 2rem;*/ } .border{ - border-top: 1px solid black; + border-top: 1px solid black; + margin-top: 2rem; + padding-top: 2rem; } .placement-missing { @@ -764,16 +766,19 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem <h2>${i18n.t('official-pdf-upload.upload-field-label')}</h2> <div class="control"> <p> - ${i18n.t('qualified-pdf-upload.upload-text')} + ${i18n.t('official-pdf-upload.sub-headline')} + </p> + <p class="border"> + ${i18n.t('official-pdf-upload.upload-text')} </p> <button @click="${() => { this._("#file-source").setAttribute("dialog-open", ""); }}" ?disabled="${this.signingProcessActive}" class="button is-primary"> - ${i18n.t('qualified-pdf-upload.upload-button-label')} + ${i18n.t('official-pdf-upload.upload-button-label')} </button> <dbp-file-source id="file-source" - context="${i18n.t('qualified-pdf-upload.upload-field-label')}" + context="${i18n.t('official-pdf-upload.file-picker-context')}" allowed-mime-types="application/pdf" enabled-targets="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}" nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}" @@ -790,7 +795,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem ></dbp-file-source> </div> </div> - <div id="grid-container" class="${classMap({"border": this.queueBlockEnabled})}"> + <div id="grid-container"öä--.> <div class="left-container"> <div class="files-block field ${classMap({hidden: !this.queueBlockEnabled})}"> <!-- Queued files headline and queueing spinner --> diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js index e11f6e0c9f62e004357da5bbedb22ba1b9752310..3642cd22b2d7b32a6ab6b4077720749aec654e93 100644 --- a/src/dbp-qualified-signature-pdf-upload.js +++ b/src/dbp-qualified-signature-pdf-upload.js @@ -736,11 +736,13 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle #grid-container{ margin-top: 2rem; - padding-top: 2rem; + /* padding-top: 2rem; */ } .border{ border-top: 1px solid black; + margin-top: 2rem; + padding-top: 2rem; } .placement-missing { @@ -944,7 +946,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle <dbp-file-source id="file-source" - context="${i18n.t('qualified-pdf-upload.upload-field-label')}" + context="${i18n.t('qualified-pdf-upload.file-picker-context')}" allowed-mime-types="application/pdf" enabled-targets="local${this.showNextcloudFilePicker ? ",nextcloud" : ""}" nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}" diff --git a/src/dbp-signature-verification-full.js b/src/dbp-signature-verification-full.js index 54b442ce9516841d3cf467df929e041115499dc8..6b46458f4a9c1eb68cf1bf694f5081e0c1f83128 100644 --- a/src/dbp-signature-verification-full.js +++ b/src/dbp-signature-verification-full.js @@ -508,11 +508,13 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme #grid-container{ margin-top: 2rem; - padding-top: 2rem; + /*padding-top: 2rem;*/ } .border{ border-top: 1px solid black; + margin-top: 2rem; + padding-top: 2rem; } /* Handling for small displays (like mobile devices) */ @@ -689,6 +691,9 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme <h2>${i18n.t('signature-verification.upload-field-label')}</h2> <div class="control"> <p> + ${i18n.t('signature-verification.sub-headline')} + </p> + <p class="border"> ${i18n.t('signature-verification.upload-text')} </p> <button @click="${() => { this._("#file-source").setAttribute("dialog-open", ""); }}" @@ -707,6 +712,7 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme decompress-zip lang="${this.lang}" ?disabled="${this.verificationProcessActive}" + context="${i18n.t('signature-verification.file-picker-context')}" text="${i18n.t('signature-verification.upload-area-text')}" button-label="${i18n.t('signature-verification.upload-button-label')}" @dbp-file-source-file-selected="${this.onFileSelected}" diff --git a/src/i18n/de/translation.json b/src/i18n/de/translation.json index cf70a46e8347113fa6ce6dd2f645116b43a36800..371dd12bd2c3e902ee9565cdb6f60ab79e5cdc37 100644 --- a/src/i18n/de/translation.json +++ b/src/i18n/de/translation.json @@ -31,7 +31,8 @@ "re-upload-all-button-title": "Alle fehlgeschlagen Signaturvorgänge erneut in die Warteschlange stellen", "signature-placement-label": "Signatur platzieren", "positioning": "Positionierung", - "confirm-page-leave": "Sind Sie sicher, dass Sie die Seite verlassen wollen? Es stehen signierte Dokumente zum Download bereit." + "confirm-page-leave": "Sind Sie sicher, dass Sie die Seite verlassen wollen? Es stehen signierte Dokumente zum Download bereit.", + "file-picker-context": "PDF-Dokumente zum Signieren auswählen" }, "qualified-pdf-upload": { "upload-field-label": "Dokument persönlich signieren", @@ -65,10 +66,12 @@ "re-upload-all-button-title": "Alle fehlgeschlagen Signaturvorgänge erneut in die Warteschlange stellen", "signature-placement-label": "Signatur platzieren", "positioning": "Positionierung", - "confirm-page-leave": "Sind Sie sicher, dass Sie die Seite verlassen wollen? Es stehen signierte Dokumente zum Download bereit." + "confirm-page-leave": "Sind Sie sicher, dass Sie die Seite verlassen wollen? Es stehen signierte Dokumente zum Download bereit.", + "file-picker-context": "PDF-Dokumente zum Signieren auswählen" }, "signature-verification": { "upload-field-label": "PDF-Dokumente zum Überprüfen der Signaturen hochladen", + "sub-headline": "Erlaubt das Verifizieren von signierten PDF-Dokumenten", "save-field-label": "{{count}} Datei speichern", "save-field-label_plural": "{{count}} Dateien speichern", "upload-text": "Sie können in diesem Bereich PDF-Dokumente mit einer Maximalgröße von bis zu 32MB pro Dokument hochladen. Die PDF-Dokumente dürfen sich auch in ZIP-Dateien befinden.", diff --git a/src/i18n/en/translation.json b/src/i18n/en/translation.json index 65094b2690b0e7be7ae1554f7820f129002e4af3..90717601a2e2e647ab53d02607d1e22fada6118b 100644 --- a/src/i18n/en/translation.json +++ b/src/i18n/en/translation.json @@ -1,6 +1,7 @@ { "official-pdf-upload": { - "upload-field-label": "Upload PDF-documents to sign", + "upload-field-label": "Officially sign", + "sub-headline": "Allows upload of PDF-documents to officially sign them", "save-field-label": "Save {{count}} file", "save-field-label_plural": "Save {{count}} files", "upload-text": "In this area you can upload PDF-documents up to a size of 32MB. The PDF-documents can also be located in a ZIP-file.", @@ -29,10 +30,12 @@ "re-upload-all-button-title": "Queue all failed documents again", "signature-placement-label": "Place signature", "positioning": "Positioning", - "confirm-page-leave": "Are you sure you want to leave this page? There are still signed documents ready to be downloaded." + "confirm-page-leave": "Are you sure you want to leave this page? There are still signed documents ready to be downloaded.", + "file-picker-context": "Upload PDF-documents to sign" }, "qualified-pdf-upload": { - "upload-field-label": "Upload PDF-documents to sign", + "upload-field-label": "Personally Sign Document", + "sub-headline": "Allows upload of PDF-documents to personally sign them", "save-field-label": "Save {{count}} file", "save-field-label_plural": "Save {{count}} files", "upload-text": "In this area you can upload PDF-documents up to a size of 32MB. The PDF-documents can also be located in a ZIP-file.", @@ -62,10 +65,12 @@ "re-upload-all-button-title": "Queue all failed documents again", "signature-placement-label": "Place signature", "positioning": "Positioning", - "confirm-page-leave": "Are you sure you want to leave this page? There are still signed documents ready to be downloaded." + "confirm-page-leave": "Are you sure you want to leave this page? There are still signed documents ready to be downloaded.", + "file-picker-context": "Upload PDF-documents to sign" }, "signature-verification": { - "upload-field-label": "Upload PDF-documents to verify", + "upload-field-label": "Verify signed documents", + "sub-headline": "Allows verification of signed PDF-documents", "save-field-label": "Save {{count}} file", "save-field-label_plural": "Save {{count}} files", "upload-text": "In this area you can upload PDF-documents up to a size of 32MB. The PDF-documents can also be located in a ZIP-file.", @@ -93,7 +98,8 @@ "serial-number": "Serial number", "value-message": "Verification", "no-signatures-found": "No signatures were found.", - "confirm-page-leave": "Are you sure you want to leave this page? There are still signed documents ready to be downloaded." + "confirm-page-leave": "Are you sure you want to leave this page? There are still signed documents ready to be downloaded.", + "file-picker-context": "Upload PDF-documents to verify" }, "signature-verification-extern": { "headline": "Verify signed Documents", diff --git a/vendor/toolkit b/vendor/toolkit index 6f58ac8c782bca5113cc9c7c9c12c7af5fdc3d73..c789b4eed33ce16fc337572ee2ec5bb547c4bf66 160000 --- a/vendor/toolkit +++ b/vendor/toolkit @@ -1 +1 @@ -Subproject commit 6f58ac8c782bca5113cc9c7c9c12c7af5fdc3d73 +Subproject commit c789b4eed33ce16fc337572ee2ec5bb547c4bf66