From 833cc55c5d271e08ae6cd2e9d2d31124f4be3148 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Mon, 23 Aug 2021 17:52:55 -0400
Subject: [PATCH] Fixes upload indicator Fixes max-body-size

---
 .../templates/panel/server_files.html         | 31 ++++++++++---------
 app/frontend/templates/panel/server_term.html |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 24476d5c..0b85298e 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -583,17 +583,18 @@
                 label: "Upload",
                 className: "btn-default",
                 callback: async function () {
+                  var height = files.files.length*50;
+
+                  var waitMessage = '<p class="text-center mb-0">'+
+                    '<i class="fa fa-spin fa-cog"></i>'+
+                    'Please wait while we upload your files... This may take a while.<br>'+
+                    '<strong>DO NOT CLOSE THIS PAGE.</strong>'+
+                  '</p>'+
+                  '<div class="progress" id="upload-progress-bar-parent" style="height:'+height +'px; width:100%; display: block;">'+
+                  '</div>'
                     files = document.getElementById("files");
                     uploadWaitDialog = bootbox.dialog({
-                      message: `
-                        <p class="text-center mb-0">
-                          <i class="fa fa-spin fa-cog"></i>
-                          Please wait while we upload your files... This may take a while.<br>
-                          <strong>DO NOT CLOSE THIS PAGE.</strong>
-                        </p>
-                        <div class="progress" id="upload-progress-bar-parent">
-                        </div>
-                      `,
+                      message: waitMessage,
                       closeButton: false
                   });
                   let nFiles = files.files.length;
@@ -603,20 +604,20 @@
                       hideUploadBox();
                       break;
                     }
-                    console.log(files.files[i]);
+                    console.log(files.files[i].name);
                     const progressHtml = `
-                    <div>
-                      ${path + '/' + files.files[i]}:
-                      <div
+                    <div style="width: 100%; min-width: 100%;">
+                      ${files.files[i].name}:
+                      <br><div
                         id="upload-progress-bar-${i + 1}"
                         class="progress-bar progress-bar-striped progress-bar-animated"
                         role="progressbar"
-                        style="width: 0%"
+                        style="width: 100%; height: 10px;"
                         aria-valuenow="0"
                         aria-valuemin="0"
                         aria-valuemax="100"
                       ></div>
-                    </div>
+                    </div><br>
                     `;
                     $('#upload-progress-bar-parent').append(progressHtml);
                     sendFile(files.files[i], path, server_id, (progress) => {
diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html
index 0b660a29..80db63d0 100644
--- a/app/frontend/templates/panel/server_term.html
+++ b/app/frontend/templates/panel/server_term.html
@@ -67,7 +67,7 @@
         </div>
       </div>
     </div>
-  </div>
+  </div>T
 </div>
 <style>
                     #virt_console::-webkit-scrollbar {