From b4bd935c67e230e670f3c573edaff7bfc18220fd Mon Sep 17 00:00:00 2001
From: Eugen Neuber <eugen.neuber@tugraz.at>
Date: Fri, 28 May 2021 12:17:12 +0200
Subject: [PATCH] Mark download button only, start with 'is-primary'
color --dbp-override-downloaded-bg-color is now optional, because as default the primary button becomes an ordinary button (background-color: none)
Also mark all buttons when 'zip-download-button' is clicked
---
assets/dbp-signature.html.ejs | 2 +-
src/dbp-official-signature-pdf-upload.js | 10 +++++-----
src/dbp-qualified-signature-pdf-upload.js | 8 ++++----
src/dbp-signature-lit-element.js | 12 ++++++++++--
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/assets/dbp-signature.html.ejs b/assets/dbp-signature.html.ejs
index 17bc5e6..efebee0 100644
--- a/assets/dbp-signature.html.ejs
+++ b/assets/dbp-signature.html.ejs
@@ -49,7 +49,7 @@
--dbp-override-warning-bg-color: #ffe183;
--dbp-override-warning-text-color: black;
--dbp-override-success-bg-color: #259207;
- --dbp-override-downloaded-bg-color: #9fdf9f;
+ /* --dbp-override-downloaded-bg-color: #9fdf9f; */
}
</style>
diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index e617626..bd8e5fe 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -600,8 +600,8 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
white-space: nowrap;
}
- .downloaded {
- background: var(--dbp-downloaded-bg-color);
+ .button.downloaded {
+ background-color: var(--dbp-downloaded-bg-color);
}
#pdf-preview .button.is-cancel {
@@ -773,12 +773,12 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
const file = this.signedFiles[id];
results.push(html`
- <div class="file-block" id="file-block-${id}">
+ <div class="file-block">
<div class="header">
<span class="filename"><strong>${file.name}</strong> (${humanFileSize(file.contentSize)})</span>
- <button class="button close"
+ <button class="button is-primary" id="file-download-button-${id}"
title="${i18n.t('official-pdf-upload.download-file-button-title')}"
- @click="${() => { this.downloadFileClickHandler(file, 'file-block-' + id); }}">
+ @click="${() => { this.downloadFileClickHandler(file, 'file-download-button-' + id); }}">
<dbp-icon name="download"></dbp-icon></button>
</div>
</div>
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index 721ad29..a6b2caa 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -707,7 +707,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
}
.downloaded {
- background: var(--dbp-downloaded-bg-color);
+ background-color: var(--dbp-downloaded-bg-color);
}
#pdf-preview .button.is-cancel {
@@ -896,12 +896,12 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
const file = this.signedFiles[id];
results.push(html`
- <div class="file-block" id="file-block-${id}">
+ <div class="file-block">
<div class="header">
<span class="filename"><strong>${file.name}</strong> (${humanFileSize(file.contentSize)})</span>
- <button class="button close"
+ <button class="button is-primary" id="file-download-button-${id}"
title="${i18n.t('qualified-pdf-upload.download-file-button-title')}"
- @click="${() => { this.downloadFileClickHandler(file, 'file-block-' + id); }}">
+ @click="${() => { this.downloadFileClickHandler(file, 'file-download-button-' + id); }}">
<dbp-icon name="download"></dbp-icon></button>
</div>
</div>
diff --git a/src/dbp-signature-lit-element.js b/src/dbp-signature-lit-element.js
index ab5c130..8691138 100644
--- a/src/dbp-signature-lit-element.js
+++ b/src/dbp-signature-lit-element.js
@@ -388,6 +388,12 @@ export default class DBPSignatureLitElement extends BaseLitElement {
this.signedFilesToDownload = files.length;
this._("#file-sink").files = files;
this._("#zip-download-button").stop();
+ // mark downloaded files buttons
+ const buttons = this.shadowRoot.querySelectorAll('.file-block > div > button');
+ buttons.forEach(button => {
+ button.classList.add('downloaded');
+ button.classList.remove('is-primary');
+ });
}
/**
@@ -410,7 +416,9 @@ export default class DBPSignatureLitElement extends BaseLitElement {
files.push(binaryFile);
this.signedFilesToDownload = files.length;
this._("#file-sink").files = files;
- const div = this.shadowRoot.querySelector('#' + id);
- div.classList.add('downloaded');
+ // mark downloaded files button
+ const button = this.shadowRoot.querySelector('#' + id);
+ button.classList.add('downloaded');
+ button.classList.remove('is-primary');
}
}
--
GitLab