Merge pull request #63 from AweSim-OSC/minor_fixes

Minor fixes
OSC · Sep 7, 2018 · c1c2523 · c1c2523
2 parents 30fce48 + c274b47
commit c1c2523
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/views/layout.erb b/views/layout.erb
@@ -2,6 +2,7 @@
 <html>
 <head>
   <meta charset="UTF-8">
+  <meta name="turbolinks-root" content="<%=url("/")%>">
   <title>System Status</title>
   <link rel="stylesheet" type="text/css" href="<%= url("/bootstrap-3.3.7/css/bootstrap.min.css") %>">
   <link rel="stylesheet" href="<%= url("/fontawesome-5.1.0/css/all.css") %>">
@@ -81,7 +82,6 @@
   <script src="<%= url("/jquery-1.12.4/jquery.min.js") %>"></script>
   <script type="text/javascript" src="<%= url("/uri-1.18.4/URI.min.js") %>"></script>
   <script src="<%= url("/bootstrap-3.3.7/js/bootstrap.min.js") %>"></script>
-  <meta name="turbolinks-root" content="<%=url("/")%>">
 </head>
 <body>
 
@@ -144,11 +144,14 @@
   </div><!-- /.container -->
 </footer>
 <script>
-$('[data-toggle="tooltip"]').tooltip();
 // update cluster information graphs every 5 seconds
-setTimeout($(".updateable:visible").each(function(){
-   return this.src = URI(this.src).setSearch("timestamp", (new Date).getTime()).toString();
-}),5000);
+//TODO: this won't work in turbolinks; rather setInterval and clearInterval
+//      would need to be set during appropriate turbolinks events
+//setInterval(function(){
+//    $(".updateable:visible").each(function(){
+//      this.src = URI(this.src).setSearch("timestamp", (new Date).getTime()).toString();
+//    });
+//}, 5000);
 </script>
 
 </body>