fix link generation in repos under categoies
6 files changed, 28 insertions(+), 28 deletions(-)
M templates/commit.go → templates/commit.go
@@ -25,14 +25,14 @@ CommitInfo(diff.Commit.Author), ), Div( Strong(g.Text("commit")), - P(A(Href(fmt.Sprintf("/%s/commit/%s", data.Repo.Name, diff.Commit.This)), + P(A(Href(fmt.Sprintf("/%s/commit/%s", data.Repo.Slug, diff.Commit.This)), Class("commit-hash"), g.Text(diff.Commit.This))), ), g.If(diff.Commit.Parent != "", Div( Strong(g.Text("parent")), - P(A(Href(fmt.Sprintf("/%s/commit/%s", data.Repo.Name, diff.Commit.Parent)), + P(A(Href(fmt.Sprintf("/%s/commit/%s", data.Repo.Slug, diff.Commit.Parent)), Class("commit-hash"), g.Text(diff.Commit.Parent))), ),@@ -49,7 +49,7 @@ Ul(g.Map(diff.Diff, func(d git.Diff) g.Node { return Li( A( Href( - fmt.Sprintf("/%s/commit/%s/%s", data.Repo.Name, diff.Commit.This, d.Name.New), + fmt.Sprintf("/%s/commit/%s/%s", data.Repo.Slug, diff.Commit.This, d.Name.New), ), g.Text(d.Name.New), ),@@ -74,7 +74,7 @@ g.If(d.Name.Old != "", g.Group{ A( Href( - fmt.Sprintf("/%s/blob/%s/%s", data.Repo.Name, diff.Commit.Parent, d.Name.Old), + fmt.Sprintf("/%s/blob/%s/%s", data.Repo.Slug, diff.Commit.Parent, d.Name.Old), ), g.Text(d.Name.Old), ),@@ -85,7 +85,7 @@ A( Href( fmt.Sprintf( "/%s/blob/%s/%s", - data.Repo.Name, + data.Repo.Slug, diff.Commit.This, d.Name.New, ),@@ -95,7 +95,7 @@ ), }, ), }, - A(Href(fmt.Sprintf("/%s/blob/%s/%s", data.Repo.Name, diff.Commit.This, d.Name.New)), + A(Href(fmt.Sprintf("/%s/blob/%s/%s", data.Repo.Slug, diff.Commit.This, d.Name.New)), g.Text(d.Name.New)), ), g.If(d.IsBinary,
M templates/log.go → templates/log.go
@@ -27,7 +27,7 @@ g.Map(commits, func(commit *git.CommitReference) g.Node { return g.Group{ Div(Class("commit-header"), A( - Href(fmt.Sprintf("/%s/commit/%s", data.Repo.Name, commit.Hash.String())), + Href(fmt.Sprintf("/%s/commit/%s", data.Repo.Slug, commit.Hash.String())), Class("commit-message"), g.Text(firstLine(commit.Message)), ),@@ -36,7 +36,7 @@ g.If( commit.HasReference(), g.Map(commit.References(), func(ref *plumbing.Reference) g.Node { return A( - Href(fmt.Sprintf("/%s/tree/%s/", data.Repo.Name, ref.Name().Short())), + Href(fmt.Sprintf("/%s/tree/%s/", data.Repo.Slug, ref.Name().Short())), Class("commit-reference"), g.Text(ref.Name().Short()), )
M templates/page.go → templates/page.go
@@ -40,7 +40,7 @@ Link(Rel("stylesheet"), Href("/static/style.css"), Type("text/css")), g.Iff(data.Servername != "" && data.Repo.Gomod, func() g.Node { return Meta( Name("go-import"), - Content(fmt.Sprintf("%s/%s git https://%[1]s/%[2]s", data.Servername, data.Repo.Name)), + Content(fmt.Sprintf("%s/%s git https://%[1]s/%[2]s", data.Servername, data.Repo.Slug)), ) }), }@@ -48,10 +48,10 @@ } func RenderNav(data PageData) g.Node { return Nav(Ul( - g.If(data.Repo.Name != "", NavItem(joinPaths(data.Repo.Name), "summary")), - g.If(data.Repo.Name != "", NavItem(joinPaths(data.Repo.Name, "refs", ""), "refs")), - g.If(data.Ref != "", NavItem(joinPaths(data.Repo.Name, "tree", data.Ref, ""), "tree")), - g.If(data.Ref != "", NavItem(joinPaths(data.Repo.Name, "log", data.Ref), "log")), + g.If(data.Repo.Name != "", NavItem(joinPaths(data.Repo.Slug), "summary")), + g.If(data.Repo.Name != "", NavItem(joinPaths(data.Repo.Slug, "refs", ""), "refs")), + g.If(data.Ref != "", NavItem(joinPaths(data.Repo.Slug, "tree", data.Ref, ""), "tree")), + g.If(data.Ref != "", NavItem(joinPaths(data.Repo.Slug, "log", data.Ref), "log")), )) }@@ -88,11 +88,11 @@ metaTitle := data.Meta.Title switch { case data.Parent != "": - return fmt.Sprintf("%s — %s (%s): %s/", metaTitle, data.Repo.Name, data.Ref, data.Parent) + return fmt.Sprintf("%s — %s (%s): %s/", metaTitle, data.Repo.Slug, data.Ref, data.Parent) case data.Path != "": - return fmt.Sprintf("%s — %s (%s): %s", metaTitle, data.Repo.Name, data.Ref, data.Path) + return fmt.Sprintf("%s — %s (%s): %s", metaTitle, data.Repo.Slug, data.Ref, data.Path) case data.Repo != nil && data.Repo.Name != "": - return fmt.Sprintf("%s — %s", metaTitle, data.Repo.Name) + return fmt.Sprintf("%s — %s", metaTitle, data.Repo.Slug) default: return metaTitle }
M templates/refs.go → templates/refs.go
@@ -21,17 +21,17 @@ g.Map(branches, func(branch *plumbing.Reference) g.Node { return Div( Strong(g.Text(branch.Name().Short())), A( - Href(fmt.Sprintf("/%s/tree/%s/", data.Repo.Name, branch.Name().Short())), + Href(fmt.Sprintf("/%s/tree/%s/", data.Repo.Slug, branch.Name().Short())), g.Text("browse"), ), g.Text(" "), A( - Href(fmt.Sprintf("/%s/log/%s", data.Repo.Name, branch.Name().Short())), + Href(fmt.Sprintf("/%s/log/%s", data.Repo.Slug, branch.Name().Short())), g.Text("log"), ), g.Text(" "), A( - Href(fmt.Sprintf("/%s/archive/%s.tar.gz", data.Repo.Name, branch.Name().Short())), + Href(fmt.Sprintf("/%s/archive/%s.tar.gz", data.Repo.Slug, branch.Name().Short())), g.Text("tar.gz"), ), )@@ -44,12 +44,12 @@ Div(Class("refs"), g.Map(tags, func(tag *git.TagReference) g.Node { return Div( Strong(Class("tag-name"), g.Text(tag.Name())), - A(Href(fmt.Sprintf("/%s/tree/%s/", data.Repo.Name, tag.Name())), g.Text("browse")), + A(Href(fmt.Sprintf("/%s/tree/%s/", data.Repo.Slug, tag.Name())), g.Text("browse")), g.Text(" "), - A(Href(fmt.Sprintf("/%s/log/%s", data.Repo.Name, tag.Name())), g.Text("log")), + A(Href(fmt.Sprintf("/%s/log/%s", data.Repo.Slug, tag.Name())), g.Text("log")), g.Text(" "), A( - Href(fmt.Sprintf("/%s/archive/%s.tar.gz", data.Repo.Name, tag.Name())), + Href(fmt.Sprintf("/%s/archive/%s.tar.gz", data.Repo.Slug, tag.Name())), g.Text("tar.gz"), ), g.Text(" "),
M templates/repo.go → templates/repo.go
@@ -20,7 +20,7 @@ Article(Class("readme"), g.Raw(readme)), ), Div(Class("clone-url"), Strong(g.Text("clone")), - Pre(g.Text(fmt.Sprintf("git clone https://%s/%s", data.Servername, data.Repo.Name))), + Pre(g.Text(fmt.Sprintf("git clone https://%s/%s", data.Servername, data.Repo.Slug))), ), ), })
M templates/tree.go → templates/tree.go
@@ -19,7 +19,7 @@ g.If(data.Parent != "", g.Group{ Div(), Div(), - Div(A(Href(joinPaths(data.Repo.Name, "tree", data.Ref, dotdot)), g.Text(".."))), + Div(A(Href(joinPaths(data.Repo.Slug, "tree", data.Ref, dotdot)), g.Text(".."))), }, ), g.Map(files, func(file git.NiceTree) g.Node {@@ -31,12 +31,12 @@ Div( g.If(data.Parent != "", A( Href( - joinPaths(data.Repo.Name, "tree", data.Ref, data.Parent, file.Name), + joinPaths(data.Repo.Slug, "tree", data.Ref, data.Parent, file.Name), ), g.Text(file.Name+"/"), ), A( - Href(joinPaths(data.Repo.Name, "tree", data.Ref, file.Name)), + Href(joinPaths(data.Repo.Slug, "tree", data.Ref, file.Name)), g.Text(file.Name+"/"), ), ),@@ -57,7 +57,7 @@ A( Href( fmt.Sprintf( "/%s/blob/%s/%s/%s", - data.Repo.Name, + data.Repo.Slug, data.Ref, data.Parent, file.Name,@@ -66,7 +66,7 @@ ), g.Text(file.Name), ), A( - Href(fmt.Sprintf("/%s/blob/%s/%s", data.Repo.Name, data.Ref, file.Name)), + Href(fmt.Sprintf("/%s/blob/%s/%s", data.Repo.Slug, data.Ref, file.Name)), g.Text(file.Name), ), ),