diff --git a/main.go b/main.go index b4d7b68..a0812fa 100644 --- a/main.go +++ b/main.go @@ -104,7 +104,7 @@ func HomeHandler(w http.ResponseWriter, r *http.Request) { bookmarkletURL := fmt.Sprintf("javascript:(function(f,s,n,o){window.open(f+encodeURIComponent(s),n,o)}('%s/fetch?url=',window.location,'yourform','width=%d,height=%d'));", conf.Server.Address, conf.UI.PopupWidth, conf.UI.PopupHeight) - t, err := template.ParseFS(webFS, "web/layout.tmpl", "web/index.html") + t, err := template.ParseFS(webFS, "web/layout.tmpl", "web/menu.tmpl", "web/index.html") if err != nil { panic(err) } @@ -129,7 +129,7 @@ func HomeHandler(w http.ResponseWriter, r *http.Request) { func ConfigHandler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) - t, err := template.ParseFS(webFS, "web/layout.tmpl", "web/config.html") + t, err := template.ParseFS(webFS, "web/layout.tmpl", "web/menu.tmpl", "web/config.html") if err != nil { panic(err) } diff --git a/web/config.html b/web/config.html index b5accaa..2e52bce 100644 --- a/web/config.html +++ b/web/config.html @@ -1,5 +1,6 @@ {{ define "content" }} +{{ template "menu.tmpl" . }}
diff --git a/web/index.html b/web/index.html index 3536958..660eb63 100644 --- a/web/index.html +++ b/web/index.html @@ -1,5 +1,7 @@ {{ define "content" }} +{{ template "menu.tmpl" . }} +
diff --git a/web/layout.tmpl b/web/layout.tmpl index 63cd3a7..de4f109 100644 --- a/web/layout.tmpl +++ b/web/layout.tmpl @@ -49,20 +49,7 @@ -
- gropple - -
+ {{ template "content" . }}