prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved html template into assets directory

Browse Source 
Reformated to .html file, and added build commands to assets.sh
This commit is contained in:
Ainsley Chong 2016-04-26 13:14:06 -07:00
parent 468b7d10e4
commit b7faf83410
4 changed files with 305 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
build/assets.sh
View File

@ -15,22 +15,43 @@
# limitations under the License. # limitations under the License.
GIT_ROOT=$(dirname "${BASH_SOURCE}")/.. GIT_ROOT=$(dirname "${BASH_SOURCE}")/..
YEAR=$(date +%Y)
TMP_OUTPUT="/tmp/cadvisor_assets.go" ASSETS_INPUT_DIRS="$GIT_ROOT/pages/assets/js/... $GIT_ROOT/pages/assets/styles/..."
ASSETS_OUTPUT=$GIT_ROOT/pages/static/assets.go ASSETS_OUTPUT_PATH="$GIT_ROOT/pages/static/assets.go"
ASSETS_PACKAGE="static"
TEMPLATES_INPUT_DIRS="$GIT_ROOT/pages/assets/html/..."
TEMPLATES_OUTPUT_PATH="$GIT_ROOT/pages/templates.go"
TEMPLATES_PACKAGE="pages"
go get -u github.com/jteeuwen/go-bindata/... go get -u github.com/jteeuwen/go-bindata/...
for f in $GIT_ROOT/pages/assets/**/*; do build_asset () {
if [ "$f" -nt $ASSETS_OUTPUT -o ! -e $ASSETS_OUTPUT ]; then local package=$1
go-bindata -o $ASSETS_OUTPUT -pkg static $GIT_ROOT/pages/assets/... local output_path=$2
cat build/boilerplate/boilerplate.go.txt | sed "s/YEAR/$YEAR/" > "${TMP_OUTPUT}" local input_dirs=${@:3}
echo -e "// generated by build/assets.sh; DO NOT EDIT\n" >> "${TMP_OUTPUT}" local tmp_output=$(mktemp)
cat "${ASSETS_OUTPUT}" >> "${TMP_OUTPUT}" local year=$(date +%Y)
gofmt -w -s "${TMP_OUTPUT}"
mv "${TMP_OUTPUT}" "${ASSETS_OUTPUT}" go-bindata -o $output_path -pkg $package $input_dirs
break cat build/boilerplate/boilerplate.go.txt | sed "s/YEAR/$year/" > "${tmp_output}"
echo -e "// generated by build/assets.sh; DO NOT EDIT\n" >> "${tmp_output}"
cat "${output_path}" >> "${tmp_output}"
gofmt -w -s "${tmp_output}"
mv "${tmp_output}" "${output_path}"
}
for f in $GIT_ROOT/pages/assets/js/* $GIT_ROOT/pages/assets/styles/*; do
if [ "$f" -nt $ASSETS_OUTPUT_PATH -o ! -e $ASSETS_OUTPUT_PATH ]; then
build_asset "$ASSETS_PACKAGE" "$ASSETS_OUTPUT_PATH" "$ASSETS_INPUT_DIRS"
break;
fi
done
for f in $GIT_ROOT/pages/assets/html/*; do
if [ "$f" -nt $TEMPLATES_OUTPUT_PATH -o ! -e $TEMPLATES_OUTPUT_PATH ]; then
build_asset "$TEMPLATES_PACKAGE" "$TEMPLATES_OUTPUT_PATH" "$TEMPLATES_INPUT_DIRS"
break;
fi fi
done done

30
pages/containers_html.go → pages/assets/html/containers.html
View File

@ -1,20 +1,19 @@
// Copyright 2014 Google Inc. All Rights Reserved. <!--
// Copyright 2014 Google Inc. All Rights Reserved.
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package pages Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
const containersHtmlTemplate = `
<html> <html>
<head> <head>
<title>cAdvisor - {{.DisplayName}}</title> <title>cAdvisor - {{.DisplayName}}</title>
@ -241,4 +240,3 @@ const containersHtmlTemplate = `
</script> </script>
</body> </body>
</html> </html>
`

3
pages/pages.go
View File

@ -66,8 +66,9 @@ type pageData struct {
} }
func init() { func init() {
containersHtmlTemplate, _ := Asset("pages/assets/html/containers.html")
pageTemplate = template.New("containersTemplate").Funcs(funcMap) pageTemplate = template.New("containersTemplate").Funcs(funcMap)
_, err := pageTemplate.Parse(containersHtmlTemplate) _, err := pageTemplate.Parse(string(containersHtmlTemplate))
if err != nil { if err != nil {
glog.Fatalf("Failed to parse template: %s", err) glog.Fatalf("Failed to parse template: %s", err)
} }

256
pages/templates.go Normal file
View File

File diff suppressed because one or more lines are too long