Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 14:50:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Web: move baselogin template to common

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2023-12-30 14:13:25 +01:00
parent 259566fcce
commit 7318d1f32a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/httpd/web.go
View File

@@ -48,6 +48,7 @@ const (
templateResetPassword = "reset-password.html" templateResetPassword = "reset-password.html"
templateCommonCSS = "sftpgo.css" templateCommonCSS = "sftpgo.css"
templateCommonBase = "base.html" templateCommonBase = "base.html"
templateCommonBaseLogin = "baselogin.html"
) )
var ( var (

13
internal/httpd/webclient.go
View File

@@ -47,7 +47,6 @@ import (
const ( const (
templateClientDir = "webclient" templateClientDir = "webclient"
templateClientBase = "base.html" templateClientBase = "base.html"
templateClientBaseLogin = "baselogin.html"
templateClientLogin = "login.html" templateClientLogin = "login.html"
templateClientFiles = "files.html" templateClientFiles = "files.html"
templateClientMessage = "message.html" templateClientMessage = "message.html"
@@ -481,7 +480,7 @@ func loadClientTemplates(templatesPath string) {
} }
loginPath := []string{ loginPath := []string{
filepath.Join(templatesPath, templateCommonDir, templateCommonBase), filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin), filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
filepath.Join(templatesPath, templateClientDir, templateClientLogin), filepath.Join(templatesPath, templateClientDir, templateClientLogin),
} }
messagePath := []string{ messagePath := []string{
@@ -496,22 +495,22 @@ func loadClientTemplates(templatesPath string) {
} }
twoFactorPath := []string{ twoFactorPath := []string{
filepath.Join(templatesPath, templateCommonDir, templateCommonBase), filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin), filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
filepath.Join(templatesPath, templateClientDir, templateClientTwoFactor), filepath.Join(templatesPath, templateClientDir, templateClientTwoFactor),
} }
twoFactorRecoveryPath := []string{ twoFactorRecoveryPath := []string{
filepath.Join(templatesPath, templateCommonDir, templateCommonBase), filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin), filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
filepath.Join(templatesPath, templateClientDir, templateClientTwoFactorRecovery), filepath.Join(templatesPath, templateClientDir, templateClientTwoFactorRecovery),
} }
forgotPwdPaths := []string{ forgotPwdPaths := []string{
filepath.Join(templatesPath, templateCommonDir, templateCommonBase), filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin), filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
filepath.Join(templatesPath, templateClientDir, templateForgotPassword), filepath.Join(templatesPath, templateClientDir, templateForgotPassword),
} }
resetPwdPaths := []string{ resetPwdPaths := []string{
filepath.Join(templatesPath, templateCommonDir, templateCommonBase), filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin), filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
filepath.Join(templatesPath, templateClientDir, templateResetPassword), filepath.Join(templatesPath, templateClientDir, templateResetPassword),
} }
viewPDFPaths := []string{ viewPDFPaths := []string{
@@ -520,7 +519,7 @@ func loadClientTemplates(templatesPath string) {
} }
shareLoginPath := []string{ shareLoginPath := []string{
filepath.Join(templatesPath, templateCommonDir, templateCommonBase), filepath.Join(templatesPath, templateCommonDir, templateCommonBase),
filepath.Join(templatesPath, templateClientDir, templateClientBaseLogin), filepath.Join(templatesPath, templateCommonDir, templateBaseLogin),
filepath.Join(templatesPath, templateClientDir, templateShareLogin), filepath.Join(templatesPath, templateClientDir, templateShareLogin),
} }
shareUploadPath := []string{ shareUploadPath := []string{

0
templates/webclient/baselogin.html → templates/common/baselogin.html
View File