Merge pull request google#1808 from dashpole/update_ui

Update jquery and bootstrap dependencies
mikkeloscar · Nov 17, 2017 · 577f63f · 577f63f
2 parents 5231853 + ee8cbf1
commit 577f63f
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 74 deletions.
diff --git a/pages/assets/html/containers.html b/pages/assets/html/containers.html
@@ -17,17 +17,18 @@
 <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">
 
     <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>

diff --git a/pages/assets/js/bootstrap-3.1.1.min.js b/pages/assets/js/bootstrap-3.1.1.min.js
diff --git a/pages/assets/js/bootstrap-4.0.0-beta.2.min.js b/pages/assets/js/bootstrap-4.0.0-beta.2.min.js
diff --git a/pages/assets/js/jquery-1.10.2.min.js b/pages/assets/js/jquery-1.10.2.min.js
diff --git a/pages/assets/js/jquery-3.0.0.min.js b/pages/assets/js/jquery-3.0.0.min.js
diff --git a/pages/assets/js/popper.min.js b/pages/assets/js/popper.min.js
diff --git a/pages/assets/styles/bootstrap-3.1.1.min.css b/pages/assets/styles/bootstrap-3.1.1.min.css
diff --git a/pages/assets/styles/bootstrap-4.0.0-beta.2.min.css b/pages/assets/styles/bootstrap-4.0.0-beta.2.min.css
diff --git a/pages/static/assets.go b/pages/static/assets.go
diff --git a/pages/static/static.go b/pages/static/static.go
@@ -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) {

diff --git a/pages/templates.go b/pages/templates.go