heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor templates

Browse Source
This commit is contained in:
sentriz
2019-06-24 21:40:48 +01:00
parent 4ed144da84
commit 58a4558d5b
11 changed files with 748 additions and 2208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/handler/handler_admin.go
View File

@@ -12,7 +12,7 @@ import (
)
func (c *Controller) ServeLogin(w http.ResponseWriter, r *http.Request) {
renderTemplate(w, r, c.Templates["login"], nil)
renderTemplate(w, r, c.Templates["login.tmpl"], nil)
}
func (c *Controller) ServeLoginDo(w http.ResponseWriter, r *http.Request) {
@@ -71,11 +71,11 @@ func (c *Controller) ServeHome(w http.ResponseWriter, r *http.Request) {
r.Host,
)
data.RequestRoot = fmt.Sprintf("%s://%s", scheme, host)
renderTemplate(w, r, c.Templates["home"], data)
renderTemplate(w, r, c.Templates["home.tmpl"], data)
}
func (c *Controller) ServeChangeOwnPassword(w http.ResponseWriter, r *http.Request) {
renderTemplate(w, r, c.Templates["change_own_password"], nil)
renderTemplate(w, r, c.Templates["change_own_password.tmpl"], nil)
}
func (c *Controller) ServeChangeOwnPasswordDo(w http.ResponseWriter, r *http.Request) {
@@ -143,7 +143,7 @@ func (c *Controller) ServeChangePassword(w http.ResponseWriter, r *http.Request)
}
data := &templateData{}
data.SelectedUser = user
renderTemplate(w, r, c.Templates["change_password"], data)
renderTemplate(w, r, c.Templates["change_password.tmpl"], data)
}
func (c *Controller) ServeChangePasswordDo(w http.ResponseWriter, r *http.Request) {
@@ -184,7 +184,7 @@ func (c *Controller) ServeDeleteUser(w http.ResponseWriter, r *http.Request) {
}
data := &templateData{}
data.SelectedUser = user
renderTemplate(w, r, c.Templates["delete_user"], data)
renderTemplate(w, r, c.Templates["delete_user.tmpl"], data)
}
func (c *Controller) ServeDeleteUserDo(w http.ResponseWriter, r *http.Request) {
@@ -198,7 +198,7 @@ func (c *Controller) ServeDeleteUserDo(w http.ResponseWriter, r *http.Request) {
}
func (c *Controller) ServeCreateUser(w http.ResponseWriter, r *http.Request) {
renderTemplate(w, r, c.Templates["create_user"], nil)
renderTemplate(w, r, c.Templates["create_user.tmpl"], nil)
}
func (c *Controller) ServeCreateUserDo(w http.ResponseWriter, r *http.Request) {
@@ -240,7 +240,7 @@ func (c *Controller) ServeUpdateLastFMAPIKey(w http.ResponseWriter, r *http.Requ
data := &templateData{}
data.CurrentLastFMAPIKey = c.GetSetting("lastfm_api_key")
data.CurrentLastFMAPISecret = c.GetSetting("lastfm_secret")
renderTemplate(w, r, c.Templates["update_lastfm_api_key"], data)
renderTemplate(w, r, c.Templates["update_lastfm_api_key.tmpl"], data)
}
func (c *Controller) ServeUpdateLastFMAPIKeyDo(w http.ResponseWriter, r *http.Request) {

5
server/handler/respond_admin.go
View File

@@ -1,8 +1,8 @@
package handler
import (
"fmt"
"html/template"
"log"
"net/http"
"github.com/gorilla/sessions"
@@ -38,7 +38,8 @@ func renderTemplate(w http.ResponseWriter, r *http.Request,
}
err := tmpl.Execute(w, data)
if err != nil {
http.Error(w, fmt.Sprintf("500 when executing: %v", err), 500)
log.Println("error executing template: %v\n", err)
http.Redirect(w, r, "/", 500)
return
}
}