cmd/sgblog/gemini-entry.tmpl | 2 +- cmd/sgblog/gemini-menu.tmpl | 4 ++-- cmd/sgblog/gopher-entry.tmpl | 2 +- cmd/sgblog/gopher-menu.tmpl | 2 +- cmd/sgblog/http-entry.tmpl | 2 +- cmd/sgblog/http-index.tmpl | 10 +++++----- diff --git a/cmd/sgblog/gemini-entry.tmpl b/cmd/sgblog/gemini-entry.tmpl index 83d2cc4a52dd2d8e68aa886a321286a3c8311476d949607f3970512fc21b7a71..3ef33f99012dc9d0cc79f0975325bd4484efbec7ffc6f05cc5b546d152eb0d1d 100644 --- a/cmd/sgblog/gemini-entry.tmpl +++ b/cmd/sgblog/gemini-entry.tmpl @@ -2,7 +2,7 @@ {{$CR := printf "\r"}}20 text/gemini{{$CR}} # {{.Title}} {{$.T.Get "What"}}: {{.Commit.Hash.String}} {{$.T.Get "When"}}: {{.When}} -{{if .Topics}}{{$.T.Get "Topics"}}:{{range .Topics}} {{.}}{{end}}{{end}} +{{if .Topics}}{{range .Topics}}#{{.}} {{end}}{{end}} ``` {{.Commit.Message}}``` {{- if .Note}} diff --git a/cmd/sgblog/gemini-menu.tmpl b/cmd/sgblog/gemini-menu.tmpl index 2614bbd208d3e235e044db73b9593b327a05d2ae37828c3cbe8a65e1c4047cd6..40ecfdf3ff3b417af4bb43050c188483a4c623ff377c3e674dad0e998037bf7a 100644 --- a/cmd/sgblog/gemini-menu.tmpl +++ b/cmd/sgblog/gemini-menu.tmpl @@ -1,5 +1,5 @@ {{$CR := printf "\r"}}20 text/gemini{{$CR}} -# {{.Cfg.Title}} {{if .Topic}}({{$.T.Get "topic"}}: {{.Topic}}) {{end}}({{.Offset}}-{{.OffsetNext}}) +# {{.Cfg.Title}} {{if .Topic}}({{$.T.Get "topic"}}: #{{.Topic}}) {{end}}({{.Offset}}-{{.OffsetNext}}) {{if .Cfg.AboutURL}}=> {{.Cfg.AboutURL}} {{$.T.Get "about"}}{{end}} {{if .Offset}}=> /?offset={{.OffsetPrev}}{{if .Topic}}&topic={{.Topic}}{{end}} {{$.T.Get "prev"}}{{end}} {{if not .LogEnded}}=> /?offset={{.OffsetNext}}{{if .Topic}}&topic={{.Topic}}{{end}} {{$.T.Get "next"}}{{end}} @@ -12,5 +12,5 @@ {{end -}} => /{{.Commit.Hash.String}} {{.Commit.Author.When.Format "2006-01-02"}} {{.Title}} {{end}} -{{range .Topics -}}=> /?topic={{.}} Topic: {{.}} +{{range .Topics -}}=> /?topic={{.}} #{{.}} {{end}} diff --git a/cmd/sgblog/gopher-entry.tmpl b/cmd/sgblog/gopher-entry.tmpl index 8f971896fa6bb916840a0611921eaed4d16b9889556e1a120baa19b82ec0ee00..bbf23dcab2722d7bb71031174d64f3e8f5a0cc1a5911a34209c4cc771e68045d 100644 --- a/cmd/sgblog/gopher-entry.tmpl +++ b/cmd/sgblog/gopher-entry.tmpl @@ -1,7 +1,7 @@ {{$Cfg := .Cfg -}}{{$.T.Get "What"}}: {{.Commit.Hash.String}} {{$.T.Get "When"}}: {{.When}} ------------------------------------------------------------------------ -{{if .Topics}}{{$.T.Get "Topics"}}:{{range .Topics}} {{.}}{{end}}{{end}} +{{if .Topics}}{{range .Topics}}#{{.}} {{end}}{{end}} ------------------------------------------------------------------------ {{.Commit.Message -}} {{- if .Images}} diff --git a/cmd/sgblog/gopher-menu.tmpl b/cmd/sgblog/gopher-menu.tmpl index 63180fa4f1cb021bbe0e5087ab19d9531b662c612664f4fd4d9af325e7caf785..e400cc0180288b04c9f5ce8777a098c5afadad2526254619c7cd80b1c34d3d90 100644 --- a/cmd/sgblog/gopher-menu.tmpl +++ b/cmd/sgblog/gopher-menu.tmpl @@ -11,5 +11,5 @@ {{- if ne $dateCur $datePrev}}{{$datePrev = $dateCur}} i{{$dateCur}} err{{template "domainPort" $Cfg}}{{$CR}}{{end}} 0{{.Title}} /{{.Commit.Hash.String}}{{template "domainPort" $Cfg}}{{$CR}}{{end}} {{range .Topics}} -1{{$.T.Get "topic"}}: {{.}} {{.}}/offset/0{{template "domainPort" $Cfg}}{{$CR}}{{end}} +1#{{.}} {{.}}/offset/0{{template "domainPort" $Cfg}}{{$CR}}{{end}} .{{$CRLF}} diff --git a/cmd/sgblog/http-entry.tmpl b/cmd/sgblog/http-entry.tmpl index 61f36d5c5bfc9357bb156103666be209bac5a651fe0a092df57e2dd3d22d3a31..d675795b72261c08ba0bc1dbe0cf6ab98d3be56d7c56b22b6a8a1f8501894573 100644 --- a/cmd/sgblog/http-entry.tmpl +++ b/cmd/sgblog/http-entry.tmpl @@ -17,7 +17,7 @@ {{if .Parent}}{{end}} {{if .Topics}} -{{$.T.Get "Topics"}}: {{range .Topics}}[{{.}}]{{end}} +{{range .Topics}}#{{.}} {{end}} {{end}}

