From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Thu, 27 Apr 2017 13:09:55 +0000 (+0200)
Subject: update dashbboard placement graph
X-Git-Tag: v3.1~30^2~13^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=7f397b65334ba7315dec35b12e79534c7e114d14;p=osm%2Fvim-emu.git

update dashbboard placement graph
---

diff --git a/src/emuvim/dashboard/index.html b/src/emuvim/dashboard/index.html
index 137bed3..abdc2c6 100755
--- a/src/emuvim/dashboard/index.html
+++ b/src/emuvim/dashboard/index.html
@@ -50,39 +50,6 @@
 
 
 
-<!--<nav class="navbar navbar-default">-->
-  <!--<div class="container-fluid">-->
-    <!--&lt;!&ndash; Brand and toggle get grouped for better mobile display &ndash;&gt;-->
-    <!--<div class="navbar-header">-->
-      <!--<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">-->
-        <!--<span class="sr-only">Toggle navigation</span>-->
-        <!--<span class="icon-bar"></span>-->
-        <!--<span class="icon-bar"></span>-->
-        <!--<span class="icon-bar"></span>-->
-      <!--</button>-->
-    <!--</div>-->
-
-    <!--&lt;!&ndash; Collect the nav links, forms, and other content for toggling &ndash;&gt;-->
-    <!--<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">-->
-      <!--<div class="navbar-form navbar- navbar-btn btn-group" role="group" aria-label="category">-->
-          <!--&lt;!&ndash;<button type="button" class="btn btn-default active" id="btn_tab_pop">Datacenter List</button>&ndash;&gt;-->
-          <!--&lt;!&ndash;<button type="button" class="btn btn-default" id="btn_tab_container">Container List</button>&ndash;&gt;-->
-          <!--&lt;!&ndash;<button type="button" class="btn btn-default" id="btn_tab_other">Other</button> &ndash;&gt;-->
-      <!--</div>-->
-      <!--<form class="navbar-form navbar-right">-->
-	<!--<div class="input-group">-->
-          <!--<span class="input-group-addon">http://</span>-->
-	  <!--<input type="text" class="form-control" placeholder="api-url.or.ip" value="localhost:5001" id="text_api_host" data-provide="typeahead" size="30">-->
-	<!--</div>-->
-	<!--<button type="button" class="btn btn-success" id="btn_connect">Connect &nbsp;<span class="glyphicon glyphicon-play-circle"></span></button>-->
-	<!--<button type="button" class="btn btn-danger disabled" id="btn_disconnect">Disconnect &nbsp;<span class="glyphicon glyphicon-off"></span></button>-->
-		<!--</form>	-->
-    <!--</div>&lt;!&ndash; /.navbar-collapse &ndash;&gt;-->
-  <!--</div>&lt;!&ndash; /.container-fluid &ndash;&gt;-->
-<!--</nav>-->
-
-
-
 </div>
   <div id="content">
 
@@ -105,11 +72,16 @@
   </table>
 </div>
 
-<div>
-<script src="js/d3.v3.min.js"></script>
-<script src="js/graph.js" type="text/javascript"></script>
-</div>
+<div class="spacer">&nbsp;</div>
+
+<div class="panel panel-primary">
+    <div class="panel-heading"><span>Placement Graph</span>&nbsp;&nbsp;</div>
+    <table class="table table-striped table-hover" id="table_graph">
 
+    </table>
+</div>
+    <script src="js/d3.v3.min.js"></script>
+    <script src="js/graph.js" type="text/javascript"></script>
 
 </div>
 
diff --git a/src/emuvim/dashboard/js/graph.js b/src/emuvim/dashboard/js/graph.js
index 01f7e30..bc10d39 100644
--- a/src/emuvim/dashboard/js/graph.js
+++ b/src/emuvim/dashboard/js/graph.js
@@ -2,7 +2,7 @@ var width = 960,
     height = 500,
     color = d3.scale.category20c();
 
-var svg = d3.select("body").append("svg")
+var svg = d3.select("#table_graph").append("svg")
     .attr("width", width)
     .attr("height", height);