From f3446b2472fbbfe9633c1f0c29d5386d4343be06 Mon Sep 17 00:00:00 2001 From: Herman Karlsson Date: Thu, 25 Jan 2024 20:52:38 +0100 Subject: [PATCH] add support for default expanded tag --- pages/pages.go | 26 +++++++++++++++++--------- taitan.go | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pages/pages.go b/pages/pages.go index c0b9b88..f29ffbb 100644 --- a/pages/pages.go +++ b/pages/pages.go @@ -24,6 +24,7 @@ type Resp struct { Body string `json:"body"` // Main content of the page. Sidebar string `json:"sidebar"` // The sidebar of the page. Sort *int `json:"sort"` // The order that the tab should appear in on the page + Expanded bool `json:"expanded"` // Should the Nav-tree rooted in this node always be expanded one step when loaded? Anchors []anchor.Anchor `json:"anchors"` // The list of anchors to headers in the body. Nav []*Node `json:"nav,omitempty"` } @@ -41,10 +42,11 @@ type Node struct { // Meta defines the attributes to be loaded from the meta.toml file type Meta struct { - Image string - Title string - Message string - Sort *int + Image string + Title string + Message string + Sort *int + Expanded bool } // NewNode creates a new node with it's path, slug and page title. @@ -82,18 +84,22 @@ func (n *Node) AddNode(root []string, p string, title string, paths []string, ac n.Sort = sort return } + // Parent folder. parent := paths[0] // Have we already created the parent? if n.hasNode(parent) { if len(root) == 0 { + if n.getNode(parent).Expanded { + n.getNode(parent).AddNode(root, p, title, paths[1:], false, expanded, sort) + } return } - if root[0] == parent { - n.getNode(parent).AddNode(root[1:], p, title, paths[1:], false, false, sort) + if root[0] == parent || n.getNode(parent).Expanded { + n.getNode(parent).AddNode(root[1:], p, title, paths[1:], false, expanded, sort) } else if len(paths) == 1 { - n.getNode(parent).AddNode(root, p, title, []string{}, false, false, sort) + n.getNode(parent).AddNode(root, p, title, []string{}, false, expanded, sort) } return } @@ -105,7 +111,7 @@ func (n *Node) AddNode(root []string, p string, title string, paths []string, ac title, paths[1:], len(root) == 1 && root[0] == parent, - len(root) > 1 && root[0] == parent, + expanded || (len(root) > 1 && root[0] == parent), sort, ) } @@ -221,7 +227,8 @@ func parseDir(root, dir string) (*Resp, error) { // Parse meta data from a toml file. var meta = Meta{ - Sort: nil, // all pages without a sort-tag should be after the pages with a sort-tag, but should keep their internal order + Sort: nil, // all pages without a sort-tag should be after the pages with a sort-tag, but should keep their internal order + Expanded: false, } if _, err := toml.DecodeFile(metaPath, &meta); err != nil { return nil, err @@ -237,6 +244,7 @@ func parseDir(root, dir string) (*Resp, error) { Body: body, Sidebar: sidebar, Anchors: anchs, + Expanded: meta.Expanded, Sort: meta.Sort, }, nil } diff --git a/taitan.go b/taitan.go index 77f7910..2f2a343 100644 --- a/taitan.go +++ b/taitan.go @@ -290,7 +290,7 @@ func handler(res http.ResponseWriter, req *http.Request) { responses.Resps[slug].Title, strings.FieldsFunc(slug, func(c rune) bool { return c == '/' }), false, - false, + responses.Resps[slug].Expanded, responses.Resps[slug].Sort, ) // }