diff --git a/appview/pages/pages.go b/appview/pages/pages.go index c1fef41d..eab31eeb 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -37,7 +37,7 @@ func NewPages() *Pages { if !strings.HasPrefix(path, "templates/layouts/") { // Add the page template on top of the base - tmpl, err := template.New(name).ParseFS(files, path, "templates/layouts/*.html") + tmpl, err := template.New(name).ParseFS(files, "templates/layouts/*.html", path) if err != nil { return fmt.Errorf("setting up template: %w", err) } @@ -68,12 +68,16 @@ func (p *Pages) execute(name string, w io.Writer, params any) error { return p.t[name].ExecuteTemplate(w, "layouts/base", params) } +func (p *Pages) executePlain(name string, w io.Writer, params any) error { + return p.t[name].Execute(w, params) +} + func (p *Pages) executeRepo(name string, w io.Writer, params any) error { return p.t[name].ExecuteTemplate(w, "layouts/repoBase", params) } func (p *Pages) Login(w io.Writer, params LoginParams) error { - return p.execute("user/login", w, params) + return p.executePlain("user/login", w, params) } type TimelineParams struct { diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html index c5405a83..b6703b32 100644 --- a/appview/pages/templates/layouts/base.html +++ b/appview/pages/templates/layouts/base.html @@ -9,7 +9,7 @@ integrity="sha384-HGfztofotfshcF7+8n44JQL2oJmowVChPTg48S+jvZoztPfvwD79OC/LTtG6dMp+" crossorigin="anonymous" > - {{block "title" .}}{{end}} + {{block "title" .}}tangled{{end}}
diff --git a/appview/pages/templates/layouts/topbar.html b/appview/pages/templates/layouts/topbar.html index eb6d2c3a..1d1771bb 100644 --- a/appview/pages/templates/layouts/topbar.html +++ b/appview/pages/templates/layouts/topbar.html @@ -2,6 +2,7 @@ {{ with .LoggedInUser }}