diff --git a/builder/autoindex.go b/builder/autoindex.go index db6891c6..40b516e6 100644 --- a/builder/autoindex.go +++ b/builder/autoindex.go @@ -640,9 +640,9 @@ func (g *IndexGenerator) generateConfig(dst fs.Writable, as ArticleList, conf Co routes = append(routes, Route{ Handle: "miss", }, Route{ - Src: "/(.*)", - Dest: "/404.html", - Check: true, + Src: "/(.*)", + Dest: "/404.html", + Check: true, Status: 404, }) diff --git a/builder/photos.go b/builder/photos.go index b87bd38a..60a16aed 100644 --- a/builder/photos.go +++ b/builder/photos.go @@ -62,7 +62,7 @@ func (c PhotoConverter) Convert(dst fs.Writable, src Source, conf Config) (Artif } } - if err := img.SetArtist("SHIDA Yuma (aka. MacRat)", meta.DateTime.Format("(c)2006 MacRat")); err != nil { + if err := img.SetArtist("SHIDA Yuma (aka. MacRat)", meta.DateTime.Format("CC-BY (c)2006 MacRat")); err != nil { return nil, err } diff --git a/builder/template.go b/builder/template.go index 22eabd3e..88695703 100644 --- a/builder/template.go +++ b/builder/template.go @@ -4,6 +4,8 @@ import ( "html/template" "math" "path/filepath" + "strconv" + "strings" "sync" ) @@ -41,6 +43,16 @@ func NewTemplateLoader(basePath string) (*TemplateLoader, error) { } return x }, + "zfill": func(x, n int) string { + s := strconv.Itoa(x) + if len(s) >= n { + return s + } + return strings.Repeat("0", n-len(s)) + s + }, + "concat": func(s ...string) string { + return strings.Join(s, "") + }, "escapetag": EscapeTag, "tagsize": func(n int) int { return int(math.Ceil(math.Sqrt(math.Sqrt(float64(n))) * 100)) diff --git a/templates/blog/index.html b/templates/blog/index.html index 3bb90d00..6979dee2 100644 --- a/templates/blog/index.html +++ b/templates/blog/index.html @@ -2,6 +2,37 @@ {{define "description"}}Blanktarに掲載されたブログ記事一覧の{{.TotalPages}}ページ中{{.Page}}ページ目。{{end}} +{{define "head"}} + +{{end}} + {{/*