{{.Title}}

diff --git a/cmd/sgblog/http-index.tmpl b/cmd/sgblog/http-index.tmpl index 184c8c028e9f165a538fa600ba6fd76814c4152c15d8baf5027ba152a2ee3be9..1cd33896f7b0cf98ab8bba14dfa1607a534021bb65a8b487513ac754e24bd0aa 100644 --- a/cmd/sgblog/http-index.tmpl +++ b/cmd/sgblog/http-index.tmpl @@ -3,7 +3,7 @@ - {{.Cfg.Title}} {{if .Topic}}(topic: {{.Topic}}) {{end}}({{.Offset}}-{{.OffsetNext}}) + {{.Cfg.Title}} {{if .Topic}}(#{{.Topic}}) {{end}}({{.Offset}}-{{.OffsetNext}}) {{with .Cfg.CSS}}{{end}} {{with .Cfg.Webmaster}}{{end}} {{range .Cfg.GitURLs}}{{end}} @@ -15,9 +15,9 @@ {{if .Offset}}{{end}} {{if not .LogEnded}}{{end}} -{{if .Topics}}
-{{$.T.Get "Topics"}}: [{{$.T.Get "ALL"}}] -{{range .Topics}}[{{.}}] +{{if .Topics}} +{{$.T.Get "ALL"}}  +{{range .Topics}}#{{.}}  {{end}} {{end}} {{- $TopicsEnabled := .TopicsEnabled -}} @@ -45,7 +45,7 @@ {{.LinesNum}} {{if .ImagesNum}}{{.ImagesNum}}{{else}} {{end}} {{if .CommentsNum}}{{.CommentsNum}}{{else}} {{end}} {{if .DomainURLs}}{{range .DomainURLs}} {{.}} {{end}}{{else}} {{end}} - {{if $TopicsEnabled}}{{if .Topics}}{{range .Topics}} {{.}} {{end}}{{else}} {{end}}{{end}} + {{if $TopicsEnabled}}{{if .Topics}}{{range .Topics}} #{{.}} {{end}}{{else}} {{end}}{{end}} {{end}}