From 38b35b68cadc9822a21b68db7621520df22c5fb8 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Mon, 17 Dec 2018 09:08:40 +0100
Subject: [PATCH] [BUGFIX] Streamline UX for File Upload module
When using the file upload module (called via File list), the dialog uses
non-bootstrap classes from historical times back in the day.
Using proper HTML makes the view look more like the rest of
TYPO3 Backend.
Resolves: #87178
Releases: master, 9.5
Change-Id: I4d6a4c8f96414d5fb776270db6ef8aa677e788b7
Reviewed-on: https://review.typo3.org/59175
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
---
.../Controller/File/FileUploadController.php | 35 +++++++------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
index e49ed7954a23..8e83722d35c0 100644
--- a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
@@ -232,31 +232,22 @@ class FileUploadController
*/
protected function renderUploadFormInternal(): string
{
- // Make checkbox for "overwrite"
$content = '
- <div id="c-override">
- <p class="checkbox"><label for="overwriteExistingFiles"><input type="checkbox" name="overwriteExistingFiles" id="overwriteExistingFiles" value="replace" /> ' . htmlspecialchars($this->getLanguageService()->getLL('overwriteExistingFiles')) . '</label></p>
- <p>' . htmlspecialchars($this->getLanguageService()->getLL('uploadMultipleFilesInfo')) . '</p>
- </div>
- ';
- // Produce the number of upload-fields needed:
- $content .= '
- <div id="c-upload">
- ';
- // Adding 'size="50" ' for the sake of Mozilla!
- $content .= '
- <input type="file" multiple="multiple" name="upload_1[]" />
+ <div class="form-group">
+ <input type="file" multiple="multiple" class="form-control" name="upload_1[]" />
<input type="hidden" name="data[upload][1][target]" value="' . htmlspecialchars($this->folderObject->getCombinedIdentifier()) . '" />
- <input type="hidden" name="data[upload][1][data]" value="1" /><br />
- ';
- $content .= '
+ <input type="hidden" name="data[upload][1][data]" value="1" />
</div>
- ';
- // Submit button:
- $content .= '
- <div id="c-submit">
- <input type="hidden" name="data[upload][1][redirect]" value="' . $this->returnUrl . '" /><br />
- <input class="btn btn-default" type="submit" value="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:file_upload.php.submit')) . '" />
+ <div class="checkbox">
+ <label for="overwriteExistingFiles">
+ <input type="checkbox" name="overwriteExistingFiles" id="overwriteExistingFiles" value="replace" /> ' . htmlspecialchars($this->getLanguageService()->getLL('overwriteExistingFiles')) . '</label>
+ </div>
+ <div>
+ <input type="hidden" name="data[upload][1][redirect]" value="' . $this->returnUrl . '" />
+ <input class="btn btn-primary" type="submit" value="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:file_upload.php.submit')) . '" />
+ </div>
+ <div class="callout callout-warning">
+ ' . htmlspecialchars($this->getLanguageService()->getLL('uploadMultipleFilesInfo')) . '
</div>
';
--
GitLab