all repos — homestead @ ba0e29d9f2b9eb3db839ed32f3f4df87a9be2339

Code for my website

make menu configuration more explicit

Alan Pearce
commit

ba0e29d9f2b9eb3db839ed32f3f4df87a9be2339

parent

7daa101d37a2c25aaab8c8e7ffe82658669afb4d

3 files changed, 5 insertions(+), 4 deletions(-)

jump to
M internal/builder/builder.gointernal/builder/builder.go
@@ -71,7 +71,7 @@ postDir := "post"
siteSettings := templates.SiteSettings{ Title: config.Title, Language: config.Language, - Menu: config.Menus["main"], + Menu: config.Menu, InjectLiveReload: options.Development, }
@@ -192,7 +192,7 @@ log.Debug("rendering page", "source", post.Input, "path", post.URL)
if post.URL == "/" { if err := templates.Homepage(siteSettings, templates.HomepageVars{ Email: config.Email, - Me: config.Menus["me"], + Me: config.Menu, Posts: cc.Posts, }, post).Render(ctx, buf); err != nil { return errors.WithStack(err)
M internal/config/config.gointernal/config/config.go
@@ -48,7 +48,8 @@ CSP *CSP `toml:"content-security-policy"`
Extra struct { Headers map[string]string } - Menus map[string][]MenuItem + Menu []MenuItem + RelMe []MenuItem `toml:"rel_me"` } func GetConfig(dir string, log *log.Logger) (*Config, errors.E) {
M internal/website/website.gointernal/website/website.go
@@ -105,7 +105,7 @@ website.config = cfg
website.siteSettings = &templates.SiteSettings{ Title: cfg.Title, Language: cfg.Language, - Menu: cfg.Menus["main"], + Menu: cfg.Menu, InjectLiveReload: opts.Development, }