Mercurial > yakumo_izuru > aya
changeset 36:a88ccfbd4103 draft
fixed variable override order
| author | zaitsev.serge |
|---|---|
| date | Wed, 02 Sep 2015 17:43:31 +0000 |
| parents | 0498cb3afc1d |
| children | 253a7e604e17 |
| files | zs.go |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/zs.go Wed Sep 02 17:41:06 2015 +0000 +++ b/zs.go Wed Sep 02 17:43:31 2015 +0000 @@ -99,21 +99,23 @@ } s := string(b) - // Copy globals first + // Pick some default values for content-dependent variables v := Vars{} + title := strings.Replace(strings.Replace(path, "_", " ", -1), "-", " ", -1) + v["title"] = strings.ToTitle(title) + v["description"] = "" + + // Copy globals (will override title and description for markdown layouts for name, value := range globals { v[name] = value } - // Override them by default values extracted from file name/path + // Add default values extracted from file name/path if _, err := os.Stat(filepath.Join(ZSDIR, "layout.amber")); err == nil { v["layout"] = "layout.amber" } else { v["layout"] = "layout.html" } - title := strings.Replace(strings.Replace(path, "_", " ", -1), "-", " ", -1) - v["title"] = strings.ToTitle(title) - v["description"] = "" v["file"] = path v["url"] = path[:len(path)-len(filepath.Ext(path))] + ".html" v["output"] = filepath.Join(PUBDIR, v["url"])