Changeset 10836

Timestamp:

08/18/11 13:41:10 (22 months ago)

Author:

edent

Message:

link node status of views to node directory

Location:

ossiedev/trunk/tools/cornetApps

Files:

• HtmlPages/static/frames.js (modified) (2 diffs)
• HtmlPages/views.py (modified) (2 diffs)
• HtmlPages/views.pyc (modified) (previous)
• templates/HtmlPages/node_menu.html (modified) (1 diff)
• templates/HtmlPages/nodes.html (modified) (1 diff)
• urls.py (modified) (1 diff)

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

@@ -11 +11 @@
 });
 
-
-
 $("#menu").ready(function(){
-        $('#directory').load('/nodeMenu/', function(){
+        $('#directory').load('/nodes/', function(){
     //slide menu
-      $('#menu ul').hide();
-      $('#menu li a').click(function(){
-        $(this).next().slideToggle('fast');
-      });
+        $('#menu ul').hide();
+        $('#menu li a').click(function(){
+          $(this).next().slideToggle('fast');
+        });
     //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');
-     });
+        $("#waveform").click(function(){
+                $("#workspace").load($("#waveform").attr('title'));
+                //$("#workspace").html("/WebDash/waveforms/");
+                $("#right_bottom li.current").removeClass('current');
+                $("#waveforms_nav").addClass('current');
+       });
     });
 });
@@ -35 +33 @@
                 $("#apps").load($(this).attr('title'));
         });
+        $('#apps a').click(function(e){
+                e.stopPropogation();
+                $('#workspace').load($(this).attr('href'));
+        }
 });
 

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

@@ -33 +33 @@
 
 def setFloorNodes():
-        floor1_usrp_status=[1,0,1,0,1,0,1,0,0,1,0,0]
+        floor1_usrp_status=[1,1,1,1,1,0,0,0,0,0,0,0]
         floor2_usrp_status=[1,1,0,1,0,1,0,1,0,0,1,0]
         floor3_usrp_status=[0,0,1,0,0,1,0,0,1,0,0,1]
@@ -66 +66 @@
 
 @login_required
-def loadNode(request, node_num):
+def nodes(request):
+        floor_list = setFloorNodes()
         return render_to_response("HtmlPages/nodes.html", locals(), context_instance=RequestContext(request))
 

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

@@ -2 +2 @@
         <ul id="menu">
         {% for node in nodes %}
-                <!--<li><a href="/loadNode/{{node.number}}/" target="_blank">Node {{node.number}}</a>-->
                 <li><a href="#">Node {{node.number}}</a>
                         <ul>

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

@@ -1 @@
-{% if nodes %}
-        <ul>
-        {% for node in nodes %}
-                <li><a href="/loadNode/{{node.number}}/">Node {{node.number}}</a></li>
+{% if floor_list %}
+        <ul id="menu">
+        {% for node in floor_list.0 %}
+                {% if node %}
+                <li><a href="#">Node {{forloop.counter}}</a>
+                        <ul>
+                                <li><a id="waveform" href="#" title="/WebDash/waveforms/">Waveforms</a></li>
+                                <li>Components</li>
+                        </ul>
+                </li>
+                {% endif %}
         {%endfor%}
         </ul>

ossiedev/trunk/tools/cornetApps/urls.py

@@ -23 +23 @@
         url(r'^nodeMenu/$', 'HtmlPages.views.node_menu'),
         url(r'^loadNode/(\d*)/$', 'HtmlPages.views.loadNode'),
+    url(r'^nodes/$', 'HtmlPages.views.nodes'),
         url(r'^map/(\d*)/$', 'HtmlPages.views.map_view'),
         url(r'^grid/$', 'HtmlPages.views.grid_view'),