erki/ss13_se
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Load templates from correct package.

Browse Source
This commit is contained in:
A. Svensson 2016-04-22 15:32:35 +02:00
parent 246602865e
commit 46e47c4ef7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -3,8 +3,10 @@ build: generate
go build -tags "embed" go build -tags "embed"
generate: generate:
yaber --prefix="tmpl_asset_" --pkg "ss13" templates/ yaber --pkg "assettemplates" templates/
mv tmpl_asset_* src/ mv asset_* src/assettemplates/
yaber --pkg "assetstatic" static/
mv asset_* src/assetstatic/
test_run: generate test_run: generate
go run ss13.go -verbose run go run ss13.go -verbose run

3
src/web.go
View File

@ -8,6 +8,7 @@ import (
"time" "time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/lmas/ss13_se/src/assettemplates"
) )
func (i *Instance) Init() { func (i *Instance) Init() {
@ -44,7 +45,7 @@ func (i *Instance) Serve(addr string) error {
// Load templates // Load templates
tmpl := template.New("AllTemplates").Funcs(funcmap) tmpl := template.New("AllTemplates").Funcs(funcmap)
tmplfiles, err := AssetDir("templates/") tmplfiles, err := assettemplates.AssetDir("templates/")
if err != nil { if err != nil {
panic(err) panic(err)
} }