From 6e6851d165ecccae9aa75d7b2496e2cebdb5f782 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 9 Jun 2022 16:00:38 +0200
Subject: [PATCH] fix upload with fine-uploader

---
 CHANGELOG                               |  1 +
 views/bootstrap/class.AddDocument.php   |  2 +-
 views/bootstrap4/class.Bootstrap4.php   | 16 +++++++++-------
 views/bootstrap4/styles/application.css |  9 ---------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2ecff270e..dd49c400c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@
 - do not use logger in notification service if it was not initialized
 - fix editing of custom date fields
 - fix listing files/folders with umlauts when using webdav
+- fix upload with fine-uploader
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.25
diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index fb6fbdd86..bee74b937 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -41,7 +41,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Theme_Style {
 
 		parent::jsTranslations(array('js_form_error', 'js_form_errors'));
 		if($enablelargefileupload) {
-			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize, $enablemultiupload);
+			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize, $enablemultiupload, 'userfile', 'adddocform');
 		}
 ?>
 $(document).ready(function() {
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 5953a72ea..de5965c4c 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -3423,11 +3423,13 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	<div class="qq-total-progress-bar-container-selector qq-total-progress-bar-container">
 		<div role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" class="qq-total-progress-bar-selector qq-progress-bar qq-total-progress-bar"></div>
 		</div>
-	<div class="input-append">
-	<div class="qq-upload-drop-area-selector qq-upload-drop-area" _qq-hide-dropzone>
+	<div class="input-group">
+	<div class="form-control qq-upload-drop-area-selector qq-upload-drop-area" _qq-hide-dropzone>
 		<span class="qq-upload-drop-area-text-selector"></span>
 	</div>
-	<span class="btn qq-upload-button-selector qq-upload-button">'.getMLText('browse').'&hellip;</span>
+	<div class="input-group-append">
+	<span class="btn btn-secondary qq-upload-button-selector qq-upload-button">'.getMLText('choose_target_file').'&hellip;</span>
+	</div>
 	</div>
 	<span class="qq-drop-processing-selector qq-drop-processing">
 		<span class="qq-drop-processing-spinner-selector qq-drop-processing-spinner"></span>
@@ -3441,22 +3443,22 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			<img class="qq-thumbnail-selector" qq-max-size="100" qq-server-scale>
 			<span class="qq-upload-file-selector qq-upload-file"></span>
 			<span class="qq-upload-size-selector qq-upload-size"></span>
-			<button class="btn btn-mini qq-btn qq-upload-cancel-selector qq-upload-cancel">Cancel</button>
+			<button class="btn btn-sm btn-danger qq-btn qq-upload-cancel-selector qq-upload-cancel">Cancel</button>
 			<span role="status" class="qq-upload-status-text-selector qq-upload-status-text"></span>
 		</li>
 	</ul>
 	<dialog class="qq-alert-dialog-selector">
 		<div class="qq-dialog-message-selector"></div>
 		<div class="qq-dialog-buttons">
-			<button class="btn qq-cancel-button-selector">Cancel</button>
+			<button class="btn btn-sm btn-secondary qq-cancel-button-selector">Cancel</button>
 		</div>
 	</dialog>
 
 	<dialog class="qq-confirm-dialog-selector">
 		<div class="qq-dialog-message-selector"></div>
 		<div class="qq-dialog-buttons">
-			<button class="btn qq-cancel-button-selector">Cancel</button>
-			<button class="btn qq-ok-button-selector">Ok</button>
+			<button class="btn btn-sm btn-secondary qq-cancel-button-selector">Cancel</button>
+			<button class="btn btn-sm btn-primary qq-ok-button-selector">Ok</button>
 		</div>
 	</dialog>
 
diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css
index 2dde7e119..51ef35ded 100644
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@@ -425,15 +425,6 @@ ul.qq-upload-list li span {
 	display: inline-block;
 }
 
-.qq-upload-drop-area {
-	display: inline-block;
-	width: 200px;
-	height: 22px;
-	padding: 3px;
-	background-color: #fff;
-	border: 1px solid #cccccc;
-	border-radius: 4px;
-}
 .qq-hide, .qq-uploader dialog {
 	display: none;
 }