From b23b69ec8e700654962f6e1e1b3829fdb2d62d8a Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 5 May 2017 18:02:18 +0200 Subject: [PATCH] Hide advanced search on FAQ page --- main.go | 6 +++++- templateVariables.go | 3 ++- templates/_search.html | 2 +- templates/index.html | 3 +++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 6c6db191..7d16f8af 100644 --- a/main.go +++ b/main.go @@ -108,6 +108,7 @@ func searchHandler(w http.ResponseWriter, r *http.Request) { search_param.Category, search_param.Sort, search_param.Order, + false, } htv := HomeTemplateVariables{b, torrentService.GetAllCategories(false), searchForm, navigationTorrents, r.URL, mux.CurrentRoute(r)} @@ -176,7 +177,10 @@ 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)}) + + searchForm := NewSearchForm() + searchForm.HideAdvancedSearch = true + err := templates.ExecuteTemplate(w, "index.html", FaqTemplateVariables{Navigation{}, searchForm, r.URL, mux.CurrentRoute(r)}) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) } diff --git a/templateVariables.go b/templateVariables.go index 637009be..216268eb 100644 --- a/templateVariables.go +++ b/templateVariables.go @@ -53,6 +53,7 @@ type SearchForm struct { Category string Sort string Order string + HideAdvancedSearch bool } // Some Default Values to ease things out @@ -74,4 +75,4 @@ func NewSearchForm(params ...string) SearchForm { searchForm.Order = "DESC" } return searchForm -} \ No newline at end of file +} diff --git a/templates/_search.html b/templates/_search.html index 2f787dc9..51ec417e 100644 --- a/templates/_search.html +++ b/templates/_search.html @@ -43,7 +43,7 @@ - diff --git a/templates/index.html b/templates/index.html index f5bc84e7..73f91eef 100644 --- a/templates/index.html +++ b/templates/index.html @@ -54,6 +54,7 @@
+ {{if not .Search.HideAdvancedSearch}}
Advanced Search
+ {{end}} + {{block "content" .}}Nothing Here.{{end}}