Browse Source

Merge pull request #626 from quinox/fix-625

#625 Fix incorrect consoles URL
pull/627/head
Björn Rabenstein 10 years ago
parent
commit
e1b5f18dee
  1. 2
      web/templates/_base.html
  2. 4
      web/web.go

2
web/templates/_base.html

@ -29,7 +29,7 @@
<ul class="nav navbar-nav navbar-left">
{{$consoles := getConsoles}}
{{if $consoles}}
<li><a href="{{ pathPrefix }}{{$consoles}}">Consoles</a></li>
<li><a href="{{$consoles}}">Consoles</a></li>
{{ end }}
<li><a href="{{ pathPrefix }}alerts">Alerts</a></li>
<li><a href="{{ pathPrefix }}graph">Graph</a></li>

4
web/web.go

@ -139,11 +139,11 @@ func getTemplateFile(name string) (string, error) {
}
func getConsoles(pathPrefix string) string {
if _, err := os.Stat(pathPrefix + *consoleTemplatesPath + "/index.html"); !os.IsNotExist(err) {
if _, err := os.Stat(*consoleTemplatesPath + "/index.html"); !os.IsNotExist(err) {
return pathPrefix + "consoles/index.html"
}
if *userAssetsPath != "" {
if _, err := os.Stat(pathPrefix + *userAssetsPath + "/index.html"); !os.IsNotExist(err) {
if _, err := os.Stat(*userAssetsPath + "/index.html"); !os.IsNotExist(err) {
return pathPrefix + "user/index.html"
}
}

Loading…
Cancel
Save