update jquery and bootstrap

This commit is contained in:
David Ashpole 2017-11-17 13:17:51 -08:00
parent 5231853e71
commit ee8cbf1054
11 changed files with 104 additions and 74 deletions

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>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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) {

File diff suppressed because one or more lines are too long