From e1de5162ac407f6e10a382cabf222534406606b3 Mon Sep 17 00:00:00 2001 From: Joshua Merrell Date: Thu, 27 Sep 2018 13:19:24 -0700 Subject: [PATCH] prepend all absolute paths with {{$.config.SiteWebfolder}} This fixes issues with people who have something aside from "/" as their config.SiteWebFolder setting --- src/manage.go | 1 + src/sql.go | 4 +- templates/front.html | 154 +++++++++++++++------------------- templates/img_boardpage.html | 10 +-- templates/img_header.html | 14 ++-- templates/img_threadpage.html | 6 +- templates/manage_boards.html | 7 +- templates/manage_header.html | 14 ++-- 8 files changed, 95 insertions(+), 115 deletions(-) mode change 100755 => 100644 templates/front.html mode change 100755 => 100644 templates/img_boardpage.html mode change 100755 => 100644 templates/img_threadpage.html diff --git a/src/manage.go b/src/manage.go index 6c5592f8..85f9bdf5 100644 --- a/src/manage.go +++ b/src/manage.go @@ -944,6 +944,7 @@ var manage_functions = map[string]ManageFunction{ allSections, _ = getSectionArr("") if err := manage_boards_tmpl.Execute(manageBoardsBuffer, map[string]interface{}{ + "config": config, "board": board, "section_arr": allSections, }); err != nil { diff --git a/src/sql.go b/src/sql.go index e77a6c85..7f5c98fc 100755 --- a/src/sql.go +++ b/src/sql.go @@ -52,7 +52,7 @@ func connectToSQLServer() { for _, statement := range initialSQLArr { if statement != "" && statement != "\n" && strings.Index(statement, "--") != 0 { if _, err := db.Exec(statement); err != nil { - handleError(0, "failed with error: %s\n", customError(err)) + handleError(0, "failed: %s\n", customError(err)) os.Exit(2) } } @@ -64,7 +64,7 @@ func connectToSQLServer() { if err == sql.ErrNoRows { newInstall = true } else if err != nil { - handleError(0, "failed with error: %s\n", customError(err)) + handleError(0, "failed: %s\n", customError(err)) os.Exit(2) } diff --git a/templates/front.html b/templates/front.html old mode 100755 new mode 100644 index a3f5c23f..a1702521 --- a/templates/front.html +++ b/templates/front.html @@ -4,117 +4,97 @@ {{.config.SiteName}} - - + + - - - + + + -{{range $i, $style := .config.Styles}} + {{range $i, $style := .config.Styles}} {{end}} -
- {{range $i, $board := .boards}} - /{{$board.Dir}}/ -{{end}} +
{{range $i, $board := .boards}} + /{{$board.Dir}}/{{end}}
{{.config.SiteName}}
{{.config.SiteSlogan}}
-
-
- News +
+
+ News +
+
+ Boards +
+
+ Rules +
+
+ FAQ +
+
+
{{range $ii, $page := .page_arr}}{{if eq $page.Page 0}} +
+
+ {{$page.Subject}} by {{$page.Poster}}
-
- Boards +
+ {{$page.Message}}
-
- Rules +
{{end}}{{end}} +
+
+
+
+ Boards
-
- FAQ +
+
    {{range $_, $board := .boards}}{{if eq $board.Dir $.config.Modboard}}{{else}} +
  • /{{$board.Dir}}/ {{$board.Description}}
    • {{end}}{{end}} +
-
- {{range $ii, $page := .page_arr}} - {{if eq $page.Page 0}} -
-
- {{$page.Subject}} by {{$page.Poster}} -
-
- {{$page.Message}} -
+
+
{{range $ii, $page := .page_arr}}{{if eq $page.Page 1}} +
+
+ {{$page.Subject}} by {{$page.Poster}}
- {{end}} - {{end}} -
-
-
-
- Boards -
-
-
    - {{range $_, $board := .boards}} - {{if eq $board.Dir $.config.Modboard}}{{else}} -
  • /{{$board.Dir}}/ {{$board.Description}}
    • {{end}}{{end}} -
-
+
+ {{$page.Message}}
-
-
- {{range $ii, $page := .page_arr}} - {{if eq $page.Page 1}} -
-
- {{$page.Subject}} by {{$page.Poster}} -
-
- {{$page.Message}} -
+
{{end}}{{end}} +
+
{{range $ii, $page := .page_arr.Data}}{{if eq $page.Page 2}} +
+
+ {{$page.Subject}} by {{$page.Poster}}
- {{end}} - {{end}} -
-
- {{range $ii, $page := .page_arr.Data}} - {{if eq $page.Page 2}} -
-
- {{$page.Subject}} by {{$page.Poster}} -
-
- {{$page.Message}} -
+
+ {{$page.Message}}
- {{end}} - {{end}} -
- {{if gt .config.MaxRecentPosts 0}} -
-
Recent Posts
- {{range $i, $post := $.recent_posts}} -
-
- /{{$post.BoardName}}/ - {{$appended := stringAppend $post.Name $post.Tripcode}}{{if eq $appended ""}}Anonymous{{else}}{{$post.Name}}{{if ne $post.Tripcode ""}}!{{$post.Tripcode}}{{end}}{{end}} -
-
- {{if ne $post.Filename ""}}post thumbnail{{end}} - {{truncateMessage $post.Message 225 12}} -
+
{{end}}{{end}} +
+ {{if gt .config.MaxRecentPosts 0}}
+
Recent Posts
+ {{range $i, $post := $.recent_posts}}
+
+ /{{$post.BoardName}}/ - {{$appended := stringAppend $post.Name $post.Tripcode}}{{if eq $appended ""}}Anonymous{{else}}{{$post.Name}}{{if ne $post.Tripcode ""}}!{{$post.Tripcode}}{{end}}{{end}}
- {{end}} -
- {{end}} +
+ {{if ne $post.Filename ""}}post thumbnail{{end}} + {{truncateMessage $post.Message 225 12}} +
+
{{end}}{{end}} +