diff --git a/pkgs/build.sh b/pkgs/build.sh index ef1e4291..a8bb2b5f 100755 --- a/pkgs/build.sh +++ b/pkgs/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -NFPM_VERSION=2.35.0 +NFPM_VERSION=2.35.1 NFPM_ARCH=${NFPM_ARCH:-amd64} if [ -z ${SFTPGO_VERSION} ] then diff --git a/static/locales/en/translation.json b/static/locales/en/translation.json index 88e4bb49..e872e7a0 100644 --- a/static/locales/en/translation.json +++ b/static/locales/en/translation.json @@ -78,7 +78,6 @@ "invalid_token": "Invalid permissions", "confirm_logout": "Are you sure you want to sign out?", "wait": "Please wait...", - "or": "or", "ok": "OK", "none": "None", "cancel": "No, back", @@ -224,6 +223,7 @@ "text": "Upload Files", "success": "Files uploaded successfully", "message": "Drop files here or click to upload.", + "message_empty": "This directory is empty. $t(fs.upload.message)", "err_generic": "Error uploading files", "err_403": "$t(fs.upload.err_generic). $t(fs.err_403)", "err_429": "$t(fs.upload.err_generic). $t(fs.err_429)" @@ -287,7 +287,7 @@ "save_err": "Failed to save configuration", "auth_code_required": "The authentication code is required", "no_protocol": "Please select at least a protocol", - "required_protocols": "The security policy configured for your account requires two-factor authentication for the following protocols: {{val}}", + "required_protocols": "Unable to disable two-factor authentication. The security policy configured for your account requires two-factor authentication for the following protocols: {{val}}", "recovery_codes_generate": "Generate new recovery codes", "recovery_codes_view": "View recovery codes" }, diff --git a/static/locales/it/translation.json b/static/locales/it/translation.json index 0fa72259..629d6859 100644 --- a/static/locales/it/translation.json +++ b/static/locales/it/translation.json @@ -78,7 +78,6 @@ "invalid_token": "Permessi non validi", "confirm_logout": "Sei sicuro di volerti disconnettere?", "wait": "Attendere prego...", - "or": "o", "ok": "OK", "none": "Nessuna", "cancel": "No, indietro", @@ -224,6 +223,7 @@ "text": "Carica file", "success": "File caricati correttamente", "message": "Rilascia i file qui o fai clic per caricarli.", + "message_empty": "Questa cartella è vuota. $t(fs.upload.message)", "err_generic": "Errore caricamento file", "err_403": "$t(fs.upload.err_generic). $t(fs.err_403)", "err_429": "$t(fs.upload.err_generic). $t(fs.err_429)" @@ -287,7 +287,7 @@ "save_err": "Impossibile salvare la configurazione", "auth_code_required": "Il codice di autenticazione è obbligatorio", "no_protocol": "Seleziona almeno un protocollo", - "required_protocols": "La politica di sicurezza configurata per il tuo account richiede l'autenticazione a due fattori per i seguenti protocolli: {{val}}", + "required_protocols": "Impossibile disabilitare l'autenticazione a due fattori. La politica di sicurezza configurata per il tuo account richiede l'autenticazione a due fattori per i seguenti protocolli: {{val}}", "recovery_codes_generate": "Genera nuovi codici di ripristino", "recovery_codes_view": "Visualizza codici di ripristino" }, diff --git a/templates/webclient/files.html b/templates/webclient/files.html index 7ac4bce5..3324a8a2 100644 --- a/templates/webclient/files.html +++ b/templates/webclient/files.html @@ -145,24 +145,47 @@ explicit grant from the SFTPGo Team (support@sftpgo.com).
- - - - - - - - - - - - - -
-
- +
+
+
+
+
+ + + + +
+

+ +
-
NameSizeLast Modified
+ + + +
+ +
+ +
+ + + + + + + + + + + + + +
+
+ +
+ 		NameSizeLast Modified
+
@@ -720,6 +743,15 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). //table = dt.$; dt.on('draw', function () { + //{{- if .CanAddFiles}} + if (dt.rows().count() === 0) { + $('#file_manager_list_container').addClass("d-none"); + $('#upload_files_empty_container').removeClass("d-none"); + return; + } + $('#upload_files_empty_container').addClass("d-none"); + $('#file_manager_list_container').removeClass("d-none"); + //{{- end}} lightbox.reload(); KTMenu.createInstances(); @@ -1690,6 +1722,27 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). file.previewElement.querySelector(".dz-progress").style.display = 'none'; }); + var dropzoneEmpty = new Dropzone("#upload_files_empty", { + url: "{{.FilesURL}}?path={{.CurrentDir}}", + paramName: "filenames", + maxFiles: 250, + maxFilesize: null, + autoQueue: false, + addRemoveLinks: true, + autoProcessQueue: false, + filesizeBase: 1000, + init: function() { + var dropzoneEmpty = this; + $("#upload_files_empty_button").click(function(){ + uploadFiles(dropzoneEmpty.getAcceptedFiles()); + }); + } + }); + + dropzoneEmpty.on("addedfile", file => { + file.previewElement.querySelector(".dz-progress").style.display = 'none'; + }); + $('#modal_video_player').on('hide.bs.modal', function () { $("#video_player").get(0).pause(); if (playerKeepAlive != null) { diff --git a/templates/webclient/login.html b/templates/webclient/login.html index 02448e06..b0272448 100644 --- a/templates/webclient/login.html +++ b/templates/webclient/login.html @@ -70,10 +70,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). {{- end}} {{- if .OpenIDLoginURL}} - {{- if not .FormDisabled}} -
or
- {{- end}} - + Logo Sign in with OpenID