fix: roll back launcher template to simple version, no translations in templates
This commit is contained in:
parent
f6a18dd8e2
commit
207f7532be
1 changed files with 5 additions and 17 deletions
22
main.go
22
main.go
|
|
@ -190,21 +190,12 @@ func healthHandler(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc {
|
||||
funcMap := template.FuncMap{"t": func(key string, args ...string) string {
|
||||
lang := "en"
|
||||
settings, _ := loadSettings(os.Getenv("CONFIG_DIR"))
|
||||
if settings != nil && settings.Company.Language != "" {
|
||||
lang = settings.Company.Language
|
||||
}
|
||||
return T(lang, key, args...)
|
||||
}}
|
||||
tmpl := template.Must(template.New("launcher").Funcs(funcMap).Parse(launcherHTML))
|
||||
tmpl := template.Must(template.New("launcher").Parse(launcherHTML))
|
||||
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
user := r.Header.Get("Remote-User")
|
||||
groupsHeader := r.Header.Get("Remote-Groups")
|
||||
userGroups := strings.Split(groupsHeader, ",")
|
||||
lang := getUserLang(r)
|
||||
settings, _ := loadSettings(os.Getenv("CONFIG_DIR"))
|
||||
|
||||
var allowedApps []AppEntry
|
||||
|
|
@ -220,7 +211,6 @@ func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc {
|
|||
User string
|
||||
IsAdmin bool
|
||||
Apps []AppEntry
|
||||
Lang string
|
||||
CompanyLogo string
|
||||
Subtitle string
|
||||
}{
|
||||
|
|
@ -229,7 +219,6 @@ func launcherHandler(cfg *Config, apps []AppEntry) http.HandlerFunc {
|
|||
User: user,
|
||||
IsAdmin: strings.Contains(groupsHeader, "admins"),
|
||||
Apps: allowedApps,
|
||||
Lang: lang,
|
||||
CompanyLogo: settings.Company.Logo,
|
||||
Subtitle: settings.Company.Subtitle,
|
||||
}
|
||||
|
|
@ -595,7 +584,7 @@ const landingPageHTML = `<!DOCTYPE html>
|
|||
</html>`
|
||||
|
||||
const launcherHTML = `<!DOCTYPE html>
|
||||
<html lang="{{.Lang}}">
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
|
@ -630,10 +619,9 @@ const launcherHTML = `<!DOCTYPE html>
|
|||
{{if .Subtitle}}<p>{{.Subtitle}}</p>{{end}}
|
||||
</header>
|
||||
<div class="user-banner">
|
||||
<span>{{t "welcome" "user" .User}}</span>
|
||||
{{if .IsAdmin}}<a href="/config">{{t "admin_panel"}}</a>{{end}}
|
||||
<a href="/settings">{{t "settings"}}</a>
|
||||
<a href="https://auth.nextwks.eu/logout">{{t "logout"}}</a>
|
||||
<span>Welcome, {{.User}}</span>
|
||||
<a href="/settings">Settings</a>
|
||||
<a href="https://auth.nextwks.eu/logout">Logout</a>
|
||||
</div>
|
||||
<div class="grid">
|
||||
{{range .Apps}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue