refactor for new topology view
diff --git a/web/ons-demo/index.html b/web/ons-demo/index.html
index 55237ac..05c20b4 100644
--- a/web/ons-demo/index.html
+++ b/web/ons-demo/index.html
@@ -5,49 +5,63 @@
<link rel="stylesheet" href="css/skin.default.css" type="text/css"/>
<script src="js/d3.v3.js" charset="utf-8"></script>
<script src="js/async.js"></script>
+ <script src="js/debug.js"></script>
+ <script src="js/constants.js"></script>
+ <script src="js/globals.js"></script>
<script src="js/utils.js"></script>
<script src="js/model.js"></script>
<script src="js/controller.js"></script>
+ <script src="js/controllers.js"></script>
+ <script src="js/topology.js"></script>
+ <script src="js/flows.js"></script>
+ <script src="js/init.js"></script>
</head>
<body>
+<div id='background'>
+ <img id='background-image' class='pending' src='assets/logo.svg'/>
+</div>
-<div id='columns'>
- <div id='left'>
- <div class='header'>
- <img id='logo' src='assets/logo.png'></img>
- </div>
- <div id='controllers'>
- <div class='header'>ONOS Nodes</div>
- <div id='controllerList'></div>
- </div>
- </div>
+<div id='contents'>
- <div id='right'>
- <div class='header'>
- <div id='status' class='top'>
- <div class='status'><span class='dynamic' id='activeFlows'>????</span><span class='static'>Flows</span></div>
- <div class='status'><span class='dynamic' id='activeSwitches'>???</span><span class='static'>Active Switches</span></div>
+ <div id='columns'>
+ <div id='left'>
+ <div class='header'>
+ <img id='logo' src='assets/logo.png'></img>
</div>
- <div id='traceButton' class='button'>Trace</div>
- <div id='lastUpdated' class='status top'><span class='static'>Last updated:</span><span id='lastUpdate' class='dynamic'>Mon Mar 18 11:11:12 PDT 2013</span></div>
+ <div id='controllers'>
+ <div class='header'>ONOS Nodes</div>
+ <div id='controllerList'></div>
+ </div>
</div>
- <div id='topology'>
- <div id='svg-container'></div>
+
+ <div id='right'>
+ <div class='header'>
+ <div id='status' class='top'>
+ <div class='status'><span class='dynamic' id='activeFlows'>????</span><span class='static'>Flows</span></div>
+ <div class='status'><span class='dynamic' id='activeSwitches'>???</span><span class='static'>Active Switches</span></div>
+ </div>
+ <div id='traceButton' class='button'>Trace</div>
+ <div id='lastUpdated' class='status top'><span class='static'>Last updated:</span><span id='lastUpdate' class='dynamic'>Mon Mar 18 11:11:12 PDT 2013</span></div>
+ </div>
+ <div id='topology'>
+ <div id='svg-container'></div>
+ </div>
</div>
</div>
-</div>
-<div id='selectedFlowsHeader'>
- <div id='deleteFlow'></div>
- <div id='showFlowChooser' class='flowId'><div class='white-eye'></div></div>
- <div class='srcDPID'>src</div>
- <div class='dstDPID'>dst</div>
- <div class='iperf'>iperf</div>
-</div>
-<div id='selectedFlows'></div>
-<div id='flowChooser'></div>
+ <div id='selectedFlowsHeader'>
+ <div id='deleteFlow'></div>
+ <div id='showFlowChooser' class='flowId'><div class='white-eye'></div></div>
+ <div class='srcDPID'>src</div>
+ <div class='dstDPID'>dst</div>
+ <div class='iperf'>iperf</div>
+ </div>
+ <div id='selectedFlows'></div>
+ <div id='flowChooser'></div>
-<script src="js/app.js"></script>
+ <script src="js/app.js"></script>
+
+</div>
</body>
</html>
\ No newline at end of file