From 7cc2dcd1fc89265e0d7a7a53a4643cfa9ccbd98c Mon Sep 17 00:00:00 2001
From: Tomasz Sowa <t.sowa@ttmath.org>
Date: Fri, 22 Jan 2021 11:50:28 +0100
Subject: [PATCH] jquery-file-upload updated to 10.31.0 version

---
 winixd/html/fun_upload.html               | 248 +++++++++++++++-------
 winixd/html/index_head_functions_add.html | 121 +++++------
 winixd/locale/pl                          |   1 +
 3 files changed, 224 insertions(+), 146 deletions(-)

diff --git a/winixd/html/fun_upload.html b/winixd/html/fun_upload.html
index db6a984..c7293ac 100644
--- a/winixd/html/fun_upload.html
+++ b/winixd/html/fun_upload.html
@@ -19,98 +19,188 @@
     <noscript><input type="hidden" name="redirect" value="https://blueimp.github.io/jQuery-File-Upload/"></noscript>
     [end]
 
-	[# The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload]
-    <div class="fileupload-buttonbar">
-        <div class="fileupload-buttons">
-            [# The fileinput-button span is used to style the file input field as button]
-            <span class="fileinput-button">
-                <span>{upload_button_add_files}</span>
-                <input type="file" name="files\[\]" multiple>
+        <div class="row fileupload-buttonbar">
+          <div class="col-lg-7">
+            <!-- The fileinput-button span is used to style the file input field as button -->
+            <span class="btn btn-success fileinput-button">
+              <i class="glyphicon glyphicon-plus"></i>
+              <span>{upload_button_add_files}</span>
+              <input type="file" name="files\[\]" multiple />
             </span>
-            <button type="submit" class="start">{upload_button_start_upload}</button>
-            <button type="reset" class="cancel">{upload_button_cancel_upload}</button>
-            <button type="button" class="delete">{upload_button_delete}</button>
-            <input type="checkbox" class="toggle">
-            [# The global file processing state]
+            <button type="submit" class="btn btn-primary start">
+              <i class="glyphicon glyphicon-upload"></i>
+              <span>{upload_button_start_upload}</span>
+            </button>
+            <button type="reset" class="btn btn-warning cancel">
+              <i class="glyphicon glyphicon-ban-circle"></i>
+              <span>{upload_button_cancel_upload}</span>
+            </button>
+            <button type="button" class="btn btn-danger delete">
+              <i class="glyphicon glyphicon-trash"></i>
+              <span>{upload_button_delete}</span>
+            </button>
+
+            [# to the checkbox added form-check-input class and style element]
+            <input type="checkbox" class="toggle form-check-input" style="transform: none;">
+
+            <!-- The global file processing state -->
             <span class="fileupload-process"></span>
-        </div>
-        [# The global progress state]
-        <div class="fileupload-progress fade" style="display:none">
-            [# The global progress bar]
-            <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100"></div>
-            [# The extended global progress state]
+          </div>
+          <!-- The global progress state -->
+          <div class="col-lg-5 fileupload-progress fade">
+            <!-- The global progress bar -->
+            <div
+              class="progress progress-striped active"
+              role="progressbar"
+              aria-valuemin="0"
+              aria-valuemax="100"
+            >
+              <div
+                class="progress-bar progress-bar-success"
+                style="width: 0%;"
+              ></div>
+            </div>
+            <!-- The extended global progress state -->
             <div class="progress-extended">&nbsp;</div>
+          </div>
         </div>
-    </div>
-    [# The table listing the files available for upload/download]
-    <table role="presentation"><tbody class="files"></tbody></table>
+
+        <!-- The table listing the files available for upload/download -->
+        <table role="presentation" class="table table-striped">
+          <tbody class="files"></tbody>
+        </table>
 </form>
 
+
 [# The blueimp Gallery widget]
-<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls" data-filter=":even">
-    <div class="slides"></div>
-    <h3 class="title"></h3>
-    <a class="prev">‹</a>
-    <a class="next">›</a>
-    <a class="close">×</a>
-    <a class="play-pause"></a>
-    <ol class="indicator"></ol>
+<div
+  id="blueimp-gallery"
+  class="blueimp-gallery blueimp-gallery-controls"
+  aria-label="image gallery"
+  aria-modal="true"
+  role="dialog"
+  data-filter=":even"
+>
+  <div class="slides" aria-live="polite"></div>
+  <h3 class="title"></h3>
+  <a
+	class="prev"
+	aria-controls="blueimp-gallery"
+	aria-label="previous slide"
+	aria-keyshortcuts="ArrowLeft"
+  ></a>
+  <a
+	class="next"
+	aria-controls="blueimp-gallery"
+	aria-label="next slide"
+	aria-keyshortcuts="ArrowRight"
+  ></a>
+  <a
+	class="close"
+	aria-controls="blueimp-gallery"
+	aria-label="close"
+	aria-keyshortcuts="Escape"
+  ></a>
+  <a
+	class="play-pause"
+	aria-controls="blueimp-gallery"
+	aria-label="play slideshow"
+	aria-keyshortcuts="Space"
+	aria-pressed="false"
+	role="button"
+  ></a>
+  <ol class="indicator"></ol>
 </div>
 
+
 [# The template to display files available for upload]
 <script id="template-upload" type="text/x-tmpl">
-			\{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
-				<tr class="template-upload fade">
-					<td>
-						<span class="preview"></span>
-					</td>
-					<td>
-						<p class="name">\{%=file.name%\}</p>
-						<strong class="error"></strong>
-					</td>
-					<td>
-						<p class="size">Processing...</p>
-						<div class="progress"></div>
-					</td>
-					<td>
-						\{% if (!i && !o.options.autoUpload) \{ %\}
-							<button class="start" disabled>Start</button>
-						\{% \} %\}
-						\{% if (!i) \{ %\}
-							<button class="cancel">Cancel</button>
-						\{% \} %\}
-					</td>
-				</tr>
-			\{% \} %\}</script>
+      \{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
+          <tr class="template-upload fade\{%=o.options.loadImageFileTypes.test(file.type)?' image':''%\}">
+              <td>
+                  <span class="preview"></span>
+              </td>
+              <td>
+                  <p class="name">\{%=file.name%\}</p>
+                  <strong class="error text-danger"></strong>
+              </td>
+              <td>
+                  <p class="size">{upload_processing}</p>
+                  <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
+              </td>
+              <td>
+                  \{% if (!o.options.autoUpload && o.options.edit && o.options.loadImageFileTypes.test(file.type)) \{ %\}
+                    <button class="btn btn-success edit" data-index="\{%=i%\}" disabled>
+                        <i class="glyphicon glyphicon-edit"></i>
+                        <span>{upload_button_edit}</span>
+                    </button>
+                  \{% \} %\}
+                  \{% if (!i && !o.options.autoUpload) \{ %\}
+                      <button class="btn btn-primary start" disabled>
+                          <i class="glyphicon glyphicon-upload"></i>
+                          <span>{upload_button_start_upload}</span>
+                      </button>
+                  \{% \} %\}
+                  \{% if (!i) \{ %\}
+                      <button class="btn btn-warning cancel">
+                          <i class="glyphicon glyphicon-ban-circle"></i>
+                          <span>{upload_button_cancel_upload}</span>
+                      </button>
+                  \{% \} %\}
+              </td>
+          </tr>
+      \{% \} %\}</script>
 
 [# The template to display files available for download]
 <script id="template-download" type="text/x-tmpl">
-			\{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
-				<tr class="template-download fade">
-					<td>
-						<span class="preview">
-							\{% if (file.thumbnailUrl) \{ %\}
-								<a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" data-gallery><img src="\{%=file.thumbnailUrl%\}"></a>
-							\{% \} %\}
-						</span>
-					</td>
-					<td>
-						<p class="name">
-							<a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" \{%=file.thumbnailUrl?'data-gallery':''%\}>\{%=file.name%\}</a>
-						</p>
-						\{% if (file.error) \{ %\}
-							<div><span class="error">Error</span> \{%=file.error%\}</div>
-						\{% \} %\}
-					</td>
-					<td>
-						<span class="size">\{%=o.formatFileSize(file.size)%\}</span>
-					</td>
-					<td>
-						<button class="delete" data-type="\{%=file.deleteType%\}" data-url="\{%=file.deleteUrl%\}"\{% if (file.deleteWithCredentials) \{ %\} data-xhr-fields='\{"withCredentials":true\}'\{% \} %\}>Delete</button>
-						<input type="checkbox" name="delete" value="1" class="toggle">
-					</td>
-				</tr>
-			\{% \} %\}</script>
+      \{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
+          <tr class="template-download fade\{%=file.thumbnailUrl?' image':''%\}">
+              <td>
+                  <span class="preview">
+                      \{% if (file.thumbnailUrl) \{ %\}
+                          <a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" data-gallery><img src="\{%=file.thumbnailUrl%\}"></a>
+                      \{% \} %\}
+                  </span>
+              </td>
+              <td>
+                  <p class="name">
+                      \{% if (file.url) \{ %\}
+                          <a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" \{%=file.thumbnailUrl?'data-gallery':''%\}>\{%=file.name%\}</a>
+                      \{% \} else \{ %\}
+                          <span>\{%=file.name%\}</span>
+                      \{% \} %\}
+                  </p>
+                  \{% if (file.error) \{ %\}
+                      <div><span class="label label-danger">{upload_error}</span> \{%=file.error%\}</div>
+                  \{% \} %\}
+              </td>
+              <td>
+                  <span class="size">\{%=o.formatFileSize(file.size)%\}</span>
+              </td>
+              <td>
+                  \{% if (file.deleteUrl) \{ %\}
+
+					[# added one div to inline the button with the checkbox]
+					[# to the checkbox added form-check-input class and style element]
+
+					<div class="form-inline" style="white-space: nowrap;">
+                      <button class="btn btn-danger delete" data-type="\{%=file.deleteType%\}" data-url="\{%=file.deleteUrl%\}"\{% if (file.deleteWithCredentials) \{ %\} data-xhr-fields='\{"withCredentials":true\}'\{% \} %\}>
+                          <i class="glyphicon glyphicon-trash"></i>
+                          <span>{upload_button_delete}</span>
+                      </button>
+                      <input type="checkbox" name="delete" value="1" class="toggle form-check-input" style="transform: none;">
+                    </div>
+
+
+                  \{% \} else \{ %\}
+                      <button class="btn btn-warning cancel">
+                          <i class="glyphicon glyphicon-ban-circle"></i>
+                          <span>{upload_button_cancel}</span>
+                      </button>
+                  \{% \} %\}
+              </td>
+          </tr>
+      \{% \} %\}</script>
 
 
 <script type="text/javascript">
@@ -129,8 +219,6 @@
 			    '/cors/result.html?%s'
             ));
 
-			$("div.winix #fileupload button.cancel").css('display','inline');
-
             [# loading existing files]
             [# copied from common/fileupload/js/main.js]
             $('#fileupload').addClass('fileupload-processing');
diff --git a/winixd/html/index_head_functions_add.html b/winixd/html/index_head_functions_add.html
index aefe44c..bde5dc5 100644
--- a/winixd/html/index_head_functions_add.html
+++ b/winixd/html/index_head_functions_add.html
@@ -1,8 +1,11 @@
+[# rename me to index_head_adder.html]
+
+
 [def winix_has_uikit "true"]
 [def winix_has_jquery "false"]
 
 [# UIkit CSS]
-<link rel="stylesheet" href="[doc_base_url_common]/uikit/uikit-3.6.13/css/uikit.min.css" />
+<link rel="stylesheet" href="[doc_base_url_common]/uikit/uikit-3.6.13/css/uikit.min.css">
 
 [# UIkit JS]
 <script src="[doc_base_url_common]/uikit/uikit-3.6.13/js/uikit.min.js"></script>
@@ -175,9 +178,8 @@ cm.save()
 
 
 [if winix_function_is "upload"]
-	[# http://blueimp.github.io/jQuery-File-Upload/jquery-ui.html]
+	[# https://blueimp.github.io/jQuery-File-Upload/]
 	[# https://github.com/blueimp/jQuery-File-Upload]
-	[# we are using the *jQuery UI version* of the plugin]
 
 	[# Force latest IE rendering engine or ChromeFrame if installed]
 	<!--\[if IE\]>
@@ -185,81 +187,68 @@ cm.save()
 	<!\[endif\]-->
 
 
+    <link rel="stylesheet" href="[doc_base_url_common]/bootstrap/3.3.7/css/bootstrap.min.css">
 
-	<!-- jQuery UI styles -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery-ui.css">
+	[# in doc_base_url_common/jquery-file-upload/10.31.0_extra/blueimp-gallery/ is download_all_files.sh script in order to download all necessary files]
+    <!-- blueimp Gallery styles -->
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/blueimp-gallery/blueimp-gallery.min.css">
 
-	<!-- Generic page styles -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/style.css">
+    [# CSS to style the file input field as button and adjust the Bootstrap progress bars]
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload.css">
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-ui.css">
 
-	[if false]
-	<style>
-	/* Adjust the jQuery UI widget font-size: */
-	.ui-widgetREMOVEME \{
-		font-size: 0.95em;
-	\}
-	</style>
-	[end]
+    [# CSS adjustments for browsers with JavaScript disabled]
+    <noscript>
+		<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-noscript.css">
+		<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-ui-noscript.css">
+	</noscript>
 
-	<!-- blueimp Gallery styles -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/others/blueimp-gallery.min.css">
-
-	<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload.css">
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-ui.css">
-
-	<!-- CSS adjustments for browsers with JavaScript disabled -->
-	<noscript><link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-noscript.css"></noscript>
-	<noscript><link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-ui-noscript.css"></noscript>
-
-
-	<!--
-	[# it doesn't work with this jquery]
-	<script src="[doc_base_url_common]/jquery/jquery-3.2.1.slim.min.js"></script>
-	-->
 
 	[def winix_has_jquery "true"]
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery.min.js"></script>
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery-ui.min.js"></script>
+    <script src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
 
-	<!-- The Templates plugin is included to render the upload/download listings -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/tmpl.min.js"></script>
 
-	<!-- The Load Image plugin is included for the preview images and image resizing functionality -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/load-image.all.min.js"></script>
+    <!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/vendor/jquery.ui.widget.js"></script>
 
-	<!-- The Canvas to Blob plugin is included for image resizing functionality -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/canvas-to-blob.min.js"></script>
+    <!-- The Templates plugin is included to render the upload/download listings -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/tmpl.min.js"></script>
+    <!-- The Load Image plugin is included for the preview images and image resizing functionality -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/load-image.all.min.js"></script>
+    <!-- The Canvas to Blob plugin is included for image resizing functionality -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/canvas-to-blob.min.js"></script>
+    <!-- blueimp Gallery script -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/jquery.blueimp-gallery.min.js"></script>
 
-	<!-- blueimp Gallery script -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery.blueimp-gallery.min.js"></script>
+    <!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.iframe-transport.js"></script>
+    <!-- The basic File Upload plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload.js"></script>
+    <!-- The File Upload processing plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-process.js"></script>
+    <!-- The File Upload image preview & resize plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-image.js"></script>
+    <!-- The File Upload audio preview plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-audio.js"></script>
+    <!-- The File Upload video preview plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-video.js"></script>
+    <!-- The File Upload validation plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-validate.js"></script>
+    <!-- The File Upload user interface plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-ui.js"></script>
 
-	<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.iframe-transport.js"></script>
+    [if false]
+    [# the code to run the plugin we have in fun_upload.html]
+    <!-- The main application script -->
+	<!--
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/demo.js"></script>
+	-->
+	[end]
 
-	<!-- The basic File Upload plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload.js"></script>
-
-	<!-- The File Upload processing plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-process.js"></script>
-
-	<!-- The File Upload image preview & resize plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-image.js"></script>
-
-	<!-- The File Upload audio preview plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-audio.js"></script>
-
-	<!-- The File Upload video preview plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-video.js"></script>
-
-	<!-- The File Upload validation plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-validate.js"></script>
-
-	<!-- The File Upload user interface plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-ui.js"></script>
-
-	<!-- The File Upload jQuery UI plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-jquery-ui.js"></script>
+    <!-- The XDomainRequest Transport is included for cross-domain file deletion for IE 8 and IE 9 -->
+    <!--\[if (gte IE 8)&(lt IE 10)\]>
+      <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/cors/jquery.xdr-transport.js"></script>
+    <!\[endif\]-->
 
 [end]
 
diff --git a/winixd/locale/pl b/winixd/locale/pl
index 4599422..0d0fb1a 100644
--- a/winixd/locale/pl
+++ b/winixd/locale/pl
@@ -332,6 +332,7 @@ upload_button_delete = Usuń
 upload_button_processing = Wysyłanie...
 upload_button_download = Ściągnij
 upload_error = Błąd:
+upload_processing = Processing...
 
 who_header = Lista sesji
 who_tab_index = L.p.