From f388b2c395d3fae29295cb8fac45f1c97471496e Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 6 Jun 2025 12:05:21 -0400
Subject: [PATCH 1/4] add waiting for Dataverse indicator

---
 src/css/dvwebloader.css | 24 ++++++++++++++++++++++++
 src/js/fileupload2.js   | 13 +++++++++++--
 src/js/lang.js          |  2 ++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/css/dvwebloader.css b/src/css/dvwebloader.css
index 944e8b4..afd62e6 100644
--- a/src/css/dvwebloader.css
+++ b/src/css/dvwebloader.css
@@ -104,3 +104,27 @@ h1 {
    border-width: 2px;
    border-style: solid;
 }
+
+.pending {
+    display: flex;
+    align-items: center;
+    padding: 10px;
+    background-color: #f8f9fa;
+    border-left: 4px solid #007bff;
+    margin: 10px 0;
+}
+
+.spinner {
+    border: 3px solid rgba(0, 0, 0, 0.1);
+    border-radius: 50%;
+    border-top: 3px solid #007bff;
+    width: 20px;
+    height: 20px;
+    margin-right: 10px;
+    animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
\ No newline at end of file
diff --git a/src/js/fileupload2.js b/src/js/fileupload2.js
index 7687d16..481e9d5 100644
--- a/src/js/fileupload2.js
+++ b/src/js/fileupload2.js
@@ -1020,6 +1020,10 @@ async function directUploadFinished() {
                 console.log(JSON.stringify(body));
                 let fd = new FormData();
                 fd.append('jsonData', JSON.stringify(body));
+                
+                // Add a loading indicator before making the AJAX call
+                $('#messages').append($('<div/>').attr('id', 'loading-indicator').addClass('pending')
+                    .html('<div class="spinner"></div>' + formatMessage('msgRegisteringFiles')));
                 $.ajax({
                     url: siteUrl + '/api/datasets/:persistentId/addFiles?persistentId=' + datasetPid,
                     headers: { "X-Dataverse-key": apiKey },
@@ -1031,6 +1035,9 @@ async function directUploadFinished() {
                     data: fd,
                     processData: false,
                     success: function(body, statusText, jqXHR) {
+                        // Remove the loading indicator
+                        $('#loading-indicator').remove();
+                        
                         var datasetUrl = siteUrl + '/dataset.xhtml?persistentId=' + datasetPid + '&version=DRAFT';
                         console.log("All files sent to " + datasetUrl);
                         if(draftExists) {
@@ -1040,10 +1047,12 @@ async function directUploadFinished() {
                         }
                     },
                     error: function(jqXHR, textStatus, errorThrown) {
+                        // Remove the loading indicator
+                        $('#loading-indicator').remove();
+                        
                         console.log('Failure: ' + jqXHR.status);
                         console.log('Failure: ' + errorThrown);
-                        addMessage("failure", "msgUploadToDataverseFailed", "Status: " + jqXHR.status + ", Error: " + errorThrown);
-                        //uploadFailure(jqXHR, thisFile);
+                        addMessage("error", "msgUploadToDataverseFailed", "Status: " + jqXHR.status + ", Error: " + errorThrown);
                     }
                 });
                 //stop observer when we're done
diff --git a/src/js/lang.js b/src/js/lang.js
index 2d52694..274eb1a 100644
--- a/src/js/lang.js
+++ b/src/js/lang.js
@@ -14,6 +14,7 @@ const translations = {
         msgStartUpload: "Checked files will be uploaded.",
         msgNoFile: "No files to upload. Check some files, or refresh to start over.",
         msgUploadCompleteRegistering: "Uploads to S3 complete. Now registering all files with the dataset. This may take some time for large numbers of files.",
+        msgRegisteringFiles: "Waiting for response from Dataverse ...",
         msgUploadComplete: "Upload complete, all files in dataset. Close this window and refresh your dataset page to see the uploaded files.",
         msgUploadCompleteNewDraft: "Upload complete, all files in dataset. Close this window, refresh your dataset page, and navigate to the new DRAFT version to see the uploaded files, or click <a href=\"{0}\">here</a> to open the new draft version in this tab.",
         msgRequiredPathOrFileNameChange: "The highlighted path/file(s) below contain one or more disallowed characters (paths can only contain a-Z, 0-9, '_', '-', '.', '\', '/' and ' ', and filenames cannot contain any of '/;:|?*#' ). Disallowed characters will be replaced by an underscore ('_') if the file(s) are uploaded.",
@@ -41,6 +42,7 @@ const translations = {
         msgStartUpload: "Les fichiers cochés seront envoyés.",
         msgNoFile: "Aucun fichier à envoyer. Cochez certains fichiers ou rafraîchissez la page pour recommencer.",
         msgUploadCompleteRegistering: "Envois vers S3 terminés. Enregistrement de tous les fichiers en cours dans le jeu de données. Cela peut prendre du temps pour un grand nombre de fichiers.",
+        msgRegisteringFiles: "En attente de réponse de Dataverse ...",
         msgUploadComplete: "Envoi terminé, tous les fichiers sont dans le jeu de données. Fermez cette fenêtre et rafraîchissez la page de votre jeu de données pour voir les fichiers envoyés.",
         msgUploadCompleteNewDraft: "Envoi terminé, tous les fichiers sont dans le jeu de données. Fermez cette fenêtre, rafraîchissez la page de votre jeu de données, et accédez à la nouvelle version DRAFT pour voir les fichiers envoyés, ou cliquez <a href=\"{0}\">ici</a> pour ouvrir la nouvelle version brouillon dans cet onglet.",
         msgRequiredPathOrFileNameChange: "Le(s) chemin(s) en surbrillance ci-dessous contiennent un ou plusieurs caractères non autorisés (les chemins ne peuvent contenir que a-Z, 0-9, '_', '-', '.', '\', '/' et ' ', et les noms de fichiers ne peuvent contenir aucun des éléments '/;:|?*#' ). Les caractères non autorisés seront remplacés par un trait de soulignement (« _ ») si le(s) fichier(s) sont téléchargés.",

From bc253424c589f3753d7ed625eff50daaf2ab5e19 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 6 Jun 2025 16:58:03 -0400
Subject: [PATCH 2/4] add refresh button

---
 src/css/dvwebloader.css |   9 +-
 src/js/fileupload2.js   | 194 +++++++++++++++++++++++++++++++---------
 src/js/lang.js          |   4 +
 3 files changed, 163 insertions(+), 44 deletions(-)

diff --git a/src/css/dvwebloader.css b/src/css/dvwebloader.css
index afd62e6..4e04c3a 100644
--- a/src/css/dvwebloader.css
+++ b/src/css/dvwebloader.css
@@ -84,7 +84,7 @@ h1 {
     width: 58%;
     display:inline-block;
 }
-.button:disabled {
+.button.disabled {
     background: gray;
     border-color: gray!important;
 }
@@ -105,6 +105,13 @@ h1 {
    border-style: solid;
 }
 
+#refreshDataset {
+  float:right;
+}
+.button {
+  font-size:16px;
+}
+
 .pending {
     display: flex;
     align-items: center;
diff --git a/src/js/fileupload2.js b/src/js/fileupload2.js
index 481e9d5..bd094d5 100644
--- a/src/js/fileupload2.js
+++ b/src/js/fileupload2.js
@@ -118,17 +118,8 @@ $(document).ready(function() {
             console.debug(files[i].webkitRelativePath);
             //              output.innerText  = output.innerText + files[i].webkitRelativePath+"\n";
         }
-        let numExists = $('#filelist>.ui-fileupload-files .file-exists').length;
         let totalFiles = Object.keys(rawFileMap).length;
-        console.log('exists: ' + numExists);
-        console.log('rawFileMap len: ' + totalFiles);
-        if (totalFiles === numExists) {
-            addMessage('info', 'msgFilesAlreadyExist');
-        } else if (numExists !== 0 && totalFiles > numExists) {
-            addMessage('info', 'msgUploadOnlyCheckedFiles');
-        } else (
-          addMessage('info', 'msgStartUpload')
-        )
+        updateFileSelectionMessage();
         $('label.button').hide();
         // Add buttons for selecting/deselecting files
                 $('<div/>')
@@ -157,6 +148,24 @@ $(document).ready(function() {
     };
 });
 
+/**
+ * Updates the message displayed to the user based on file selection status
+ */
+function updateFileSelectionMessage() {
+    let numExists = $('#filelist>.ui-fileupload-files .file-exists').length;
+    let totalFiles = Object.keys(rawFileMap).length;
+    console.log('exists: ' + numExists);
+    console.log('rawFileMap len: ' + totalFiles);
+    
+    if (totalFiles === numExists) {
+        addMessage('info', 'msgFilesAlreadyExist');
+    } else if (numExists !== 0 && totalFiles > numExists) {
+        addMessage('info', 'msgUploadOnlyCheckedFiles');
+    } else {
+        addMessage('info', 'msgStartUpload');
+    }
+}
+
 function updateMaxFiles() {
     let maxInput = $('#maxFilesInput');
     let maxFiles = parseInt(maxInput.val());
@@ -254,7 +263,6 @@ function addContentWarning(key, ...keyArgs) {
 async function populatePageMetadata(data) {
     var mdFields = data.metadataBlocks.citation.fields;
     var title = "";
-    var authors = "";
     var datasetUrl = siteUrl + '/dataset.xhtml?persistentId=' + datasetPid;
     draftExists = data.latestVersionPublishingState && data.latestVersionPublishingState === "DRAFT";
 
@@ -262,22 +270,17 @@ async function populatePageMetadata(data) {
         if (mdFields[field].typeName === "title") {
             title = mdFields[field].value;
         }
-        if (mdFields[field].typeName === "author") {
-            var authorFields = mdFields[field].value;
-            for (var author in authorFields) {
-                if (authors.length > 0) {
-                    authors = authors + "; ";
-                }
-                authors = authors
-                    + authorFields[author].authorName.value;
-            }
-        }
     }
     let mdDiv = $('<div/>').append($('<h2/>').text(getLocalizedString(dvLocale, 'uploadingTo')).append($('<a/>').prop("href", datasetUrl).prop('target', '_blank').text(title)));
     $('#top').prepend(mdDiv);
 }
 
-async function retrieveDatasetInfo() {
+/**
+ * Refreshes dataset information from Dataverse
+ * @param {boolean} isInitialLoad - Whether this is the initial load or a refresh
+ */
+async function retrieveDatasetInfo(isInitialLoad = true) {
+    addMessage('info', 'msgGettingDatasetInfo');
     try {
         // First, check for dataset locks
         const locksResponse = await $.ajax({
@@ -297,6 +300,7 @@ async function retrieveDatasetInfo() {
         if (locksResponse.data && locksResponse.data.length > 0 && !isLockedInReview) {
             addMessage('error', 'msgDatasetLocked');
             disableUploadFunctionality();
+            addRefreshButton();
             return;
         }
 
@@ -313,6 +317,7 @@ async function retrieveDatasetInfo() {
             if (!permissionsResponse.data || !permissionsResponse.data.canPublishDataset) {
                 addMessage('error', 'msgDatasetLockedInReview');
                 disableUploadFunctionality();
+                addRefreshButton();
                 return;
             }
         }
@@ -329,8 +334,9 @@ async function retrieveDatasetInfo() {
         console.log(datasetResponse);
         let data = datasetResponse.data;
         console.log(data);
-
-        populatePageMetadata(data);
+        if(isInitialLoad) {
+            populatePageMetadata(data);
+        }
         if (data.files !== null) {
             existingFiles = {};
             convertedFileNameMap = {};
@@ -356,12 +362,111 @@ async function retrieveDatasetInfo() {
             }
         }
         $('#files').prop('disabled', false);
-        addMessage('info', 'msgReadyToStart');
+        if(isInitialLoad || $('#filelist>.ui-fileupload-files').length === 0) {
+            addMessage('info', 'msgReadyToStart');
+            // Add the refresh button after initial load
+            addRefreshButton();
+        }
     } catch (error) {
         console.log('Error:', error);
         addMessage('error', 'msgErrorRetrievingDataset');
+        }
+}
+
+/**
+ * Adds a refresh button to the UI
+ */
+function addRefreshButton() {
+    if ($('#refreshDataset').length === 0) {
+        $('<button/>').prop('id', 'refreshDataset')
+            .text(getLocalizedString(dvLocale, 'refreshDataset'))
+            .addClass('button secondary')
+            .click(async function() {
+                if (startUploadsHasBeenCalled) {
+                    //Shouldn't happen - button should be disabled, but let's be conservative
+                    alert("Can't refresh while upload is in progress");
+                } else {
+                    try {
+                        // Call retrieveDatasetInfo with isInitialLoad=false to indicate this is a refresh
+                        await retrieveDatasetInfo(false);
+                        // Only manipulate files if the file list exists and has items
+                        if ($('#filelist>.ui-fileupload-files').length > 0 &&
+                            $('#filelist>.ui-fileupload-files .ui-fileupload-row').length > 0) {
+                            removeCloseButton();
+
+                            deselectAllFiles();
+                            selectMaxNewFiles();
+                            // Clear progress bars from previous uploads
+                            $('.ui-fileupload-progress progress').remove();
+                            // Reset any error messages or states
+                            $('.ui-fileupload-error').remove();
+                            addUploadButton();
+                        }
+                    } catch (error) {
+                        console.error('Error refreshing dataset:', error);
+                        addMessage('error', 'msgErrorRefreshingDataset');
+                    }
+                }
+            })
+            .insertBefore($('#messages'));
+    } else {
+        $('#refreshDataset').removeClass('disabled').prop('disabled', false);
+    }
+}
+
+/**
+ * Removes the refresh button from the UI
+ */
+function removeRefreshButton() {
+    $('#refreshDataset').remove();
+}
+/**
+ * Adds a close button to the UI
+ */
+function addCloseButton() {
+    if ($('#closeWebloader').length === 0) {
+    // Add close button
+     $('<button/>').prop('id', 'closeWebloader')
+            .text(getLocalizedString(dvLocale, 'close'))
+            .addClass('button secondary')
+        .click(function() {
+            window.close();
+        })
+        .insertBefore($('#messages'));
     }
 }
+        
+/**
+ * Removes the close button from the UI
+ */
+function removeCloseButton() {
+    $('#closeWebloader').remove();
+}
+
+/**
+ * Adds an upload button to the UI
+ */
+
+function addUploadButton() {
+    if ($('#upload').length === 0 && !startUploadsHasBeenCalled) {
+        $('<button/>')
+            .prop('id', 'upload')
+            .text(getLocalizedString(dvLocale, 'startUpload'))
+            .addClass('button')
+            .click(startUploads)
+            .insertBefore($('#messages'));
+    } else {
+        $('#upload').removeClass('disabled').prop('disabled', false)
+    }
+    
+}
+
+/**
+ * Removes the upload button from the UI
+ */
+function removeUploadButton() {
+    $('#upload').remove();
+}
 
 function disableUploadFunctionality() {
     $('#files').prop('disabled', true);
@@ -787,18 +892,14 @@ function queueFileForDirectUpload(file) {
     path=path.concat(file.name.replace(/[:<>;#/"*|?\\]/g,'_'));
     
     //Now check versus existing files
-    if (path in existingFiles) {
-        send = false;
-    } else if (removeExtension(path) in convertedFileNameMap) {
+    if ((path in existingFiles) || (removeExtension(path) in convertedFileNameMap)) {
         send = false;
     }
     rawFileMap[origPath] = file;
     let i = rawFileMap.length;
     //startUploads();
     if (send) {
-        if ($('#upload').length === 0) {
-            $('<button/>').prop('id', 'upload').text(getLocalizedString(dvLocale, 'startUpload')).addClass('button').click(startUploads).appendTo($('#top'));
-        }
+        addUploadButton();
     }
     let fileBlock = $('#filelist>.ui-fileupload-files');
     if (fileBlock.length === 0) {
@@ -840,6 +941,7 @@ function selectMaxNewFiles() {
         }
     });
     toggleUpload();
+    updateFileSelectionMessage();
 }
 
 // Function to deselect all files
@@ -866,26 +968,23 @@ function toggleUpload() {
             addMessage('warn', 'msgMaxFilesExceeded');
             $('#upload').addClass('disabled').prop('disabled', true);
         } else {
-            if ($('#upload').length === 0 && !startUploadsHasBeenCalled) {
-                $('<button/>').prop('id', 'upload')
-                    .text(getLocalizedString(dvLocale, 'startUpload'))
-                    .addClass('button')
-                    .click(startUploads)
-                    .insertBefore($('#messages'));
-            } else {
-                $('#upload').removeClass('disabled').prop('disabled', false);
-            }
+            addUploadButton();
             addMessage('info', 'msgStartUpload');
         }
     } else {
-        $('#upload').addClass('disabled').prop('disabled', true);
-        addMessage('info', 'msgNoFile');
+        if($('.ui-fileupload-row').length > 0) {
+            $('#upload').addClass('disabled').prop('disabled', true);
+            addMessage('info', 'msgNoFile');
+        }
     }
 }
 
 function startUploads() {
     startUploadsHasBeenCalled = true;
-    $('#top button').remove();
+    $('#refreshDataset').addClass('disabled').prop('disabled', true);
+    $('#upload').remove();
+    // Add a message indicating uploads are in progress
+    addMessage('info', 'msgUploadsInProgress');
     let checked = $('#filelist>.ui-fileupload-files input:checked');
     checked.each(function() {
         console.log('Name ' + $(this).siblings('.ui-fileupload-filename').text());
@@ -1024,6 +1123,9 @@ async function directUploadFinished() {
                 // Add a loading indicator before making the AJAX call
                 $('#messages').append($('<div/>').attr('id', 'loading-indicator').addClass('pending')
                     .html('<div class="spinner"></div>' + formatMessage('msgRegisteringFiles')));
+                // Remove the refresh button when uploads start
+                removeRefreshButton();
+                
                 $.ajax({
                     url: siteUrl + '/api/datasets/:persistentId/addFiles?persistentId=' + datasetPid,
                     headers: { "X-Dataverse-key": apiKey },
@@ -1045,6 +1147,9 @@ async function directUploadFinished() {
                         } else {
                           addMessage('success', 'msgUploadCompleteNewDraft', datasetUrl);
                         }
+                        startUploadsHasBeenCalled = false;
+                        addCloseButton();
+                        addRefreshButton();
                     },
                     error: function(jqXHR, textStatus, errorThrown) {
                         // Remove the loading indicator
@@ -1053,6 +1158,9 @@ async function directUploadFinished() {
                         console.log('Failure: ' + jqXHR.status);
                         console.log('Failure: ' + errorThrown);
                         addMessage("error", "msgUploadToDataverseFailed", "Status: " + jqXHR.status + ", Error: " + errorThrown);
+                        startUploadsHasBeenCalled = false;
+                        addCloseButton();
+                        addRefreshButton();
                     }
                 });
                 //stop observer when we're done
diff --git a/src/js/lang.js b/src/js/lang.js
index 274eb1a..443d53b 100644
--- a/src/js/lang.js
+++ b/src/js/lang.js
@@ -7,6 +7,8 @@ const translations = {
         sponsor: ", development sponsored by UiT/DataverseNO",
         startUpload: "Start Uploads",
         uploadingTo: "Uploading to ",
+        refreshDataset: "Refresh Dataset Info",
+        close: "Close Window",
         msgGettingDatasetInfo: "Getting Dataset Information...",
         msgFilesAlreadyExist: "All files already exist in dataset. There's nothing to upload.",
         msgUploadOnlyCheckedFiles: "Some files already exist in dataset. Only checked files will be uploaded.",
@@ -35,6 +37,8 @@ const translations = {
         sponsor: ", développement sponsorisé par UiT/DataverseNO",
         startUpload: "Démarrer les envois",
         uploadingTo: "Envoi vers ",
+        refreshDataset: "Rafraîchir",
+        close: "Fermer la fenêtre",
         msgGettingDatasetInfo: "Récupération des informations du jeu de données...",
         msgFilesAlreadyExist: "Tous les fichiers existent déjà dans le jeu de données. Il n'y a rien à envoyer.",
         msgUploadOnlyCheckedFiles: "Certains fichiers existent déjà dans le jeu de données. Seuls les fichiers cochés seront envoyés.",

From d7f115e423ee771518a541096e647e368fdbb8b4 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 6 Jun 2025 17:29:01 -0400
Subject: [PATCH 3/4] flex buttons, fix close label

---
 src/css/dvwebloader.css | 18 ++++++++++++++++++
 src/dvwebloader.html    |  8 +++++++-
 src/js/fileupload2.js   | 30 ++++++++++++++++--------------
 src/js/lang.js          |  4 ++--
 4 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/css/dvwebloader.css b/src/css/dvwebloader.css
index 4e04c3a..0d9b710 100644
--- a/src/css/dvwebloader.css
+++ b/src/css/dvwebloader.css
@@ -134,4 +134,22 @@ h1 {
 @keyframes spin {
     0% { transform: rotate(0deg); }
     100% { transform: rotate(360deg); }
+}
+
+.button-flex-container {
+    display: flex;
+    justify-content: space-between;
+    margin: 10px 0;
+    min-height: 40px;
+}
+
+.button-left {
+    display: flex;
+    align-items: center;
+}
+
+.button-right {
+    display: flex;
+    align-items: center;
+    gap: 10px; /* Space between buttons */
 }
\ No newline at end of file
diff --git a/src/dvwebloader.html b/src/dvwebloader.html
index fc39f9f..536bff3 100644
--- a/src/dvwebloader.html
+++ b/src/dvwebloader.html
@@ -21,7 +21,13 @@ <h1><span id="title-text">Folder Upload</span></h1>
             <hr class='solid'>
             
             <div id="top">
-                <label for='files' class='button'><span id="select-dir-text">Select a Directory</span><input type="file" id="files" name="files[]" multiple webkitdirectory style="display: none" /></label>
+                <div id='button-container' class='button-flex-container'>
+                    <div class='button-left'>
+                        <label for='files' class='button'><span id="select-dir-text">Select a Directory</span><input type="file" id="files" name="files[]" multiple webkitdirectory style="display: none" /></label>
+                    </div>
+                    <div class='button-right'>
+                    </div>
+                </div>
                 <div id='messages'></div>
                 <div id='content-warnings'></div>
             </div>
diff --git a/src/js/fileupload2.js b/src/js/fileupload2.js
index bd094d5..6c38d8e 100644
--- a/src/js/fileupload2.js
+++ b/src/js/fileupload2.js
@@ -378,7 +378,9 @@ async function retrieveDatasetInfo(isInitialLoad = true) {
  */
 function addRefreshButton() {
     if ($('#refreshDataset').length === 0) {
-        $('<button/>').prop('id', 'refreshDataset')
+    $('#button-container .button-right').append(
+            $('<button/>')
+            .prop('id', 'refreshDataset')
             .text(getLocalizedString(dvLocale, 'refreshDataset'))
             .addClass('button secondary')
             .click(async function() {
@@ -407,8 +409,7 @@ function addRefreshButton() {
                         addMessage('error', 'msgErrorRefreshingDataset');
                     }
                 }
-            })
-            .insertBefore($('#messages'));
+            }));
     } else {
         $('#refreshDataset').removeClass('disabled').prop('disabled', false);
     }
@@ -420,19 +421,21 @@ function addRefreshButton() {
 function removeRefreshButton() {
     $('#refreshDataset').remove();
 }
+
+
 /**
  * Adds a close button to the UI
  */
 function addCloseButton() {
     if ($('#closeWebloader').length === 0) {
     // Add close button
-     $('<button/>').prop('id', 'closeWebloader')
-            .text(getLocalizedString(dvLocale, 'close'))
-            .addClass('button secondary')
+     $('#button-container .button-left').append($('<button/>')
+         .prop('id', 'closeWebloader')
+         .text(getLocalizedString(dvLocale, 'closeWindow'))
+         .addClass('button secondary')
         .click(function() {
             window.close();
-        })
-        .insertBefore($('#messages'));
+        }));
     }
 }
         
@@ -449,12 +452,11 @@ function removeCloseButton() {
 
 function addUploadButton() {
     if ($('#upload').length === 0 && !startUploadsHasBeenCalled) {
-        $('<button/>')
-            .prop('id', 'upload')
-            .text(getLocalizedString(dvLocale, 'startUpload'))
-            .addClass('button')
-            .click(startUploads)
-            .insertBefore($('#messages'));
+    $('#button-container .button-left').append($('<button/>')
+        .prop('id', 'upload')
+        .text(getLocalizedString(dvLocale, 'startUpload'))
+        .addClass('button')
+        .click(startUploads));
     } else {
         $('#upload').removeClass('disabled').prop('disabled', false)
     }
diff --git a/src/js/lang.js b/src/js/lang.js
index 443d53b..c6b3f94 100644
--- a/src/js/lang.js
+++ b/src/js/lang.js
@@ -8,7 +8,7 @@ const translations = {
         startUpload: "Start Uploads",
         uploadingTo: "Uploading to ",
         refreshDataset: "Refresh Dataset Info",
-        close: "Close Window",
+        closeWindow: "Close Window",
         msgGettingDatasetInfo: "Getting Dataset Information...",
         msgFilesAlreadyExist: "All files already exist in dataset. There's nothing to upload.",
         msgUploadOnlyCheckedFiles: "Some files already exist in dataset. Only checked files will be uploaded.",
@@ -38,7 +38,7 @@ const translations = {
         startUpload: "Démarrer les envois",
         uploadingTo: "Envoi vers ",
         refreshDataset: "Rafraîchir",
-        close: "Fermer la fenêtre",
+        closeWindow: "Fermer la fenêtre",
         msgGettingDatasetInfo: "Récupération des informations du jeu de données...",
         msgFilesAlreadyExist: "Tous les fichiers existent déjà dans le jeu de données. Il n'y a rien à envoyer.",
         msgUploadOnlyCheckedFiles: "Certains fichiers existent déjà dans le jeu de données. Seuls les fichiers cochés seront envoyés.",

From 42341453a70f5d505b9e059524d0a6f0cfc824c6 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 6 Jun 2025 17:39:08 -0400
Subject: [PATCH 4/4] reduce console logging

---
 src/js/fileupload2.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/js/fileupload2.js b/src/js/fileupload2.js
index 6c38d8e..2220d98 100644
--- a/src/js/fileupload2.js
+++ b/src/js/fileupload2.js
@@ -113,7 +113,7 @@ $(document).ready(function() {
         var files = e.target.files; // FileList
         for (let i = 0; i < files.length; ++i) {
             let f = files[i];
-            console.log('before ' + f.webkitRelativePath);
+            //console.log('before ' + f.webkitRelativePath);
             queueFileForDirectUpload(f);
             console.debug(files[i].webkitRelativePath);
             //              output.innerText  = output.innerText + files[i].webkitRelativePath+"\n";
@@ -354,7 +354,7 @@ async function retrieveDatasetInfo(isInitialLoad = true) {
                 if ('directoryLabel' in entry) {
                     filepath = entry.directoryLabel + '/' + filepath;
                 }
-                console.log("Storing: " + filepath);
+                //console.log("Storing: " + filepath);
                 existingFiles[filepath] = df.checksum;
                 if (convertedFile) {
                     convertedFileNameMap[removeExtension(filepath)] = filepath;
@@ -596,9 +596,9 @@ var fileUpload = class fileUploadClass {
             dataType: "json",
             processData: false,
             success: function(body, statusText, jqXHR) {
-                console.log(body);
+                //console.log(body);
                 let data = body.data;
-                console.log(data);
+                //console.log(data);
                 this.storageId = data.storageIdentifier;
                 delete data.storageIdentifier;
                 this.urls = data;
@@ -926,7 +926,6 @@ function queueFileForDirectUpload(file) {
     row.append(fnameElement)
         .append($('<div/>').text(file.size)).append($('<div/>').addClass('ui-fileupload-progress'))
         .append($('<div/>').addClass('ui-fileupload-cancel'));
-    console.log('adding click handler for file_' + fUpload.id);
     $('#file_' + fUpload.id).click(toggleUpload);
 }
 
@@ -1102,7 +1101,7 @@ async function directUploadFinished() {
                     //Remove bad file name chars
                     entry.fileName = fup.file.name.replace(/[:<>;#/"*|?\\]/g,'_');
                     let path = fup.file.webkitRelativePath;
-                    console.log(path);
+                    //console.log(path);
                     path = path.substring(path.indexOf('/'), path.lastIndexOf('/'));
                     //Remove bad path chars
                     path = path.replace(/[^\w\-\.\\\/ ]+/g,'_');