From 663b07bdb289da45ea479c92b8292e1157f38b21 Mon Sep 17 00:00:00 2001 From: akuma06 Date: Fri, 5 May 2017 15:23:49 +0200 Subject: [PATCH] Re added templates files function for search Removed them when I've resolved the conflicts --- main.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 9c0db60e..6c6db191 100644 --- a/main.go +++ b/main.go @@ -82,6 +82,7 @@ func apiViewHandler(w http.ResponseWriter, r *http.Request) { func searchHandler(w http.ResponseWriter, r *http.Request) { var templates = template.Must(template.New("home").Funcs(funcMap).ParseFiles("templates/index.html", "templates/home.html")) + templates.ParseGlob("templates/_*.html") // common vars := mux.Vars(r) page := vars["page"] @@ -174,6 +175,7 @@ func searchByQuery(r *http.Request, pagenum int) (SearchParam, []model.Torrents, func faqHandler(w http.ResponseWriter, r *http.Request) { var templates = template.Must(template.New("FAQ").Funcs(funcMap).ParseFiles("templates/index.html", "templates/FAQ.html")) + templates.ParseGlob("templates/_*.html") // common err := templates.ExecuteTemplate(w, "index.html", FaqTemplateVariables{Navigation{}, NewSearchForm(), r.URL, mux.CurrentRoute(r)}) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) @@ -220,6 +222,7 @@ func rssHandler(w http.ResponseWriter, r *http.Request) { func viewHandler(w http.ResponseWriter, r *http.Request) { var templates = template.Must(template.ParseFiles("templates/index.html", "templates/view.html")) + templates.ParseGlob("templates/_*.html") // common vars := mux.Vars(r) id := vars["id"] @@ -235,8 +238,9 @@ func viewHandler(w http.ResponseWriter, r *http.Request) { } func rootHandler(w http.ResponseWriter, r *http.Request) { - var templates = template.Must(template.New("home").Funcs(funcMap).ParseFiles("templates/index.html", "templates/home.html")) - vars := mux.Vars(r) +var templates = template.Must(template.New("home").Funcs(funcMap).ParseFiles("templates/index.html", "templates/home.html")) + templates.ParseGlob("templates/_*.html") // common + vars := mux.Vars(r) page := vars["page"] // db params url