Resource Fixes

davidbelliott · Mar 15, 2017 · e5cdbe7 · e5cdbe7
1 parent bc23a66
commit e5cdbe7
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 9 deletions.
diff --git a/http/admin/res/index.html → http/admin/admin_res/index.html b/http/admin/res/index.html → http/admin/admin_res/index.html
diff --git a/http/admin/res/panel.html → http/admin/admin_res/panel.html b/http/admin/res/panel.html → http/admin/admin_res/panel.html
diff --git a/http/admin/res/status.html → http/admin/admin_res/status.html b/http/admin/res/status.html → http/admin/admin_res/status.html
diff --git 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
@@ -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 → http/board/board_res/board.html b/http/board/res/board.html → http/board/board_res/board.html
diff --git a/http/board/res/dir.html → http/board/board_res/dir.html b/http/board/res/dir.html → http/board/board_res/dir.html
diff --git a/http/board/res/thread.html → http/board/board_res/thread.html b/http/board/res/thread.html → http/board/board_res/thread.html
diff --git a/http/board/res/thread.tmpl.html → http/board/board_res/thread.tmpl.html b/http/board/res/thread.tmpl.html → http/board/board_res/thread.tmpl.html
diff --git 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
@@ -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 → http/errw/errw_res/error.html b/http/errw/res/error.html → http/errw/errw_res/error.html
diff --git 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
@@ -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,