Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/nodes.html
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/nodes.html	(revision 11096)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/nodes.html	(revision 11098)
@@ -4,5 +4,5 @@
 <a href='javascript:loadHrefToDiv("#node_space", "{{MEDIA_URL}}/connect/{{floor}}/{{num}}");'>Check Nodebooter</a>
 -->
-<a href='javascript:openWindow("{{MEDIA_URL}}/connect/{{floor}}/{{num}}");'>Check Nodebooter</a>
+<a href="#" onclick='javascript:window.open("{{MEDIA_URL}}/connect/{{floor}}/{{num}}", "","width=400,height=300,location=0");'>Check Nodebooter</a>
 </div>
-<a href='javascript:loadHrefToDiv("#workspace", "{{MEDIA_URL}}/WebDash/index2/{{ip}}");'>View Waveforms</a>
+<a href='javascript:loadHrefToDiv("#workspace", "{{MEDIA_URL}}/WebDash/index2/{{ip}}:{{port}}");'>View Waveforms</a>
Index: /siedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/cornet_login.html
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/cornet_login.html	(revision 11023)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<p> {{user}} </p>
Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/WebDash/running.html
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/WebDash/running.html	(revision 10914)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/WebDash/running.html	(revision 11098)
@@ -4,8 +4,8 @@
 	{% for instance in instancesList %}
 		<tr>
-		<!--<td>	<a href='/~webdemo/django/WebDash/{{ instance.getName }}/display/'>{{ instance.getName }}</a>&nbsp;</td>-->
-		<td><a href='#' onclick='javascript:display("{{instance.getName}}");'>{{instance.getName}}</a></td>
-		<!--<td>	<button onClick="window.location='/WebDash/{{ instance.getName }}/uninstall/'">Uninstall </button></td>-->
-		<td><button onClick='javascript:uninstall("{{ instance.getName }}");'>Uninstall</button></td>
+		<td><a href="#" title="Display Waveform Properties" onClick='javascript:loadHrefToDiv("#workspace","{{MEDIA_URL}}/WebDash/display/{{instance.getName}}/");'>{{instance.getName}}</a></td> 
+		<td><button onClick='javascript:loadHrefToDiv("#apps","{{MEDIA_URL}}/WebDash/uninstall/{{instance.getName}}/");'>Uninstall</button></td>
+	<!--<td><a href='#' onclick='javascript:display("{{instance.getName}}");'>{{instance.getName}}</a></td>
+		<td><button onClick='javascript:uninstall("{{ instance.getName }}");'>Uninstall</button></td>-->
 		</tr>
 	{% endfor %}
Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py	(revision 11096)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py	(revision 11098)
@@ -12,10 +12,12 @@
 
 """
-Testing login
-"""
-def cornet_login(request):
-    user = request.user
-    return render_to_response('DomainMan/cornet_login.html', locals(), context_instance=RequestContext(request))
-
+Checks if running locally or on the web by testing which Django settings are used
+"""
+def isOnWeb():
+    if environ['DJANGO_SETTINGS_MODULE'] == 'cornetApps.settingsWeb':
+        return 1
+    if environ['DJANGO_SETTINGS_MODULE'] == 'cornetApps.settings':
+        return 0
+    
 """
 Connects to a server through a given ip, port and associated username and password 
@@ -31,4 +33,22 @@
     return client
 
+"""
+Connects to a node given its floor and number
+Returns the SSHClient connected to the server
+"""
+def connectViaNode(floor, num, user, password):
+    floor = int(floor)
+    num = int(num)
+    node = Node(floor, num)
+    ip = node.ip
+    port = node.port
+    client = SSHClient()
+    client.set_missing_host_key_policy(AutoAddPolicy())
+    try:
+        client.connect(ip, int(port), user, password)
+    except:
+        raise Http404(u'Incorrect username and password combination')
+    return client
+
 '''
 Tests if nodebooter is running.
@@ -51,6 +71,15 @@
     return 0
 
-'''
-Starts nodeBooter at a given ip and port
+"""
+Views the available nodeBooters to start
+"""
+def selectNodeboter(request, floor, num, user, password):
+    client = connectViaNode(floor, num, user, password)
+    
+    client.close
+    return
+
+'''
+Starts default nodeBooter at a given ip and port
 @param ip: The ip address of the server for the nodes
 @param port: The port, typically 22
@@ -68,4 +97,5 @@
     client.exec_command('cd /sdr ; nodeBooter -D -d dev/nodes/default_GPP_node/DeviceManager.dcd.xml')
     runningNodebooter = nodeBooter_running(client)
+    client.close
     return render_to_response('DomainMan/runningNodebooter.html', locals(), context_instance=RequestContext(request))
 
@@ -93,7 +123,8 @@
     ip = node.ip
     port = node.port
-    client = connect(ip, port, user, password)
+    client = connect(ip, port, user, password)   
     stdin, stdout, stderr = client.exec_command('killall nodeBooter && killall GPP')
     runningNodebooter = nodeBooter_running(client)
+    client.close
     return render_to_response('DomainMan/runningNodebooter.html', locals(), context_instance=RequestContext(request))
 
@@ -114,11 +145,8 @@
         stdin, stdout, stderr = client.exec_command('cd /sdr; nodeBooter -D -d dev/nodes/default_GPP_node/DeviceManager.dcd.xml')
     runningNodebooter = nodeBooter_running(client)
+    client.close
     return render_to_response('DomainMan/console.html', locals(), context_instance=RequestContext(request))
 
-"""
-Views the available nodeBooters to start
-"""
-def selectNodeboter():
-    return
+
 
 """
@@ -137,4 +165,5 @@
         client = connect(ip, port, user, password)
         runningNodebooter = nodeBooter_running(client)
+        client.close
     else:
         message = 'Missing ssh connection parameters'
@@ -159,4 +188,8 @@
     ip = node.ip
     port = node.port
+    if isOnWeb():
+        address = str(ip) + ":" + str(port)
+    else:
+        address = str(ip)
     #index2(request, ip)
     return render_to_response("DomainMan/nodes.html", locals(), context_instance=RequestContext(request))
Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/urls.py
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/urls.py	(revision 11093)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/urls.py	(revision 11098)
@@ -13,5 +13,5 @@
     url(r'^WebDash/$', 'WebDash.views.index', name='index'), 
 	url(r'^WebDash/waveforms/$', 'WebDash.views.waveforms'), 
-    url(r'^WebDash/(?P<instance>.*)/display/$', 'WebDash.views.display', name='display'),
+    url(r'^WebDash/display/(?P<instance>.*)/$', 'WebDash.views.display', name='display'),
 	url(r'^WebDash/configure/$', 'WebDash.views.configure', name='configure'),
     url(r'^WebDash/updateControls/$', 'WebDash.views.updateControls', name='updateControls'),