From dd4baa267dbdfe279aab5f4122305ac51c0c6a3d Mon Sep 17 00:00:00 2001 From: Horus3 Date: Mon, 15 Jun 2015 15:00:21 +0200 Subject: Fix css and some bugs. --- intercept.go | 5 ++++- scanner.go | 11 ++++++----- view.go | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/intercept.go b/intercept.go index 8201f3e..eeea651 100644 --- a/intercept.go +++ b/intercept.go @@ -54,7 +54,10 @@ func (t *TemplateHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { return } - err = tmpl.Execute(w, struct{ URL string }{URL: r.URL.Path}) + err = tmpl.Execute(w, struct { + URL string + Favicon template.HTML + }{URL: r.URL.Path, Favicon: getFavicon()}) if err != nil { log.Println(err.Error()) w.WriteHeader(500) diff --git a/scanner.go b/scanner.go index 10be11b..53a6aeb 100644 --- a/scanner.go +++ b/scanner.go @@ -7,13 +7,14 @@ package main */ import "C" import ( + "html/template" "log" "strings" ) type Link struct { - Url string - Text string + Url template.URL + Text template.HTML IsDir bool } @@ -29,16 +30,16 @@ func getToken(input string) []Link { if token == C.TOKEN_URL { // flex reads the href attr - l.Url = C.GoString(C.yylval) + l.Url = template.URL(C.GoString(C.yylval)) - if strings.HasSuffix(l.Url, "/") { + if strings.HasSuffix(C.GoString(C.yylval), "/") { l.IsDir = true } } else if token == C.TOKEN_TEXT { // flex reads the link description - l.Text = C.GoString(C.yylval) + l.Text = template.HTML(C.GoString(C.yylval)) ls = append(ls, l) l = Link{} } else { diff --git a/view.go b/view.go index cc0dd17..005be2c 100644 --- a/view.go +++ b/view.go @@ -7,16 +7,16 @@ func getTemplate() string { {{.URL}} - + {{.Favicon}}

- {{if .AllowUpload}}

To upload please click here.

{{end}} +

- {{.URL}}

+ {{if .AllowUpload}}

To upload please click here.

{{if ne .URL "/"}} .. (up a dir)

-- cgit v1.2.3