Changeset 10814

Timestamp:

08/04/11 16:26:37 (22 months ago)

Author:

edent

Message:

incorporate listing available waveforms from directory

Location:

ossiedev/trunk/tools/cornetApps

Files:

• HtmlPages/static/frames.css (modified) (1 diff)
• HtmlPages/static/frames.js (modified) (3 diffs)
• HtmlPages/views.py (modified) (1 diff)
• HtmlPages/views.pyc (modified) (previous)
• cornetApps.db (modified) (previous)
• static/frames.js (modified) (1 diff)
• templates/HtmlPages/.waveforms.html.swp (added)
• templates/HtmlPages/node_menu.html (modified) (1 diff)
• templates/HtmlPages/ossie.html (modified) (1 diff)
• templates/HtmlPages/waveforms.html (modified) (1 diff)

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

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

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

@@ -6 +6 @@
 });
 
-$(function loadNodeMenu(){
-  $('#load').click(function(){
-    $('#directory').load('/nodeMenu/', function(){
+$("#menu").ready(function(){
+        $('#directory').load('/nodeMenu/', function(){
     //slide menu
       $('#menu ul').hide();
@@ -14 +13 @@
         $(this).next().slideToggle('fast');
       });
+    //load workspace
+      $("#waveform").click(function(){
+          //$("#workspace").load($("#console a").attr("href"));
+          $("#workspace").load("/waveforms/");
+     });
     });
-  });
 });
 
@@ -26 +29 @@
 //load console in workspace
   $('#console').click(function(){
-    $('#workspace').load('#');
+    $('#workspace').load('/grid/');
   });
 });
 
-var viewContainer = "#view";
-var tabsId = '.tabs';
+var viewContainerRightTop = "#view";
+var tabsIdRightTop = '#right_top .tabs';
+
 $("#right-top").ready(function(){
      // Preload tab on page load
-     if($(tabsId + 'LI.current  A').length > 0){
-          loadTab($(tabsId + ' LI.current A'), "#view");
+     if($(tabsIdRightTop + ' LI.current  A').length > 0){
+          loadTab($(tabsIdRightTop + ' LI.current A'), viewContainerRightTop);
      }
-     $(tabsId + ' A').click(function(){
+     $(tabsIdRightTop + ' A').click(function(){
           if($(this).parent().hasClass('current')){ return false; }
-          $(tabsId + ' LI.current').removeClass('current');
+          $(tabsIdRightTop + ' LI.current').removeClass('current');
           $(this).parent().addClass('current');
-          loadTab($(this), "#view");
+          loadTab($(this), viewContainerRightTop);
           return false;
      });
 });
+
+viewContainerRightBot = "#workspace";
+tabsIdRightBot = "#right_bottom .tabs"
+
+$("#right-bottom").ready(function(){
+     // Preload tab on page load
+     if($(tabsIdRightBot + 'LI.current  A').length > 0){
+          loadTab($(tabsIdRightBot + ' LI.current A'), viewContainerRightBot);
+     }
+     $(tabsIdRightBot + ' A').click(function(){
+          if($(this).parent().hasClass('current')){ return false; }
+          $(tabsIdRightBot + ' LI.current').removeClass('current');
+          $(this).parent().addClass('current');
+          loadTab($(this), viewContainerRightBot);
+          return false;
+     });
+});
+
 function loadTab(tabObj, container){
      if(!tabObj || !tabObj.length){ return; }

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

@@ -65 +65 @@
 
 def waveforms(request):
+        ctrlr = Controller(False)
+        ctrlr.createWidgetContainer()
+        ctrlr.CORBAutils.init_CORBA(False)
+        ctrlr.buildModel()
+
+        availableList = ctrlr.model.getSystemWaveforms()
+
         return render_to_response("HtmlPages/waveforms.html", locals(), context_instance=RequestContext(request))
 

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

@@ -26 +26 @@
 //load console in workspace
   $('#console').click(function(){
-    $('#workspace').load('#');
+    $('#workspace').load('/WebDash/');
   });
 });

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

@@ -5 +5 @@
                 <li><a href="#">Node {{node.number}}</a>
                         <ul>
-                                <li><a href="/waveforms/" target="_blank">Waveform</a></li>
+                                <li><a id="waveform" href="#">Waveforms</a></li>
                                 <li>Components</li>
                         </ul>

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

@@ -27 +27 @@
   </div><!--end #right_top-->
   <div id="right_bottom">
-        <!--
-        <ul class="navigation" style="position: relative;">
-                <li id="workspace_nav"><a href="#">Work Space</a></li>
-                <li id="console"><a href="#" >Console</a></li>
-                <li id="properties"><a href="#">Properties</a></li>
-                <li id="task manager"><a href="#">Task Manager</a></li>
-        </ul>
-        -->
         <ul class="tabs">
                 <li id="workspace_nav"><a href="#">Work Space</a></li>
-                <li id="console"><a href="#" >Console</a></li>
+                <li id="console"><a href="/grid/" >Console</a></li>
                 <li id="properties"><a href="#">Properties</a></li>
                 <li id="task manager"><a href="#">Task Manager</a></li>

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

@@ -1 +1 @@
 {% if availableList %}
-<h1>Available Waveforms</h1>
+<h4>Available Waveforms</h4>
 <table>
-
-    
-    
     {% for wave in availableList %}
-        <tr>
+  <tr>
         <td>    {{ wave.getName }} &nbsp; </td>
     <td>    <button onClick="window.location='/WebDash/{{ wave.getName }}/install/'">Install</button> </td>
     {% endfor %}
-    </tr>
-   
+  </tr>
  </table>
 {% else %}