refactor: convert force_password_change to standalone layout (no sidebar)

This commit is contained in:
2026-04-05 19:03:32 +02:00
parent 5bd77de32d
commit ea3e7e71ca
2 changed files with 129 additions and 61 deletions
+15 -5
View File
@@ -306,7 +306,6 @@ func (h *Handler) loadTemplates(templateFS embed.FS) {
"admin_settings", "system_info",
"cron", "cron_add", "cron_edit",
"assignments", "assignments_add", "assignments_edit",
"force_password_change",
}
for _, page := range pages {
pageContent, err := fs.ReadFile(templateFS, "templates/"+page+".html")
@@ -335,6 +334,17 @@ func (h *Handler) loadTemplates(templateFS embed.FS) {
}
h.templates["login"] = loginTmpl
// Force password change page has its own layout (standalone, no sidebar)
fpcContent, err := fs.ReadFile(templateFS, "templates/force_password_change.html")
if err != nil {
logging.Fatal("Failed to read force_password_change template: %v", err)
}
fpcTmpl, err := template.New("force_password_change").Funcs(funcMap).Parse(string(fpcContent))
if err != nil {
logging.Fatal("Failed to parse force_password_change: %v", err)
}
h.templates["force_password_change"] = fpcTmpl
// MFA required page has its own layout (standalone, no sidebar)
mfaReqContent, err := fs.ReadFile(templateFS, "templates/mfa_required.html")
if err != nil {
@@ -2225,7 +2235,7 @@ func (h *Handler) handleForcePasswordChange(w http.ResponseWriter, r *http.Reque
User: user,
PasswordPolicy: &policy,
}
h.templates["force_password_change"].ExecuteTemplate(w, "base", data)
h.templates["force_password_change"].Execute(w, data)
return
}
@@ -2239,7 +2249,7 @@ func (h *Handler) handleForcePasswordChange(w http.ResponseWriter, r *http.Reque
PasswordPolicy: &policy,
Flash: &Flash{Type: "danger", Message: "Passwords do not match."},
}
h.templates["force_password_change"].ExecuteTemplate(w, "base", data)
h.templates["force_password_change"].Execute(w, data)
return
}
@@ -2250,7 +2260,7 @@ func (h *Handler) handleForcePasswordChange(w http.ResponseWriter, r *http.Reque
PasswordPolicy: &policy,
Flash: &Flash{Type: "danger", Message: err.Error()},
}
h.templates["force_password_change"].ExecuteTemplate(w, "base", data)
h.templates["force_password_change"].Execute(w, data)
return
}
@@ -2261,7 +2271,7 @@ func (h *Handler) handleForcePasswordChange(w http.ResponseWriter, r *http.Reque
PasswordPolicy: &policy,
Flash: &Flash{Type: "danger", Message: "Failed to change password: " + err.Error()},
}
h.templates["force_password_change"].ExecuteTemplate(w, "base", data)
h.templates["force_password_change"].Execute(w, data)
return
}