gochan/gochan
1
0
Fork 0
mirror of https://github.com/Eggbertx/gochan.git synced 2025-08-03 23:56:22 -07:00
Code Releases Activity

Add modifyable title for mgmt pages

Browse source
This commit is contained in:
Eggbertx 2022-01-29 20:46:00 -08:00
parent d1ae92b01c
commit 33388612d7
4 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkg/building/building.go
View file

@ -100,9 +100,10 @@ func BuildBoardListJSON() error {
// BuildPageHeader is a convenience function for automatically generating the top part // BuildPageHeader is a convenience function for automatically generating the top part
// of every normal HTML page // of every normal HTML page
func BuildPageHeader(writer io.Writer) error { func BuildPageHeader(writer io.Writer, pageTitle string) error {
return serverutil.MinifyTemplate(gctemplates.PageHeader, return serverutil.MinifyTemplate(gctemplates.PageHeader,
map[string]interface{}{ map[string]interface{}{
"page_title": pageTitle,
"webroot": config.GetSystemCriticalConfig().WebRoot, "webroot": config.GetSystemCriticalConfig().WebRoot,
"site_config": config.GetSiteConfig(), "site_config": config.GetSiteConfig(),
"sections": gcsql.AllSections, "sections": gcsql.AllSections,

15
pkg/manage/actions.go
View file

@ -235,7 +235,7 @@ var actions = []Action{
} }
manageBansBuffer := bytes.NewBufferString("") manageBansBuffer := bytes.NewBufferString("")
if err = serverutil.MinifyTemplate(gctemplates.ManageConfig, if err = serverutil.MinifyTemplate(gctemplates.ManageBans,
map[string]interface{}{ map[string]interface{}{
// "systemCritical": config.GetSystemCriticalConfig(), // "systemCritical": config.GetSystemCriticalConfig(),
"banlist": banlist, "banlist": banlist,
@ -446,11 +446,18 @@ var actions = []Action{
ID: "rebuildfront", ID: "rebuildfront",
Title: "Rebuild front page", Title: "Rebuild front page",
Permissions: AdminPerms, Permissions: AdminPerms,
JSONoutput: OptionalJSON,
Callback: func(writer http.ResponseWriter, request *http.Request, wantsJSON bool) (output interface{}, err error) { Callback: func(writer http.ResponseWriter, request *http.Request, wantsJSON bool) (output interface{}, err error) {
if err = gctemplates.InitTemplates(); err != nil { if err = gctemplates.InitTemplates(); err != nil {
return "", err return "", err
} }
return "Built front page successfully", building.BuildFrontPage() err = building.BuildFrontPage()
if wantsJSON {
return map[string]string{
"front": "Built front page successfully",
}, err
}
return "<h2>Build front page</h2>Built front page successfully", err
}}, }},
{ {
ID: "rebuildall", ID: "rebuildall",
@ -506,7 +513,7 @@ var actions = []Action{
if wantsJSON { if wantsJSON {
return buildMap, nil return buildMap, nil
} }
buildStr := "" buildStr := "<h2>Rebuilding everything</h2>"
for _, msg := range buildMap { for _, msg := range buildMap {
buildStr += fmt.Sprintln(msg, "<hr />") buildStr += fmt.Sprintln(msg, "<hr />")
} }
@ -548,7 +555,7 @@ var actions = []Action{
"message": "Boards built successfully", "message": "Boards built successfully",
}, building.BuildBoards(false) }, building.BuildBoards(false)
} }
return "Boards built successfully", building.BuildBoards(false) return "<h2>Rebuild boards</h2>Boards built successfully", building.BuildBoards(false)
}}, }},
{ {
ID: "reparsehtml", ID: "reparsehtml",

2
pkg/manage/handler.go
View file

@ -115,7 +115,7 @@ func CallManageFunction(writer http.ResponseWriter, request *http.Request) {
serverutil.MinifyWriter(writer, []byte(outputJSON), "application/json") serverutil.MinifyWriter(writer, []byte(outputJSON), "application/json")
return return
} }
if err = building.BuildPageHeader(&managePageBuffer); err != nil { if err = building.BuildPageHeader(&managePageBuffer, action.Title); err != nil {
serveError(writer, "error", actionID, serveError(writer, "error", actionID,
gclog.Print(gclog.LErrorLog, "Failed writing page header: ", err.Error()), false) gclog.Print(gclog.LErrorLog, "Failed writing page header: ", err.Error()), false)
return return

2
templates/page_header.html
View file

@ -9,7 +9,7 @@
{{- else if ne $.op.MessageHTML "" -}}<title>/{{$.board.Dir}}/ - {{truncateString $.op.MessageText 20 true}}</title> {{- else if ne $.op.MessageHTML "" -}}<title>/{{$.board.Dir}}/ - {{truncateString $.op.MessageText 20 true}}</title>
{{- else}}<title>/{{$.board.Dir}}/ - #{{$.op.ID}}</title>{{end}} {{- else}}<title>/{{$.board.Dir}}/ - #{{$.op.ID}}</title>{{end}}
{{- else}}<title>/{{$.board.Dir}}/ - {{$.board.Title}}</title>{{end}} {{- else}}<title>/{{$.board.Dir}}/ - {{$.board.Title}}</title>{{end}}
{{- else}}<title>{{.site_config.SiteName}}</title>{{end}} {{- else}}<title>{{with $.page_title}}{{$.page_title}} - {{end}}{{.site_config.SiteName}}</title>{{end}}
<link rel="stylesheet" href="{{.webroot}}css/global.css" /> <link rel="stylesheet" href="{{.webroot}}css/global.css" />
<link id="theme" rel="stylesheet" href="{{.webroot}}css/{{.board_config.DefaultStyle}}" /> <link id="theme" rel="stylesheet" href="{{.webroot}}css/{{.board_config.DefaultStyle}}" />
<link rel="shortcut icon" href="{{.webroot}}favicon.png"> <link rel="shortcut icon" href="{{.webroot}}favicon.png">