Changeset 10944

Show
Ignore:
Timestamp:
11/09/11 02:45:42 (19 months ago)
Author:
edent
Message:

fix local version

Location:
ossiedev/branches/jsnyder/trunk/tools/cornetApps
Files:
1 removed
4 modified

Legend:

Unmodified
Added
Removed

  • ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py

    r10900 r10944  
    3434def setFloorNodes(): 
    3535        floorBuffer = 10 #used to calculate the ip address of the node 
    36         floor1_usrp_status=[0,0,0,0,0,0,0,0,0,0,0,0] 
     36        floor1_usrp_status=[0,0,0,1,0,0,0,0,0,1,0,0] 
    3737        floor2_usrp_status=[1,1,0,1,0,1,0,1,0,0,1,0] 
    3838        floor3_usrp_status=[1,1,1,1,1,1,1,0,1,0,0,1] 
    … …  
    5252def map_view(request, floor_num): 
    5353        floor=floor_num 
    54         node_position = ((169,711),(170,651),(170,597),(211,576),(170,512),(170,449),(190,394),(170,334),(194,298),(170,247),(192,210),(158,145)) 
     54        node_position_1 = ((169,711),(170,651),(170,597),(211,576),(170,512),(170,449),(190,394),(170,334),(194,298),(170,247),(192,210),(158,145)) 
     55        node_position_2 = ((168,708),(168,639),(168,590),(200,542),(168,508),(204,431),(229,400),(168,338),(204,324),(204,273),(204,228),(204,193)) 
     56        node_position_3 = ((175,705),(175,653),(175,598),(206,558),(175,518),(209,452),(236,404),(158,377),(209,333),(210,285),(209,250),(207,206)) 
     57        node_position_4 = ((184,712),(184,666),(184,613),(219,557),(184,517),(222,437),(248,405),(168,372),(221,335),(220,275),(214,226),(219,190)) 
    5558        floor_list = setFloorNodes() 
    5659        return render_to_response("HtmlPages/map.html", locals(), context_instance=RequestContext(request)) 

  • ossiedev/branches/jsnyder/trunk/tools/cornetApps/settings.py

    r10914 r10944  
    1 # Django settings for cornetApps project. 
     1# Django settings for running cornetApps project *locally* 
    22 
    33DEBUG = True 

  • ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/ossie.html

    r10936 r10944  
    1 {% ifequal floor "1" %} 
    2         <img style="z-index:-1; top: 0px; left: 0px;" src="{{STATIC_URL}}floor1_small_nonodes.jpg"/> 
    3         {% for node in floor_list.0 %} 
    4                 {% for node_top, node_left in node_position_1 %} 
    5                 {% if node and forloop.counter0 == forloop.parentloop.counter0 %} 
    6                         <a id="node" href="#"><img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}green_ball.gif"/></a> 
    7                 {% else %} 
    8                         {% if forloop.counter0 == forloop.parentloop.counter0 %} 
    9                         <img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}grey_ball.gif"/> 
    10                         {% endif %} 
    11                 {% endif %} 
    12                 {% endfor %} 
    13         {% endfor %} 
    14 {% endifequal %} 
    15 {% ifequal floor "2" %} 
    16         <img style="z-index:-1; top: 0px; left: 0px;" src="{{STATIC_URL}}floor2_small_nonodes.jpg"/> 
    17         {% for node in floor_list.1 %} 
    18                 {% for node_top, node_left in node_position_2 %} 
    19                 {% if node and forloop.counter0 == forloop.parentloop.counter0 %} 
    20                         <a id="node" href="#"><img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}green_ball.gif"/></a> 
    21                 {% else %} 
    22                         {% if forloop.counter0 == forloop.parentloop.counter0 %} 
    23                         <img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}grey_ball.gif"/> 
    24                         {% endif %} 
    25                 {% endif %} 
    26                 {% endfor %} 
    27         {% endfor %} 
    28 {% endifequal %} 
    29 {% ifequal floor "3" %} 
    30         <img style="z-index:-1; top: 0px; left: 0px;" src="{{STATIC_URL}}floor3_small_nonodes.jpg"/> 
    31         {% for node in floor_list.2 %} 
    32                 {% for node_top, node_left in node_position_3 %} 
    33                 {% if node and forloop.counter0 == forloop.parentloop.counter0 %} 
    34                         <a id="node" href="#"><img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}green_ball.gif"/></a> 
    35                 {% else %} 
    36                         {% if forloop.counter0 == forloop.parentloop.counter0 %} 
    37                         <img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}grey_ball.gif"/> 
    38                         {% endif %} 
    39                 {% endif %} 
    40                 {% endfor %} 
    41         {% endfor %} 
    42 {% endifequal %} 
    43 {% ifequal floor "4" %} 
    44         <img style="z-index:-1; top: 0px; left: 0px;" src="{{STATIC_URL}}floor4_small_nonodes.jpg"/> 
    45         {% for node in floor_list.3 %} 
    46                 {% for node_top, node_left in node_position_4 %} 
    47                 {% if node and forloop.counter0 == forloop.parentloop.counter0 %} 
    48                         <a id="node" href="#"><img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}green_ball.gif"/></a> 
    49                 {% else %} 
    50                         {% if forloop.counter0 == forloop.parentloop.counter0 %} 
    51                         <img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}grey_ball.gif"/> 
    52                         {% endif %} 
    53                 {% endif %} 
    54                 {% endfor %} 
    55         {% endfor %} 
    56 {% endifequal %} 
     1{% extends "base.html"%} 
     2{%block title%}OSSIE for the Web{%endblock%} 
     3{%block header%} 
     4<link href="{{STATIC_URL}}frames.css" rel="stylesheet" type="text/css"/> 
     5<script src="{{STATIC_URL}}jquery.js" type="text/javascript"></script> 
     6<script src="{{STATIC_URL}}frames.js" type="text/javascript"></script> 
     7{%endblock%} 
     8{%block content%} 
     9 <div id="column_left"> 
     10  <div id="left_top"> 
     11   <p>Waveforms 
     12                <a href="/"><img src="{{STATIC_URL}}pics/home.png" title="Home"/></a>  
     13                <a href="#" id="load"><img src="{{STATIC_URL}}pics/refresh.png" title="Refresh Node Directory"/></a> 
     14                <a href="/logout/"><img src="{{STATIC_URL}}pics/logout.png" title="Logout"/></a></p> 
     15        <br/> 
     16        <div id="directory">    </div>{#end menu div#} 
     17        </div><!--end #left_top--> 
     18  <div id="left_bottom"> 
     19   <p>Active Applications <a href="#" title="/WebDash/running/" class="ajax"><img src="{{STATIC_URL}}pics/refresh.png" title="Refresh Active Applications"/></a></p> 
     20   <div id="apps"></div> 
     21  </div><!--end #left_bottom--> 
     22 </div><!--end #column_left--> 
     23 <div id="column_right"> 
     24  <div id="right_top"> 
     25        <ul class="tabs"> 
     26                <li class="current"><a href="../grid/">Grid View</a></li> 
     27                <li><a href="../map/1/">Floor 1</a></li> 
     28                <li><a href="../map/2/">Floor 2</a></li> 
     29                <li><a href="../map/3/">Floor 3</a></li> 
     30                <li><a href="../map/4/">Floor 4</a></li> 
     31        <li id="task manager"><a href="../tasks/">Task Manager</a></li>         
     32    </ul> 
     33    <br/> 
     34    <p><img id="loader" src="{{STATIC_URL}}loading.gif" style="position:absolute;"/></p> 
     35        <div id="console"></div> 
     36  </div><!--end #right_top--> 
     37  <div id="right_bottom"> 
     38        <div id="workspace" class="tabs-container">Work space </div> 
     39    <br/> 
     40      </div><!--end #right_bottom--> 
     41 </div><!--end #column_right--> 
     42{%endblock%}