From 6ad718c5531e82953770456bd1e99f68c1674db2 Mon Sep 17 00:00:00 2001
From: Tamara Steinwender <tamara.steinwender@tugraz.at>
Date: Tue, 27 Jul 2021 09:38:09 +0200
Subject: [PATCH] Remove image upload button
---
packages/file-handling/src/file-source.js | 32 ++++---------------
.../src/i18n/de/translation.json | 1 -
.../src/i18n/en/translation.json | 1 -
3 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index 56df1b35..65850f49 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -148,7 +148,6 @@ export class FileSource extends ScopedElementsMixin(DbpFileHandlingLitElement) {
});
this.dropArea.addEventListener('drop', this.handleDrop.bind(this), false);
this._('#fileElem').addEventListener('change', this.handleChange.bind(this, this._('#fileElem')));
- this._('#imageElem').addEventListener('change', this.handleChange.bind(this, this._('#imageElem')));
this._('nav.modal-nav').addEventListener("scroll", this.handleScroll.bind(this));
@@ -541,7 +540,7 @@ export class FileSource extends ScopedElementsMixin(DbpFileHandlingLitElement) {
${fileHandlingStyles.getFileHandlingCss()}
-
+
p {
margin-top: 0;
}
@@ -606,14 +605,6 @@ export class FileSource extends ScopedElementsMixin(DbpFileHandlingLitElement) {
height: 100%;
}
- .file-upload{
- display: flex;
- }
-
- .file-upload label{
- margin-left: 10px;
- margin-right: 10px;
- }
@media only screen
@@ -694,28 +685,17 @@ export class FileSource extends ScopedElementsMixin(DbpFileHandlingLitElement) {
<div class="block">
<p>${i18n.t('intro')}</p>
</div>
- <div class="file-upload">
- <label class="button is-primary" for="fileElem" ?disabled="${this.disabled}">
- ${this.buttonLabel || i18n.t('upload-label')}
- </label>
- <label class="button is-primary ${classMap({"hidden": !this.hasEnabledSource("image")})}" for="imageElem" ?disabled="${this.disabled}">
- ${i18n.t('image-upload-label')}
- </label>
- </div>
+
+
<input ?disabled="${this.disabled}"
type="file"
id="fileElem"
multiple
accept="${mimeTypesToAccept(allowedMimeTypes)}"
name='file'>
-
- <input ?disabled="${this.disabled}"
- type="file"
- id="imageElem"
- single
- accept="image/*"
- name='image'
- class="hidden">
+ <label class="button is-primary" for="fileElem" ?disabled="${this.disabled}">
+ ${this.buttonLabel || i18n.t('upload-label')}
+ </label>
</div>
</div>
diff --git a/packages/file-handling/src/i18n/de/translation.json b/packages/file-handling/src/i18n/de/translation.json
index 464364ca..b32f65e8 100644
--- a/packages/file-handling/src/i18n/de/translation.json
+++ b/packages/file-handling/src/i18n/de/translation.json
@@ -9,7 +9,6 @@
"server-required": "Es wird unter der URL <a href=\"{{- url}}\"><tt>{{- url}}</tt></a> ein Server benötigt um die Dateien zu empfangen.",
"intro": "Sie können in diesem Bereich Dateien per Drag & Drop oder per Direktauswahl hochladen. Die Dateien dürfen sich auch in ZIP-Archiven befinden.",
"upload-label": "Dateiauswahl",
- "image-upload-label": "Bild auswählen",
"upload-disabled-title": "Die Dateiauswahl ist während dem Hochladvorgang gesperrt!",
"page-leaving-warn-dialogue": "Vorsicht! Es befinden sich noch ungenutzte Dateien in der Zwischenablage. Wenn Sie auf 'OK' klicken, wird die bestehende Zwischenablage automatisch verworfen!",
"file-source": {
diff --git a/packages/file-handling/src/i18n/en/translation.json b/packages/file-handling/src/i18n/en/translation.json
index 59411c72..6d86a8ba 100644
--- a/packages/file-handling/src/i18n/en/translation.json
+++ b/packages/file-handling/src/i18n/en/translation.json
@@ -9,7 +9,6 @@
"required-server": "You need an upload server listening at <a href=\"{{- url}}\"><tt>{{- url}}</tt></a> to receive the files...",
"intro": "Upload multiple files with the file dialog or by dragging and dropping images onto the dashed region.",
"upload-label": "Select some files",
- "image-upload-label": "Select an image",
"upload-disabled-title": "The file selection is disabled while uploading!",
"page-leaving-warn-dialogue": "Attention! There are still unused files in the clipboard. If you click on 'OK', the existing clipboard is automatically discarded!",
"file-source": {
--
GitLab