WebUI add title to all pages

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino 2023-11-25 18:11:10 +01:00
parent 6175acb572
commit ed828458ab
No known key found for this signature in database
GPG key ID: 935D2952DEC4EECF
11 changed files with 37 additions and 30 deletions

View file

@ -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
}

View file

@ -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,

View file

@ -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,

View file

@ -24,7 +24,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
<meta name="description" content="">
<meta name="author" content="">
<title>{{.Branding.Name}} - Forgot password</title>
<title>{{.Branding.Name}} - {{.Title}}</title>
<link rel="shortcut icon" href="{{.StaticURL}}{{.Branding.FaviconPath}}" />

View file

@ -24,7 +24,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
<meta name="description" content="">
<meta name="author" content="">
<title>{{.Branding.Name}} - Reset password</title>
<title>{{.Branding.Name}} - {{.Title}}</title>
<link rel="shortcut icon" href="{{.StaticURL}}{{.Branding.FaviconPath}}" />

View file

@ -15,7 +15,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
{{template "baselogin" .}}
{{define "title"}}Two-Factor recovery{{end}}
{{define "title"}}{{.Title}}{{end}}
{{define "content"}}
<div class="text-center">

View file

@ -15,7 +15,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
{{template "baselogin" .}}
{{define "title"}}Two-Factor authentication{{end}}
{{define "title"}}{{.Title}}{{end}}
{{define "content"}}
<div class="text-center">

View file

@ -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"}}
<form class="form w-100" id="sign_in_form" action="{{.CurrentURL}}" method="POST">

View file

@ -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"}}
<form class="form w-100" id="sign_in_form" action="{{.CurrentURL}}" method="POST">

View file

@ -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"}}
<form class="form w-100" id="sign_in_form" action="{{.CurrentURL}}" method="POST">

View file

@ -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"}}
<form class="form w-100" id="sign_in_form" action="{{.CurrentURL}}" method="POST">