Index: /ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.js
===================================================================
--- /ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.js	(revision 10901)
+++ /ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.js	(revision 10906)
@@ -11,4 +11,5 @@
 });
 
+/**
 $("#menu").ready(function(){
 	$('#directory').load('../nodeMenu/', function(){
@@ -16,20 +17,19 @@
         $('#menu ul').hide();
         $('#menu li a').click(function(){
-          $(this).next().slideToggle('fast');
-	$(".waveform").click(function(e){
-		//e.stopPropagation();
-		$("#console").load("http://cornet.wireless.vt.edu/~webdemo/django/WebDash/192.168.1."+$(this).attr('title')+"/");
-	});
-
+        	$(this).next().slideToggle('fast');
+			$(".waveform").click(function(e){
+				//e.stopPropagation();
+				$("#console").load("http://cornet.wireless.vt.edu/~webdemo/django/WebDash/192.168.1."+$(this).attr('title')+"/");
+			});
         });
-    //load waveforms into workspace
-        $("#waveform").click(function(){
-        	$("#workspace").load($("#waveform").attr('title'));
-	    	//$("#workspace").html("/WebDash/waveforms/");
-	    	$("#right_bottom li.current").removeClass('current');
-	    	$("#waveforms_nav").addClass('current');
-       });
     });
 });
+* 
+* $("#left_top").ready(function(){
+	$(".webdashLink").click(function(){
+		$("#workspace").load("http://cornet.wireless.vt.edu/~webdemo/django/WebDash/192.168.1."+$(this).attr('title')+"/");
+	});
+});
+**/
 
 $("#left_bottom").ready(function(){
@@ -60,18 +60,18 @@
 function loadTab(tabObj, container){
      if(!tabObj || !tabObj.length){ return; }
-     $(container).addClass('loading');
      $(container).fadeOut('fast');
+     $("#loader").fadeIn('fast');
      $(container).load(tabObj.attr('href'), function(){
-          $(container).removeClass('loading');
-          $(container).fadeIn('fast');
+     	$(container).removeClass('loading');
+     	$("#loader").fadeOut('fast');
+     	$(container).fadeIn('fast');
+     	$("a#node").click(function(){
+			$("#directory").load("http://cornet.wireless.vt.edu/~webdemo/django/WebDash/192.168.1."+$(this).attr('title')+"/");
+		});
      });
 }
-     
+ 
 $("#right_top").ready(function(){
-	setTabs("#view", "#right_top .tabs");
-});
-
-$("#right_bottom").ready(function(){
-	setTabs("#workspace", "#right_bottom .tabs");
+	setTabs("#console", "#right_top .tabs");
 });
 
@@ -86,10 +86,2 @@
 	$("#apps").load("WebDash/uninstall/"+waveform);
 }
-
-/**
-$("#left_top").ready(function(){
-	$(".webdashLink").click(function(){
-		$("#workspace").load("http://cornet.wireless.vt.edu/~webdemo/django/WebDash/192.168.1."+$(this).attr('title')+"/");
-	});
-});
-**/