diff --git a/internal/httpd/web.go b/internal/httpd/web.go index e64f8670..ccb99b22 100644 --- a/internal/httpd/web.go +++ b/internal/httpd/web.go @@ -19,24 +19,26 @@ import ( ) const ( - pageMFATitle = "Two-factor authentication" - page400Title = "Bad request" - page403Title = "Forbidden" - page404Title = "Not found" - page404Body = "The page you are looking for does not exist." - page500Title = "Internal Server Error" - page500Body = "The server is unable to fulfill your request." - webDateTimeFormat = "2006-01-02 15:04:05" // YYYY-MM-DD HH:MM:SS - redactedSecret = "[**redacted**]" - csrfFormToken = "_form_token" - csrfHeaderToken = "X-CSRF-TOKEN" - templateCommonDir = "common" - templateTwoFactor = "twofactor.html" - templateTwoFactorRecovery = "twofactor-recovery.html" - templateForgotPassword = "forgot-password.html" - templateResetPassword = "reset-password.html" - templateCommonCSS = "sftpgo.css" - templateCommonBase = "base.html" + pageMFATitle = "Two-factor authentication" + page400Title = "Bad request" + page403Title = "Forbidden" + page404Title = "Not found" + page404Body = "The page you are looking for does not exist." + page500Title = "Internal Server Error" + page500Body = "The server is unable to fulfill your request." + pageTwoFactorTitle = "Two-Factor authentication" + pageTwoFactorRecoveryTitle = "Two-Factor recovery" + webDateTimeFormat = "2006-01-02 15:04:05" // YYYY-MM-DD HH:MM:SS + redactedSecret = "[**redacted**]" + csrfFormToken = "_form_token" + csrfHeaderToken = "X-CSRF-TOKEN" + templateCommonDir = "common" + templateTwoFactor = "twofactor.html" + templateTwoFactorRecovery = "twofactor-recovery.html" + templateForgotPassword = "forgot-password.html" + templateResetPassword = "reset-password.html" + templateCommonCSS = "sftpgo.css" + templateCommonBase = "base.html" ) type loginPage struct { @@ -62,6 +64,7 @@ type twoFactorPage struct { CSPNonce string StaticURL string RecoveryURL string + Title string Branding UIBranding } diff --git a/internal/httpd/webadmin.go b/internal/httpd/webadmin.go index 8dc6353f..971fdddc 100644 --- a/internal/httpd/webadmin.go +++ b/internal/httpd/webadmin.go @@ -120,8 +120,8 @@ const ( pageIPListsTitle = "IP Lists" pageEventsTitle = "Logs" pageConfigsTitle = "Configurations" - pageForgotPwdTitle = "SFTPGo Admin - Forgot password" - pageResetPwdTitle = "SFTPGo Admin - Reset password" + pageForgotPwdTitle = "Forgot password" + pageResetPwdTitle = "Reset password" pageSetupTitle = "Create first admin user" defaultQueryLimit = 1000 inversePatternType = "inverse" @@ -828,6 +828,7 @@ func (s *httpdServer) renderResetPwdPage(w http.ResponseWriter, r *http.Request, func (s *httpdServer) renderTwoFactorPage(w http.ResponseWriter, r *http.Request, error, ip string) { data := twoFactorPage{ + Title: pageTwoFactorTitle, CurrentURL: webAdminTwoFactorPath, Version: version.Get().Version, Error: error, @@ -842,6 +843,7 @@ func (s *httpdServer) renderTwoFactorPage(w http.ResponseWriter, r *http.Request func (s *httpdServer) renderTwoFactorRecoveryPage(w http.ResponseWriter, r *http.Request, error, ip string) { data := twoFactorPage{ + Title: pageTwoFactorRecoveryTitle, CurrentURL: webAdminTwoFactorRecoveryPath, Version: version.Get().Version, Error: error, diff --git a/internal/httpd/webclient.go b/internal/httpd/webclient.go index 53c94c9a..dd02be5e 100644 --- a/internal/httpd/webclient.go +++ b/internal/httpd/webclient.go @@ -71,8 +71,8 @@ const ( pageClientChangePwdTitle = "Change password" pageClient2FATitle = "Two-factor auth" pageClientEditFileTitle = "Edit file" - pageClientForgotPwdTitle = "SFTPGo WebClient - Forgot password" - pageClientResetPwdTitle = "SFTPGo WebClient - Reset password" + pageClientForgotPwdTitle = "Forgot password" + pageClientResetPwdTitle = "Reset password" pageExtShareTitle = "Shared files" pageUploadToShareTitle = "Upload to share" pageDownloadFromShareTitle = "Download shared file" @@ -665,6 +665,7 @@ func (s *httpdServer) renderClientNotFoundPage(w http.ResponseWriter, r *http.Re func (s *httpdServer) renderClientTwoFactorPage(w http.ResponseWriter, r *http.Request, error, ip string) { data := twoFactorPage{ + Title: pageTwoFactorTitle, CurrentURL: webClientTwoFactorPath, Version: version.Get().Version, Error: error, @@ -682,6 +683,7 @@ func (s *httpdServer) renderClientTwoFactorPage(w http.ResponseWriter, r *http.R func (s *httpdServer) renderClientTwoFactorRecoveryPage(w http.ResponseWriter, r *http.Request, error, ip string) { data := twoFactorPage{ + Title: pageTwoFactorRecoveryTitle, CurrentURL: webClientTwoFactorRecoveryPath, Version: version.Get().Version, Error: error, diff --git a/templates/common/forgot-password.html b/templates/common/forgot-password.html index e7e3fe81..e9401d34 100644 --- a/templates/common/forgot-password.html +++ b/templates/common/forgot-password.html @@ -24,7 +24,7 @@ along with this program. If not, see . - {{.Branding.Name}} - Forgot password + {{.Branding.Name}} - {{.Title}} diff --git a/templates/common/reset-password.html b/templates/common/reset-password.html index 121dc9e1..ee0b32f5 100644 --- a/templates/common/reset-password.html +++ b/templates/common/reset-password.html @@ -24,7 +24,7 @@ along with this program. If not, see . - {{.Branding.Name}} - Reset password + {{.Branding.Name}} - {{.Title}} diff --git a/templates/webadmin/twofactor-recovery.html b/templates/webadmin/twofactor-recovery.html index 6ec7a4d9..9142acb8 100644 --- a/templates/webadmin/twofactor-recovery.html +++ b/templates/webadmin/twofactor-recovery.html @@ -15,7 +15,7 @@ along with this program. If not, see . --> {{template "baselogin" .}} -{{define "title"}}Two-Factor recovery{{end}} +{{define "title"}}{{.Title}}{{end}} {{define "content"}}
diff --git a/templates/webadmin/twofactor.html b/templates/webadmin/twofactor.html index 2c03f7ea..fbaaed61 100644 --- a/templates/webadmin/twofactor.html +++ b/templates/webadmin/twofactor.html @@ -15,7 +15,7 @@ along with this program. If not, see . --> {{template "baselogin" .}} -{{define "title"}}Two-Factor authentication{{end}} +{{define "title"}}{{.Title}}{{end}} {{define "content"}}
diff --git a/templates/webclient/forgot-password.html b/templates/webclient/forgot-password.html index 6a3cecf1..4e237233 100644 --- a/templates/webclient/forgot-password.html +++ b/templates/webclient/forgot-password.html @@ -15,7 +15,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). --> {{- template "baselogin" .}} -{{- define "title"}}Forgot password{{- end}} +{{- define "title"}}{{.Title}}{{- end}} {{- define "content"}}
diff --git a/templates/webclient/reset-password.html b/templates/webclient/reset-password.html index 940439b2..7147cd8f 100644 --- a/templates/webclient/reset-password.html +++ b/templates/webclient/reset-password.html @@ -15,7 +15,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). --> {{- template "baselogin" .}} -{{- define "title"}}Reset password{{- end}} +{{- define "title"}}{{.Title}}{{- end}} {{- define "content"}} diff --git a/templates/webclient/twofactor-recovery.html b/templates/webclient/twofactor-recovery.html index a3c7bbaf..09025e48 100644 --- a/templates/webclient/twofactor-recovery.html +++ b/templates/webclient/twofactor-recovery.html @@ -15,7 +15,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). --> {{- template "baselogin" .}} -{{- define "title"}}Two-Factor recovery{{- end}} +{{- define "title"}}{{.Title}}{{- end}} {{- define "content"}} diff --git a/templates/webclient/twofactor.html b/templates/webclient/twofactor.html index f978ecc8..fdbdc9f4 100644 --- a/templates/webclient/twofactor.html +++ b/templates/webclient/twofactor.html @@ -15,7 +15,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). --> {{- template "baselogin" .}} -{{- define "title"}}Two-Factor authentication{{- end}} +{{- define "title"}}{{.Title}}{{- end}} {{- define "content"}}