diff --git a/frontend/templateHelper.go b/frontend/render.go similarity index 89% rename from frontend/templateHelper.go rename to frontend/render.go index 04be4a4..018b139 100644 --- a/frontend/templateHelper.go +++ b/frontend/render.go @@ -26,8 +26,8 @@ func renderTemplate(w http.ResponseWriter, r *http.Request, title string, conten var args tmplArguments args.Options = map[string]string{ - "summary": "show protocol", - "detail": "show protocol all", + "summary": "show protocols", + "detail": "show protocols all", "route": "show route for ...", "route_all": "show route for ... all", "route_bgpmap": "show route for ... (bgpmap)", @@ -96,16 +96,16 @@ func summaryTable(isIPv6 bool, data string, serverName string) string { result = "
" + strings.TrimSpace(data) + "
" } else { // Draw the table head - result += "" - result += "" + result += `
` + result += `` for _, col := range strings.Split(stringsSplitted[0], " ") { colTrimmed := strings.TrimSpace(col) if len(colTrimmed) == 0 { continue } - result += "" + result += `` } - result += "" + result += `` stringsWithoutTitle := stringsSplitted[1:] sort.Strings(stringsWithoutTitle) @@ -129,17 +129,17 @@ func summaryTable(isIPv6 bool, data string, serverName string) string { } // Draw the row in red if the link isn't up - result += "" + })[row[3]] + `">` // Add link to detail for first column if isIPv6 { - result += "" + result += `` } else { - result += "" + result += `` } // Draw the other cells for i := 1; i < 6; i++ { diff --git a/frontend/template.go b/frontend/template.go index f96ee3a..a008320 100644 --- a/frontend/template.go +++ b/frontend/template.go @@ -12,6 +12,7 @@ type tmplArguments struct { // Parameters related to current request AllServersLinkActive bool AllServersURL string + // Whois specific handling (for its unique URL) IsWhois bool WhoisTarget string @@ -42,12 +43,12 @@ var tmpl = template.Must(template.New("tmpl").Parse(`
-{{ .Content }} + {{ .Content }}
" + colTrimmed + "` + colTrimmed + `
" + row[0] + "` + row[0] + `" + row[0] + "` + row[0] + `