Changeset 10789

Timestamp:

07/21/11 11:20:23 (2 years ago)

Author:

edent

Message:

modified settings

Location:

ossiedev/trunk/tools/cornetApps

Files:

• HtmlPages/__init__.pyc (modified) (previous)
• HtmlPages/models.pyc (modified) (previous)
• HtmlPages/static/frames.css (modified) (1 diff)
• HtmlPages/static/frames.js (modified) (2 diffs)
• HtmlPages/views.py (modified) (2 diffs)
• HtmlPages/views.pyc (modified) (previous)
• cornetApps.db (modified) (previous)
• settings.py (modified) (2 diffs)
• static/frames.js (modified) (3 diffs)
• templates/HtmlPages/main_page.html (modified) (2 diffs)

ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.css

@@ -42 +42 @@
         /**background-image:url('floor1_small_nonodes.jpg');**/
         height: 300px;
-        width: 800px;
+        width: inherit;
 }
 

ossiedev/trunk/tools/cornetApps/HtmlPages/static/frames.js

@@ -35 +35 @@
      // 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 +41 @@
           $(tabsId + ' LI.current').removeClass('current');
           $(this).parent().addClass('current');
-          loadTab($(this), viewContainer);
+          loadTab($(this), "#view");
           return false;
      });

ossiedev/trunk/tools/cornetApps/HtmlPages/views.py

@@ -5 +5 @@
 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 +12 @@
 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))
 

ossiedev/trunk/tools/cornetApps/settings.py

@@ -57 +57 @@
 # 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 +73 @@
     # 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/',
 )
 

ossiedev/trunk/tools/cornetApps/static/frames.js

@@ -26 +26 @@
 //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 +41 @@
           $(tabsId + ' LI.current').removeClass('current');
           $(this).parent().addClass('current');
-          loadTab($(this), "#tabs-container");
+          loadTab($(this), "#view");
           return false;
      });
@@ -53 +54 @@
      });
 }
-/**
-$(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();
-});
-**/

ossiedev/trunk/tools/cornetApps/templates/HtmlPages/main_page.html

@@ -8 +8 @@
                 <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 +22 @@
         {% endif %}
 {% endblock %}
+
+
+