From 3b2f709aebead1a232c11322b364ed8f920a5661 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Thu, 3 Oct 2024 18:53:57 +0200 Subject: [PATCH] WebClient: improve readability of upload progress Fixes #1773 Signed-off-by: Nicola Murino --- static/locales/en/translation.json | 8 ++--- static/locales/it/translation.json | 8 ++--- templates/common/base.html | 13 +++++++- templates/webadmin/admins.html | 4 +-- templates/webadmin/configs.html | 4 +-- templates/webadmin/connections.html | 2 +- templates/webadmin/defender.html | 2 +- templates/webadmin/eventactions.html | 2 +- templates/webadmin/eventrules.html | 4 +-- templates/webadmin/folders.html | 2 +- templates/webadmin/groups.html | 2 +- templates/webadmin/iplists.html | 2 +- templates/webadmin/roles.html | 2 +- templates/webadmin/users.html | 6 ++-- templates/webclient/files.html | 46 +++++++++++++--------------- templates/webclient/shares.html | 2 +- templates/webclient/shareupload.html | 13 ++++---- 17 files changed, 64 insertions(+), 58 deletions(-) diff --git a/static/locales/en/translation.json b/static/locales/en/translation.json index e61dd372..6db16b35 100644 --- a/static/locales/en/translation.json +++ b/static/locales/en/translation.json @@ -291,10 +291,10 @@ "no_files_folders": "No files or folders", "invalid_name": "File or folder names cannot contain \"/\"", "folder_name_required": "Folder name is required", - "deleting": "Delete {{idx}}/{{total}}: {{- name}}", - "copying": "Copy {{idx}}/{{total}}: {{- name}}", - "moving": "Move {{idx}}/{{total}}: {{- name}}", - "uploading": "Upload {{idx}}/{{total}}: {{- name}}", + "deleting": "Delete {{idx}}/{{total}}", + "copying": "Copy {{idx}}/{{total}}", + "moving": "Move {{idx}}/{{total}}", + "uploading": "Upload {{idx}}/{{total}}", "err_403": "Permission denied", "err_429": "Too many concurrent requests", "err_generic": "Unable to access the requested resource", diff --git a/static/locales/it/translation.json b/static/locales/it/translation.json index 08e711aa..de5df0d6 100644 --- a/static/locales/it/translation.json +++ b/static/locales/it/translation.json @@ -291,10 +291,10 @@ "no_files_folders": "Nessun file o cartella", "invalid_name": "I nomi di file o cartelle non possono contenere \"/\"", "folder_name_required": "Il nome della cartella รจ obbligatorio", - "deleting": "Eliminazione {{idx}}/{{total}}: {{- name}}", - "copying": "Copia {{idx}}/{{total}}: {{- name}}", - "moving": "Spostamento {{idx}}/{{total}}: {{- name}}", - "uploading": "Caricamento {{idx}}/{{total}}: {{- name}}", + "deleting": "Eliminazione {{idx}}/{{total}}", + "copying": "Copia {{idx}}/{{total}}", + "moving": "Spostamento {{idx}}/{{total}}", + "uploading": "Caricamento {{idx}}/{{total}}", "err_403": "Non si dispone delle autorizzazioni richieste", "err_429": "Troppe richieste contemporanee", "err_generic": "Impossibile accedere alla risorsa richiesta", diff --git a/templates/common/base.html b/templates/common/base.html index b6f2459f..580b7f8a 100644 --- a/templates/common/base.html +++ b/templates/common/base.html @@ -311,6 +311,16 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). } } + function clearLoading() { + $('#loading_info').text(""); + $('#loading_message').text(""); + } + + function setLoadingText(info, message) { + $('#loading_info').text(info); + $('#loading_message').text(message); + } + KTUtil.onDOMContentLoaded(function () { var dismissErrorBtn = $('#id_dismiss_error_msg'); if (dismissErrorBtn.length){ @@ -911,7 +921,8 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
- + +