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

Merge pull request #1808 from dashpole/update_ui

Browse Source 
Update jquery and bootstrap dependencies
This commit is contained in:
David Ashpole 2017-11-17 14:42:58 -08:00 committed by GitHub
commit 577f63f3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 104 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pages/assets/html/containers.html
View File

@ -17,8 +17,9 @@
<html>
<head>
<title>cAdvisor - {{.DisplayName}}</title>
<script src="{{.Root}}static/popper.min.js"></script>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="{{.Root}}static/bootstrap-3.1.1.min.css">
<link rel="stylesheet" href="{{.Root}}static/bootstrap-4.0.0-beta.2.min.css">
<!-- Optional theme -->
<link rel="stylesheet" href="{{.Root}}static/bootstrap-theme-3.1.1.min.css">
@ -26,8 +27,8 @@
<link rel="stylesheet" href="{{.Root}}static/containers.css">
<!-- Latest compiled and minified JavaScript -->
<script src="{{.Root}}static/jquery-1.10.2.min.js"></script>
<script src="{{.Root}}static/bootstrap-3.1.1.min.js"></script>
<script src="{{.Root}}static/jquery-3.0.0.min.js"></script>
<script src="{{.Root}}static/bootstrap-4.0.0-beta.2.min.js"></script>
<script type="text/javascript" src="{{.Root}}static/google-jsapi.js"></script>
<script type="text/javascript" src="{{.Root}}static/containers.js"></script>

6
pages/assets/js/bootstrap-3.1.1.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
pages/assets/js/bootstrap-4.0.0-beta.2.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
pages/assets/js/jquery-1.10.2.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
pages/assets/js/jquery-3.0.0.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

5
pages/assets/js/popper.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
pages/assets/styles/bootstrap-3.1.1.min.css vendored
View File

File diff suppressed because one or more lines are too long

7
pages/assets/styles/bootstrap-4.0.0-beta.2.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

103
pages/static/assets.go
View File

File diff suppressed because one or more lines are too long

24
pages/static/static.go
View File

@ -28,25 +28,27 @@ import (
const StaticResource = "/static/"
var bootstrapJs, _ = Asset("pages/assets/js/bootstrap-3.1.1.min.js")
var popper, _ = Asset("pages/assets/js/popper.min.js")
var bootstrapJs, _ = Asset("pages/assets/js/bootstrap-4.0.0-beta.2.min.js")
var containersJs, _ = Asset("pages/assets/js/containers.js")
var gchartsJs, _ = Asset("pages/assets/js/gcharts.js")
var googleJsapiJs, _ = Asset("pages/assets/js/google-jsapi.js")
var jqueryJs, _ = Asset("pages/assets/js/jquery-1.10.2.min.js")
var jqueryJs, _ = Asset("pages/assets/js/jquery-3.0.0.min.js")
var bootstrapCss, _ = Asset("pages/assets/styles/bootstrap-3.1.1.min.css")
var bootstrapCss, _ = Asset("pages/assets/styles/bootstrap-4.0.0-beta.2.min.css")
var bootstrapThemeCss, _ = Asset("pages/assets/styles/bootstrap-theme-3.1.1.min.css")
var containersCss, _ = Asset("pages/assets/styles/containers.css")
var staticFiles = map[string][]byte{
"bootstrap-3.1.1.min.css": bootstrapCss,
"bootstrap-3.1.1.min.js": bootstrapJs,
"bootstrap-theme-3.1.1.min.css": bootstrapThemeCss,
"containers.css": containersCss,
"containers.js": containersJs,
"gcharts.js": gchartsJs,
"google-jsapi.js": googleJsapiJs,
"jquery-1.10.2.min.js": jqueryJs,
"popper.min.js": popper,
"bootstrap-4.0.0-beta.2.min.css": bootstrapCss,
"bootstrap-4.0.0-beta.2.min.js": bootstrapJs,
"bootstrap-theme-3.1.1.min.css": bootstrapThemeCss,
"containers.css": containersCss,
"containers.js": containersJs,
"gcharts.js": gchartsJs,
"google-jsapi.js": googleJsapiJs,
"jquery-3.0.0.min.js": jqueryJs,
}
func HandleRequest(w http.ResponseWriter, u *url.URL) {

2
pages/templates.go
View File

File diff suppressed because one or more lines are too long