diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-06-24 03:51:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 15:51:43 -0400 |
| commit | 62ab55baccfcd11d1f8b5449c1620354b8a7640e (patch) | |
| tree | de585fe6fa6a6f47d8fe143bc14213763a54dd26 /routers/web/repo/wiki.go | |
| parent | 3c7f5ed7b5bff347198cbb26492e6354ea42733b (diff) | |
| download | gitea-62ab55baccfcd11d1f8b5449c1620354b8a7640e.tar.gz gitea-62ab55baccfcd11d1f8b5449c1620354b8a7640e.zip | |
Improve wiki sidebar and TOC (#25460)
Close #20976
Close #20975
1. Fix the bug: the TOC in footer was incorrectly rendered as main
content's TOC
2. Fix the layout: on mobile, the TOC is put above the main content,
while the sidebar is put below the main content
3. Auto collapse the TOC on mobile
ps: many styles of "wiki.css" are moved from old css files, so leave
nits to following PRs.
Diffstat (limited to 'routers/web/repo/wiki.go')
| -rw-r--r-- | routers/web/repo/wiki.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go index 115418887d..22cfe6dd25 100644 --- a/routers/web/repo/wiki.go +++ b/routers/web/repo/wiki.go @@ -273,6 +273,16 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { return nil, nil } + if rctx.SidebarTocNode != nil { + sb := &strings.Builder{} + err = markdown.SpecializedMarkdown().Renderer().Render(sb, nil, rctx.SidebarTocNode) + if err != nil { + log.Error("Failed to render wiki sidebar TOC: %v", err) + } else { + ctx.Data["sidebarTocContent"] = sb.String() + } + } + if !isSideBar { buf.Reset() ctx.Data["sidebarEscapeStatus"], ctx.Data["sidebarContent"], err = renderFn(sidebarContent) @@ -303,16 +313,6 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { ctx.Data["footerPresent"] = false } - if rctx.SidebarTocNode != nil { - sb := &strings.Builder{} - err = markdown.SpecializedMarkdown().Renderer().Render(sb, nil, rctx.SidebarTocNode) - if err != nil { - log.Error("Failed to render wiki sidebar TOC: %v", err) - } else { - ctx.Data["sidebarTocContent"] = sb.String() - } - } - // get commit count - wiki revisions commitsCount, _ := wikiRepo.FileCommitsCount(wiki_service.DefaultBranch, pageFilename) ctx.Data["CommitCount"] = commitsCount |