From e5cdbe72114e09620eefc577fb2a5648f7e17d1f Mon Sep 17 00:00:00 2001 From: Tim Schuster Date: Wed, 15 Mar 2017 14:39:57 +0100 Subject: [PATCH] Resource Fixes --- http/admin/{res => admin_res}/index.html | 0 http/admin/{res => admin_res}/panel.html | 0 http/admin/{res => admin_res}/status.html | 0 http/admin/handler.go | 2 +- http/admin/rice-box.go | 4 ++-- http/board/{res => board_res}/board.html | 0 http/board/{res => board_res}/dir.html | 0 http/board/{res => board_res}/thread.html | 0 http/board/{res => board_res}/thread.tmpl.html | 0 http/board/handler.go | 2 +- http/board/rice-box.go | 4 ++-- http/errw/{res => errw_res}/error.html | 0 http/errw/handler.go | 2 +- http/errw/rice-box.go | 4 ++-- 14 files changed, 9 insertions(+), 9 deletions(-) rename http/admin/{res => admin_res}/index.html (100%) rename http/admin/{res => admin_res}/panel.html (100%) rename http/admin/{res => admin_res}/status.html (100%) rename http/board/{res => board_res}/board.html (100%) rename http/board/{res => board_res}/dir.html (100%) rename http/board/{res => board_res}/thread.html (100%) rename http/board/{res => board_res}/thread.tmpl.html (100%) rename http/errw/{res => errw_res}/error.html (100%) diff --git a/http/admin/res/index.html b/http/admin/admin_res/index.html similarity index 100% rename from http/admin/res/index.html rename to http/admin/admin_res/index.html diff --git a/http/admin/res/panel.html b/http/admin/admin_res/panel.html similarity index 100% rename from http/admin/res/panel.html rename to http/admin/admin_res/panel.html diff --git a/http/admin/res/status.html b/http/admin/admin_res/status.html similarity index 100% rename from http/admin/res/status.html rename to http/admin/admin_res/status.html diff --git a/http/admin/handler.go b/http/admin/handler.go index 36e39e6..bc3f3d7 100644 --- a/http/admin/handler.go +++ b/http/admin/handler.go @@ -19,7 +19,7 @@ var ( func LoadTemplates() error { var err error - box, err := rice.FindBox("res/") + box, err := rice.FindBox("admin_res/") if err != nil { panic(err) } diff --git a/http/admin/rice-box.go b/http/admin/rice-box.go index b3f834b..7c288e4 100644 --- a/http/admin/rice-box.go +++ b/http/admin/rice-box.go @@ -40,8 +40,8 @@ func init() { dir1.ChildDirs = []*embedded.EmbeddedDir{} // register embeddedBox - embedded.RegisterEmbeddedBox(`res/`, &embedded.EmbeddedBox{ - Name: `res/`, + embedded.RegisterEmbeddedBox(`admin_res/`, &embedded.EmbeddedBox{ + Name: `admin_res/`, Time: time.Unix(1489566364, 0), Dirs: map[string]*embedded.EmbeddedDir{ "": dir1, diff --git a/http/board/res/board.html b/http/board/board_res/board.html similarity index 100% rename from http/board/res/board.html rename to http/board/board_res/board.html diff --git a/http/board/res/dir.html b/http/board/board_res/dir.html similarity index 100% rename from http/board/res/dir.html rename to http/board/board_res/dir.html diff --git a/http/board/res/thread.html b/http/board/board_res/thread.html similarity index 100% rename from http/board/res/thread.html rename to http/board/board_res/thread.html diff --git a/http/board/res/thread.tmpl.html b/http/board/board_res/thread.tmpl.html similarity index 100% rename from http/board/res/thread.tmpl.html rename to http/board/board_res/thread.tmpl.html diff --git a/http/board/handler.go b/http/board/handler.go index f3e3f54..4ed5ff3 100644 --- a/http/board/handler.go +++ b/http/board/handler.go @@ -48,7 +48,7 @@ var ( ) func LoadTemplates() error { - box, err := rice.FindBox("res/") + box, err := rice.FindBox("board_res/") if err != nil { return err } diff --git a/http/board/rice-box.go b/http/board/rice-box.go index 4d3d51b..9c49bb4 100644 --- a/http/board/rice-box.go +++ b/http/board/rice-box.go @@ -46,8 +46,8 @@ func init() { dir1.ChildDirs = []*embedded.EmbeddedDir{} // register embeddedBox - embedded.RegisterEmbeddedBox(`res/`, &embedded.EmbeddedBox{ - Name: `res/`, + embedded.RegisterEmbeddedBox(`board_res/`, &embedded.EmbeddedBox{ + Name: `board_res/`, Time: time.Unix(1489566591, 0), Dirs: map[string]*embedded.EmbeddedDir{ "": dir1, diff --git a/http/errw/res/error.html b/http/errw/errw_res/error.html similarity index 100% rename from http/errw/res/error.html rename to http/errw/errw_res/error.html diff --git a/http/errw/handler.go b/http/errw/handler.go index 9c436ee..74b3f85 100644 --- a/http/errw/handler.go +++ b/http/errw/handler.go @@ -14,7 +14,7 @@ var ( ) func LoadTemplates() error { - box, err := rice.FindBox("res/") + box, err := rice.FindBox("errw_res/") if err != nil { return err } diff --git a/http/errw/rice-box.go b/http/errw/rice-box.go index dce39e3..8a075c4 100644 --- a/http/errw/rice-box.go +++ b/http/errw/rice-box.go @@ -28,8 +28,8 @@ func init() { dir1.ChildDirs = []*embedded.EmbeddedDir{} // register embeddedBox - embedded.RegisterEmbeddedBox(`res/`, &embedded.EmbeddedBox{ - Name: `res/`, + embedded.RegisterEmbeddedBox(`errw_res/`, &embedded.EmbeddedBox{ + Name: `errw_res/`, Time: time.Unix(1489240168, 0), Dirs: map[string]*embedded.EmbeddedDir{ "": dir1,