Index: /ossiedev/trunk/tools/cornetApps/HtmlPages/views.py
===================================================================
--- /ossiedev/trunk/tools/cornetApps/HtmlPages/views.py	(revision 10786)
+++ /ossiedev/trunk/tools/cornetApps/HtmlPages/views.py	(revision 10789)
@@ -5,4 +5,6 @@
 from django.shortcuts import render_to_response
 from django.contrib.auth import logout
+from wavedash.src.WavedashController import Controller
+import wavedash.src.WaveformModel
 from HtmlPages.models import *
 from HtmlPages.forms import *
@@ -10,4 +12,10 @@
 def main_page(request):
 	head_title = "Main Page"
+	ctrlr = Controller(False)
+	ctrlr.createWidgetContainer()
+	ctrlr.CORBAutils.init_CORBA(False)
+	ctrlr.buildModel()
+
+	availableList = ctrlr.model.getSystemWaveforms()
 	return render_to_response("HtmlPages/main_page.html", locals(), context_instance=RequestContext(request))
 
Index: /ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.css
===================================================================
--- /ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.css	(revision 10787)
+++ /ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.css	(revision 10789)
@@ -42,5 +42,5 @@
 	/**background-image:url('floor1_small_nonodes.jpg');**/
 	height: 300px;
-	width: 800px;
+	width: inherit;
 }
 
Index: /ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.js
===================================================================
--- /ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.js	(revision 10787)
+++ /ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.js	(revision 10789)
@@ -35,5 +35,5 @@
      // Preload tab on page load
      if($(tabsId + 'LI.current  A').length > 0){
-          loadTab($(tabsId + ' LI.current A'), viewContainer);
+          loadTab($(tabsId + ' LI.current A'), "#view");
      }
      $(tabsId + ' A').click(function(){
@@ -41,5 +41,5 @@
           $(tabsId + ' LI.current').removeClass('current');
           $(this).parent().addClass('current');
-	  loadTab($(this), viewContainer);
+	  loadTab($(this), "#view");
           return false;
      });
Index: /ossiedev/trunk/tools/cornetApps/settings.py
===================================================================
--- /ossiedev/trunk/tools/cornetApps/settings.py	(revision 10785)
+++ /ossiedev/trunk/tools/cornetApps/settings.py	(revision 10789)
@@ -57,5 +57,5 @@
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = '/home/ossie/django/cornetApps/static/'
+STATIC_ROOT = '/home/ossie/workspace/cornetApps/static/'
 
 # URL prefix for static files.
@@ -73,5 +73,5 @@
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-	'/home/ossie/django/cornetApps/HtmlPages/static/',
+	'/home/ossie/workspace/cornetApps/HtmlPages/static/',
 )
 
Index: /ossiedev/trunk/tools/cornetApps/static/frames.js
===================================================================
--- /ossiedev/trunk/tools/cornetApps/static/frames.js	(revision 10787)
+++ /ossiedev/trunk/tools/cornetApps/static/frames.js	(revision 10789)
@@ -26,13 +26,14 @@
 //load console in workspace
   $('#console').click(function(){
-    $('#workspace').load('/grid/');
+    $('#workspace').load('#');
   });
 });
 
+var viewContainer = "#view";
 var tabsId = '.tabs';
-$(document).ready(function(){
+$("#right-top").ready(function(){
      // Preload tab on page load
-     if($(tabsId + ' LI.current A').length > 0){
-          loadTab($(tabsId + ' LI.current A'), "#tabs-container");
+     if($(tabsId + 'LI.current  A').length > 0){
+          loadTab($(tabsId + ' LI.current A'), "#view");
      }
      $(tabsId + ' A').click(function(){
@@ -40,5 +41,5 @@
           $(tabsId + ' LI.current').removeClass('current');
           $(this).parent().addClass('current');
-          loadTab($(this), "#tabs-container");
+	  loadTab($(this), "#view");
           return false;
      });
@@ -53,44 +54,3 @@
      });
 }
-/**
-$(function(){
-	$('#tabs').tabs();
-});
 
-$(function () {
-    var tabs = [];
-    var tabContainers = [];
-    $('ul.tabs a').each(function () {
-      // note that this only compares the pathname, not the entire url
-      // which actually may be required for a more terse solution.
-        if (this.pathname == window.location.pathname) {
-            tabs.push(this);
-            tabContainers.push($(this.hash).get(0));
-        }
-    });
-    
-    $(tabs).click(function () {
-        // hide all tabs
-        $(tabContainers).hide().filter(this.hash).show();
-        
-        // set up the selected class
-        $(tabs).removeClass('selected');
-        $(this).addClass('selected');
-        
-        return false;
-    });
-});
-
-$(function () {
-    var tabContainers = $('div.tabs > div');
-    
-    $('div.tabs ul.tabNavigation a').click(function () {
-        tabContainers.hide().filter(this.hash).show();
-        
-        $('div.tabs ul.tabNavigation a').removeClass('selected');
-        $(this).addClass('selected');
-        
-        return false;
-    }).filter(':first').click();
-});
-**/
Index: /ossiedev/trunk/tools/cornetApps/templates/HtmlPages/main_page.html
===================================================================
--- /ossiedev/trunk/tools/cornetApps/templates/HtmlPages/main_page.html	(revision 10785)
+++ /ossiedev/trunk/tools/cornetApps/templates/HtmlPages/main_page.html	(revision 10789)
@@ -8,5 +8,11 @@
 		<ul>
 			{{user.username}}'s waveforms:
-			<li>ossie_demo</li>
+			{% if availableList %}
+				{% for wave in availableList %}
+					<li>{{ wave.getName }}</li>
+				{% endfor %}
+			{% else %}
+    			<p>No waveforms are available.</p>
+			{% endif %}
 		</ul>
 		<a href="/logout/">Logout here</a>
@@ -16,2 +22,5 @@
 	{% endif %}
 {% endblock %}
+
+
+