From 964914d63da1d4ede34066043f6981dbfbd02882 Mon Sep 17 00:00:00 2001 From: eggbertx Date: Thu, 3 Jan 2019 11:51:59 -0800 Subject: [PATCH] Add ability to override template files, remove minimum recent posts --- .gitignore | 1 + src/template.go | 14 +++++++++++++- src/types.go | 4 ---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ca6982b7..2381b791 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ vagrant/*.log html/boards.json html/index.html html/test/ +templates/override/ **/*.bak \ No newline at end of file diff --git a/src/template.go b/src/template.go index 151982b9..24357042 100755 --- a/src/template.go +++ b/src/template.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "html" + "os" "reflect" "strconv" "strings" @@ -173,6 +174,13 @@ var funcMap = template.FuncMap{ }, "isBanned": isBanned, "numReplies": numReplies, + "getBoardDir": func(id int) string { + board, err := getBoardFromID(id) + if err != nil { + return "" + } + return board.Dir + }, // Template convenience functions "makeLoop": func(n int, offset int) []int { @@ -266,7 +274,11 @@ func loadTemplate(files ...string) (*template.Template, error) { var templates []string for i, file := range files { templates = append(templates, file) - files[i] = config.TemplateDir + "/" + files[i] + if _, err := os.Stat(config.TemplateDir + "/override/" + file); !os.IsNotExist(err) { + files[i] = config.TemplateDir + "/override/" + files[i] + } else { + files[i] = config.TemplateDir + "/" + files[i] + } } return template.New(templates[0]).Funcs(funcMap).ParseFiles(files...) diff --git a/src/types.go b/src/types.go index 3eea170f..efe19156 100644 --- a/src/types.go +++ b/src/types.go @@ -675,10 +675,6 @@ DefaultStyle must refer to a given Style's Filename field. If DefaultStyle does } } - if config.MaxRecentPosts == 0 { - config.MaxRecentPosts = 10 - } - if config.MaxLogDays == 0 { config.MaxLogDays = 15 }