Enable debug generation of go-bindata, rename blob/ to ui/

This commit is contained in:
Fabian Reinartz 2015-11-11 15:44:15 +01:00
parent 75fdcf5698
commit 57ca7108aa
42 changed files with 990 additions and 1151 deletions

View file

@ -14,7 +14,12 @@
GO := GO15VENDOREXPERIMENT=1 go
pkgs = $(shell $(GO) list ./... | grep -v /vendor/)
all: format build test
ifdef DEBUG
bindata_flags = -debug
endif
all: assets format build test
test:
@echo ">> running tests"
@ -28,7 +33,7 @@ vet:
@echo ">> vetting code"
@$(GO) vet $(pkgs)
build:
build: assets
@echo ">> building binaries"
@./scripts/build.sh
@ -38,8 +43,7 @@ docker:
assets:
@echo ">> writing assets"
@$(GO) get -u github.com/jteeuwen/go-bindata/...
@$(GO) generate ./web/blob
@$(GO) fmt ./web/blob >/dev/null
@go-bindata $(bindata_flags) -pkg ui -o web/ui/bindata.go -ignore '(.*\.map|bootstrap\.js|bootstrap-theme\.css|bootstrap\.css)' web/ui/templates/... web/ui/static/...
.PHONY: all format build test vet docker assets

1
web/blob/.gitignore vendored
View file

@ -1 +0,0 @@
protocol_buffer.descriptor

File diff suppressed because one or more lines are too long

View file

@ -1,53 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Prometheus Time Series Collection and Processing Server</title>
<script src="{{ pathPrefix }}/static/vendor/js/jquery.min.js"></script>
<script src="{{ pathPrefix }}/static/vendor/bootstrap-3.3.1/js/bootstrap.min.js"></script>
<link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/vendor/bootstrap-3.3.1/css/bootstrap.min.css">
<link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/css/prometheus.css">
<script>
var PATH_PREFIX = "{{ pathPrefix }}";
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
</script>
{{template "head" .}}
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ pathPrefix }}/">Prometheus</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-left">
{{$consoles := consolesPath}}
{{if $consoles}}
<li><a href="{{$consoles}}">Consoles</a></li>
{{ end }}
<li><a href="{{ pathPrefix }}/alerts">Alerts</a></li>
<li><a href="{{ pathPrefix }}/graph">Graph</a></li>
<li><a href="{{ pathPrefix }}/status">Status</a></li>
<li>
<a href="http://prometheus.io" target="_blank">Help</a>
</li>
</ul>
</div>
</div>
</nav>
{{template "content" .}}
</body>
</html>

982
web/ui/bindata.go Normal file

File diff suppressed because one or more lines are too long

View file

Before

Width:  |  Height:  |  Size: 847 B

After

Width:  |  Height:  |  Size: 847 B