Index: inks.go --- inks.go.orig +++ inks.go @@ -44,7 +44,7 @@ var tagName = "inks,2019" func getInfo(r *http.Request) map[string]interface{} { templinfo := make(map[string]interface{}) - templinfo["StyleParam"] = getstyleparam("views/style.css") + templinfo["StyleParam"] = getstyleparam("${TRUEPREFIX}/share/${PKGSTEM}/views/style.css") templinfo["UserInfo"] = login.GetUserInfo(r) templinfo["LogoutCSRF"] = login.GetCSRF("logout", r) templinfo["ServerName"] = serverName @@ -323,7 +323,7 @@ func showtags(w http.ResponseWriter, r *http.Request) w.Header().Set("Cache-Control", "max-age=300") } - err := readviews.Execute(w, "tags.html", templinfo) + err := readviews.Execute(w, "$tags.html", templinfo) if err != nil { log.Printf("error templating inks: %s", err) } @@ -381,7 +381,7 @@ func showsources(w http.ResponseWriter, r *http.Reques templinfo := getInfo(r) templinfo["SaveCSRF"] = login.GetCSRF("savesource", r) templinfo["Sources"] = getsources() - err := readviews.Execute(w, "sources.html", templinfo) + err := readviews.Execute(w, "$sources.html", templinfo) if err != nil { log.Print(err) } @@ -474,7 +474,7 @@ func showrandomrss(w http.ResponseWriter, r *http.Requ func servecss(w http.ResponseWriter, r *http.Request) { w.Header().Set("Cache-Control", "max-age=7776000") - http.ServeFile(w, r, "views"+r.URL.Path) + http.ServeFile(w, r, "${are/${PKGSTEM}/views"+r.URL.Path) } func servehtml(w http.ResponseWriter, r *http.Request) { templinfo := getInfo(r) @@ -569,15 +569,15 @@ func serve() { getconfig("debug", &debug) readviews = templates.Load(debug, - "views/header.html", - "views/inks.html", - "views/tags.html", - "views/addlink.html", - "views/sources.html", - "views/login.html", + "${TRUEPREFIX}/share/${PKGSTEM}/views/header.html", + "${TRUEPREFIX}/share/${PKGSTEM}/views/inks.html", + "${TRUEPREFIX}/share/${PKGSTEM}/views/tags.html", + "${TRUEPREFIX}/share/${PKGSTEM}/views/addlink.html", + "${TRUEPREFIX}/share/${PKGSTEM}/views/sources.html", + "${TRUEPREFIX}/share/${PKGSTEM}/views/login.html", ) if !debug { - s := "views/style.css" + s := "${TRUEPREFIX}/share/${PKGSTEM}/views/style.css" savedstyleparams[s] = getstyleparam(s) }