diff --git a/templates/base.tmpl b/templates/base.tmpl index 4aa302c..958e24e 100644 --- a/templates/base.tmpl +++ b/templates/base.tmpl @@ -1,83 +1,89 @@ {{define "base"}} {{ template "head" . }}

- {{if and (and (not .SingleUser) .Chorus) .Username}}Posts{{end}} + {{ if and .SimpleNav (not .SingleUser) }} + {{if and (and .LocalTimeline .CanViewReader) .Chorus}}Home{{end}} + {{if gt .MaxBlogs 1}}Blogs{{end}} + {{if and (and .Chorus (eq .MaxBlogs 1)) .Username}}Posts{{end}} + {{ end }} About - {{if and (and (not .SingleUser) .LocalTimeline) .CanViewReader}}Reader{{end}} - {{if and (and (and (not .SingleUser) .Chorus) .OpenRegistration) (not .Username)}}Sign up{{end}} - {{if and (not .SingleUser) (not .Username)}}Log in{{else if .SimpleNav}}Log out{{end}} + {{ if not .SingleUser }} + {{if and (and .LocalTimeline .CanViewReader) (not .Chorus)}}Reader{{end}} + {{if and (and .Chorus .OpenRegistration) (not .Username)}}Sign up{{end}} + {{if not .Username}}Log in{{else if .SimpleNav}}Log out{{end}} + {{ end }}

New Post

{{ template "footer" . }} {{if not .JSDisabled}} {{else}} {{if .WebFonts}}{{end}} {{end}} {{end}} {{define "body-attrs"}}{{end}} diff --git a/templates/user/include/header.tmpl b/templates/user/include/header.tmpl index 3557d2d..5b77bb2 100644 --- a/templates/user/include/header.tmpl +++ b/templates/user/include/header.tmpl @@ -1,99 +1,105 @@ {{define "user-navigation"}}

{{if .SimpleNav}} - {{if and (and (not .SingleUser) .Chorus) .Username}}Posts{{end}} + {{ if not .SingleUser }} + {{if and (and .LocalTimeline .CanViewReader) .Chorus}}Home{{end}} + {{if gt .MaxBlogs 1}}Blogs{{end}} + {{if and (and .Chorus (eq .MaxBlogs 1)) .Username}}Posts{{end}} + {{ end }} About - {{if and (and (not .SingleUser) .LocalTimeline) .CanViewReader}}Reader{{end}} - {{if and (and (and (not .SingleUser) .Chorus) .OpenRegistration) (not .Username)}}Sign up{{end}} + {{ if not .SingleUser }} + {{if and (and .LocalTimeline .CanViewReader) (not .Chorus)}}Reader{{end}} + {{if and (and .Chorus .OpenRegistration) (not .Username)}}Sign up{{end}} {{if .Username}}Log out{{else}}Log in{{end}} + {{ end }} {{else}} Blogs Drafts {{end}}

New Post

{{end}} {{define "header"}} {{.PageTitle}} {{if .Separator}}{{.Separator}}{{else}}—{{end}} {{.SiteName}} {{template "user-navigation" .}}