burble.dn42/bird-lg-go
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

frontend: apply go fmt

Browse Source
This commit is contained in:
Arnie97 2020-07-28 13:37:22 +08:00 committed by Lan Tian
parent f661e878c4
commit 20b1233ec8
No known key found for this signature in database
GPG Key ID: 27F31700E751EC22
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/templateHelper.go → frontend/render.go
View File

@ -26,8 +26,8 @@ func renderTemplate(w http.ResponseWriter, r *http.Request, title string, conten
var args tmplArguments var args tmplArguments
args.Options = map[string]string{ args.Options = map[string]string{
"summary": "show protocol", "summary": "show protocols",
"detail": "show protocol all", "detail": "show protocols all",
"route": "show route for ...", "route": "show route for ...",
"route_all": "show route for ... all", "route_all": "show route for ... all",
"route_bgpmap": "show route for ... (bgpmap)", "route_bgpmap": "show route for ... (bgpmap)",
@ -96,16 +96,16 @@ func summaryTable(isIPv6 bool, data string, serverName string) string {
result = "<pre>" + strings.TrimSpace(data) + "</pre>" result = "<pre>" + strings.TrimSpace(data) + "</pre>"
} else { } else {
// Draw the table head // Draw the table head
result += "<table class=\"table table-striped table-bordered table-sm\">" result += `<table class="table table-striped table-bordered table-sm">`
result += "<thead>" result += `<thead>`
for _, col := range strings.Split(stringsSplitted[0], " ") { for _, col := range strings.Split(stringsSplitted[0], " ") {
colTrimmed := strings.TrimSpace(col) colTrimmed := strings.TrimSpace(col)
if len(colTrimmed) == 0 { if len(colTrimmed) == 0 {
continue continue
} }
result += "<th scope=\"col\">" + colTrimmed + "</th>" result += `<th scope="col">` + colTrimmed + `</th>`
} }
result += "</thead><tbody>" result += `</thead><tbody>`
stringsWithoutTitle := stringsSplitted[1:] stringsWithoutTitle := stringsSplitted[1:]
sort.Strings(stringsWithoutTitle) 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 // Draw the row in red if the link isn't up
result += "<tr class=\"" + (map[string]string{ result += `<tr class="` + (map[string]string{
"up": "table-success", "up": "table-success",
"down": "table-secondary", "down": "table-secondary",
"start": "table-danger", "start": "table-danger",
"passive": "table-info", "passive": "table-info",
})[row[3]] + "\">" })[row[3]] + `">`
// Add link to detail for first column // Add link to detail for first column
if isIPv6 { if isIPv6 {
result += "<td><a href=\"/ipv6/detail/" + serverName + "/" + row[0] + "\">" + row[0] + "</a></td>" result += `<td><a href="/ipv6/detail/` + serverName + `/` + row[0] + `">` + row[0] + `</a></td>`
} else { } else {
result += "<td><a href=\"/ipv4/detail/" + serverName + "/" + row[0] + "\">" + row[0] + "</a></td>" result += `<td><a href="/ipv4/detail/` + serverName + `/` + row[0] + `">` + row[0] + `</a></td>`
} }
// Draw the other cells // Draw the other cells
for i := 1; i < 6; i++ { for i := 1; i < 6; i++ {

37
frontend/template.go
View File

@ -12,6 +12,7 @@ type tmplArguments struct {
// Parameters related to current request // Parameters related to current request
AllServersLinkActive bool AllServersLinkActive bool
AllServersURL string AllServersURL string
// Whois specific handling (for its unique URL) // Whois specific handling (for its unique URL)
IsWhois bool IsWhois bool
WhoisTarget string WhoisTarget string
@ -42,12 +43,12 @@ var tmpl = template.Must(template.New("tmpl").Parse(`
<body> <body>
<nav class="navbar navbar-expand-lg navbar-light bg-light"> <nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="/">Bird-lg Go</a> <a class="navbar-brand" href="/">Bird-lg Go</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<li class="nav-item"><a class="nav-link{{ if eq "ipv4" .URLProto }} active{{ end }}" href="/ipv4/{{ .URLOption }}/{{ .URLServer }}/{{ .URLCommand }}"> IPv4 </a></li> <li class="nav-item"><a class="nav-link{{ if eq "ipv4" .URLProto }} active{{ end }}" href="/ipv4/{{ .URLOption }}/{{ .URLServer }}/{{ .URLCommand }}"> IPv4 </a></li>
<li class="nav-item"><a class="nav-link{{ if eq "ipv6" .URLProto }} active{{ end }}" href="/ipv6/{{ .URLOption }}/{{ .URLServer }}/{{ .URLCommand }}"> IPv6 </a></li> <li class="nav-item"><a class="nav-link{{ if eq "ipv6" .URLProto }} active{{ end }}" href="/ipv6/{{ .URLOption }}/{{ .URLServer }}/{{ .URLCommand }}"> IPv6 </a></li>
@ -57,7 +58,7 @@ var tmpl = template.Must(template.New("tmpl").Parse(`
</li> </li>
{{ range $k, $v := .Servers }} {{ range $k, $v := .Servers }}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link{{ if eq $.URLServer $v }} active{{ end }}" href="/{{ $.URLProto }}/{{ $.URLOption }}/{{ $v }}/{{ $.URLCommand }}">{{ $v }}</a> <a class="nav-link{{ if eq $.URLServer $v }} active{{ end }}" href="/{{ $.URLProto }}/{{ $.URLOption }}/{{ $v }}/{{ $.URLCommand }}">{{ $v }}</a>
</li> </li>
{{ end }} {{ end }}
</ul> </ul>
@ -67,26 +68,26 @@ var tmpl = template.Must(template.New("tmpl").Parse(`
{{ $option = "whois" }} {{ $option = "whois" }}
{{ $target = .WhoisTarget }} {{ $target = .WhoisTarget }}
{{ end }} {{ end }}
<form class="form-inline" action="/redir" method="GET"> <form class="form-inline" action="/redir" method="GET">
<div class="input-group"> <div class="input-group">
<select name="action" class="form-control"> <select name="action" class="form-control">
{{ range $k, $v := .Options }} {{ range $k, $v := .Options }}
<option value="{{ $k }}"{{ if eq $k $option }} selected{{end}}>{{ $v }}</option> <option value="{{ $k }}"{{ if eq $k $option }} selected{{end}}>{{ $v }}</option>
{{ end }} {{ end }}
</select> </select>
<input name="proto" class="d-none" value="{{ .URLProto }}"> <input name="proto" class="d-none" value="{{ .URLProto }}">
<input name="server" class="d-none" value="{{ .URLServer }}"> <input name="server" class="d-none" value="{{ .URLServer }}">
<input name="target" class="form-control" placeholder="Target" aria-label="Target" value="{{ $target }}"> <input name="target" class="form-control" placeholder="Target" aria-label="Target" value="{{ $target }}">
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-outline-success" type="submit">&raquo;</button> <button class="btn btn-outline-success" type="submit">&raquo;</button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</nav> </nav>
<div class="container"> <div class="container">
{{ .Content }} {{ .Content }}
</div> </div>
</body> </body>
</html> </html>