X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=blobdiff_plain;f=luci-app-bmx6%2Ffiles%2Fusr%2Flib%2Flua%2Fluci%2Fview%2Fbmx6%2Fgraph.htm;fp=luci-app-bmx6%2Ffiles%2Fusr%2Flib%2Flua%2Fluci%2Fview%2Fbmx6%2Fgraph.htm;h=580732efb08ab8042562abb81c15baa303997d6b;hp=401e93297268322f4aac095d2b48034bbb3cf71e;hb=1bc988c09ceb2aa0338270d5e5939d0904022e42;hpb=9646815e7d1bc57dd77e1a250c62bc944a0ea5b2

diff --git a/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/graph.htm b/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/graph.htm
index 401e932..580732e 100644
--- a/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/graph.htm
+++ b/luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/graph.htm
@@ -29,11 +29,6 @@ the file called "COPYING".
 
 <%+header%>
 
-<script type="text/javascript" src="<%=resource%>/bmx6/js/raphael-min.js"></script>
-<script type="text/javascript" src="<%=resource%>/bmx6/js/dracula_graffle.js"></script>
-<script type="text/javascript" src="<%=resource%>/bmx6/js/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="<%=resource%>/bmx6/js/dracula_graph.js"></script>
-
 <button id="redraw" onclick="redraw();">&nbsp redraw &nbsp</button>
 
 <div id="wait" style="text-align: center">
@@ -45,66 +40,10 @@ the file called "COPYING".
 
 <div id="canvas" style="min-width:800px; min-height:800px"></div>
 
-<script type="text/javascript">//<![CDATA[
-	var redraw;
-
-	XHR.get('<%=luci.dispatcher.build_url(unpack(location))%>', null,
-		function(x, data)
-		{
-			var g = new Graph();
-			var seen = { };
-
-			for (var i = 0; i < (data.length); i++)
-			{
-				// node->node
-				if (data[i].name)
-					{
-					for (var j = 0; j < (data[i].links.length); j++)
-						 {
-							var key = (data[i].name < data[i].links[j].name)
-							? data[i].name + '|' + data[i].links[j].name
-							: data[i].links[j].name + '|' + data[i].name;
-
-							var rxRate = data[i].links[j].rxRate;
-							var txRate = data[i].links[j].txRate;
-
-							if (!seen[key] && rxRate>0 && txRate>0)
-						 	{
-							 g.addEdge(data[i].name, data[i].links[j].name,
-							 	{ label: rxRate + '/' + txRate,
-								directed: false, stroke: '#aaaaaa', fill: '#ffffff',
-								'label-style': { 'font-size': 8 }});
-							 seen[key] = true;
-							 }
-						 }
-					}
-					//g.addEdge(data[i].router, data[i].neighbor,
-					//	{ label: data[i].label, directed: true, stroke: '#aaaaaa' });
-				// node->leaf
-				//else if (data[i].router && data[i].gateway)
-				//	g.addEdge(data[i].router, data[i].gateway,
-				//		{ label: 'leaf', stroke: '#cccccc' });
-			}
-
-			var canvas = document.getElementById('canvas');
-
-			var layouter = new Graph.Layout.Spring(g);
-			layouter.layout();
-			
-			var divwait = document.getElementById("wait");
-			divwait.parentNode.removeChild(divwait);
-
-			var renderer = new Graph.Renderer.Raphael(canvas.id, g, canvas.offsetWidth, canvas.offsetHeight);
-			renderer.draw();
-
-			redraw = function() {
-				layouter.layout();
-				renderer.draw();
-			}
-
-		}
-	);
-//]]></script>
-
+<script type="text/javascript" src="<%=resource%>/bmx6/js/raphael-min.js"></script>
+<script type="text/javascript" src="<%=resource%>/bmx6/js/dracula_graffle.js"></script>
+<script type="text/javascript" src="<%=resource%>/bmx6/js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="<%=resource%>/bmx6/js/dracula_graph.js"></script>
+<script type="text/javascript" src="<%=resource%>/bmx6/js/bmx6-graph.js"></script>
 
 <%+footer%>