Changeset 10914

Timestamp:

10/19/11 21:35:23 (19 months ago)

Author:

edent

Message:

rearrange frames

Location:

ossiedev/trunk/tools/cornetApps

Files:

• HtmlPages/static/frames.css (modified) (2 diffs)
• HtmlPages/static/frames.js (modified) (3 diffs)
• HtmlPages/static/frames1.js (added)
• HtmlPages/static/pics/grey_ball.gif (added)
• cornetApps.db (modified) (previous)
• settings.py (modified) (4 diffs)
• static/frames.css (modified) (1 diff)
• static/frames.js (modified) (2 diffs)
• static/grey_ball.gif (added)
• static/pics/grey_ball.gif (added)
• templates/HtmlPages/grid.html (modified) (1 diff)
• templates/HtmlPages/map.html (modified) (1 diff)
• templates/HtmlPages/ossie.html (modified) (1 diff)
• templates/WebDash/index.html (modified) (2 diffs)
• templates/WebDash/running.html (modified) (1 diff)

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

@@ -15 +15 @@
         top: 0;
         left: 0;
-        width: 250px;
+        width: 315px;
 }
 
@@ -42 +42 @@
 #right_top{
         /**background-image:url('floor1_small_nonodes.jpg');**/
-        height: 400px;
+        /*height: 275px;*/
         /*width: 1000px;*/
         overflow: auto;

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

@@ -6 +6 @@
 });
 
-$(function closePage(){
-  window.onbeforeunload=function(){
-    return 'Please remember to uninstall ALL WAVEFORMS AND SCRIPTS before leaving.';}
-});
 
 /**
@@ -34 +30 @@
 
 $("#left_bottom").ready(function(){
-        $("#apps").load("WebDash/running/");
+        $("#apps").load("/WebDash/running/");
         $("a.ajax").click(function(){
                 $("#apps").load($(this).attr('title'));
@@ -77 +73 @@
 
 function install(waveform){
-        var oldunload = window.onbeforeunload;
-        delete window.onbeforeunload;
-        $("#apps").load("WebDash/install/"+waveform);
-        window.onbeforeunload = oldunload;
+        //$("#apps").load("/~webdemo/django/WebDash/install/"+waveform);
+        $("#apps").load("/WebDash/install/"+waveform+"/");
+        $("#apps").load("/WebDash/running/");
 }
 
 function uninstall(waveform){
-        $("#apps").load("WebDash/uninstall/"+waveform);
+        $("#apps").load("/WebDash/uninstall/"+waveform+"/");
 }
+
+function loadNode(ip) {
+        //$("#directory").load("/~webdemo/django/WebDash/192.168.1."+node_ip+"/");
+        //$("#directory").load("/WebDash/"+node_ip+"/");
+        $("#directory").load("/WebDash/127.0.0."+ip+"/");
+}
+
+function display(instance){
+        $("#workspace").load("/WebDash/"+instance+"/display/");
+}
+
+/**
+
+$(document).window.onbeforeunload=function(){
+    return 'Please remember to uninstall ALL WAVEFORMS AND SCRIPTS before leaving.';}
+    
+**/

ossiedev/trunk/tools/cornetApps/settings.py

@@ -13 +13 @@
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        #'NAME': 'cornetApps.db',                      # Or path to database file if using sqlite3.
-        'NAME': '/home/webdemo/cornetApps/cornetApps.db',  #webserver
+        'NAME': 'cornetApps.db',                      # Or path to database file if using sqlite3.
+        #'NAME': '/home/webdemo/cornetApps/cornetApps.db',  #webserver
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
@@ -62 +62 @@
 # Example: "/home/media/media.lawrence.com/static/"
 
-#STATIC_ROOT = '/home/ossie/workspace/cornetApps/static/'
-STATIC_ROOT = 'static/'   #webserver
+STATIC_ROOT = '/home/ossie/workspace/cornetApps/static/'
+#STATIC_ROOT = 'static/'   #webserver
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
 
-STATIC_URL = 'http://cornet.wireless.vt.edu/~webdemo/django/static/' #webserver
-#STATIC_URL = '/static/'
+#STATIC_URL = 'http://cornet.wireless.vt.edu/~webdemo/django/static/' #webserver
+STATIC_URL = '/static/'
 
 
@@ -82 +82 @@
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-        #'/home/ossie/workspace/cornetApps/HtmlPages/static/',
-        '/home/webdemo/cornetApps/HtmlPages/static/',  #webserver
+        '/home/ossie/workspace/cornetApps/HtmlPages/static/',
+        #'/home/webdemo/cornetApps/HtmlPages/static/',  #webserver
         #'/home/webdemo/cornetApps/WebDemo/static/',
 )
@@ -118 +118 @@
 TEMPLATE_DIRS = (
         "templates",
-        '/home/webdemo/cornetApps/templates',
+        '/home/webdemo/cornetApps/templates', #webserver
         'templates/HtmlPages',
         'templates/WebDash',

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

@@ -41 +41 @@
 #right_top{
         /**background-image:url('floor1_small_nonodes.jpg');**/
-        height: 400px;
+        height: 300px;
         /*width: 1000px;*/
-        overflow: auto;
 }
 

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

@@ -67 +67 @@
         $(container).fadeIn('fast');
         $("a#node").click(function(){
-                        $("#directory").load("/~webdemo/django/WebDash/192.168.1."+$(this).attr('title')+"/");
+                        $("#directory").load("http://cornet.wireless.vt.edu/~webdemo/django/WebDash/192.168.1."+$(this).attr('title')+"/");
                 });
      });
@@ -86 +86 @@
         $("#apps").load("WebDash/uninstall/"+waveform);
 }
-
-/**
-$("#left_top").ready(function(){
-        $(".webdashLink").click(function(){
-                $("#workspace").load("http://cornet.wireless.vt.edu/~webdemo/django/WebDash/192.168.1."+$(this).attr('title')+"/");
-        });
-});
-**/

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

@@ -11 +11 @@
                 {% for node in floor %}
                         {% if node %}
-                                <td><a id="node" href="#" title="{{node}}"><img src="{{STATIC_URL}}green_ball.gif"/></a></td>
+                                <td><a id="node" href="javascript:loadNode(1);" title="{{forloop.parentloop.counter}}-{{forloop.counter}}"><img src="{{STATIC_URL}}green_ball.gif"/></a></td>
                         {% else %}
-                                <td><img src="{{STATIC_URL}}red_ball.gif"/></td>
+                                <td><img title="{{forloop.parentloop.counter}}-{{forloop.counter}}" src="{{STATIC_URL}}grey_ball.gif"/></td>
                         {% endif %}
                 {% endfor %}

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

@@ -8 +8 @@
                 {% else %}
                         {% if forloop.counter0 == forloop.parentloop.counter0 %}
-                        <img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}red_ball.gif"/>
+                        <img width="20" style="position: absolute; top: {{node_top}}px; left: {{node_left}}px; z-index: 3;" src="{{STATIC_URL}}grey_ball.gif"/>
                         {% endif %}
                 {% endif %}

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

@@ -26 +26 @@
                 <li class="current"><a href="../grid/">Grid View</a></li>
                 <li><a href="../map/1/">Map of Floor 1</a></li>
-        <!--<li id="waveforms_nav" ><a href="../WebDash/waveforms/">Waveforms</a></li>-->
-        <li id="properties"><a href="../properties/">Properties</a></li>
         <li id="task manager"><a href="../tasks/">Task Manager</a></li>        
     </ul>

ossiedev/trunk/tools/cornetApps/templates/WebDash/index.html

@@ -4 +4 @@
 
 {% if availableList %}
-<h1>Available Waveforms</h1>
+<h3>Available Waveforms</h3>
 <table>
 
@@ -12 +12 @@
         <tr>
         <td>    {{ wave.getName }} &nbsp; </td>
-    <td>    <button onClick="window.location='/~webdemo/django/WebDash/install/{{ wave.getName }}/'">Install</button> </td>
+    <td>    <button onClick='javascript:install("{{ wave.getName }}");'>Install</button> </td>
     {% endfor %}
     </tr>

ossiedev/trunk/tools/cornetApps/templates/WebDash/running.html

@@ -4 +4 @@
         {% for instance in instancesList %}
                 <tr>
-                <td>    <a href='/~webdemo/django/WebDash/{{ instance.getName }}/display/'>{{ instance.getName }}</a>&nbsp;</td>
+                <!--<td>        <a href='/~webdemo/django/WebDash/{{ instance.getName }}/display/'>{{ instance.getName }}</a>&nbsp;</td>-->
+                <td><a href='#' onclick='javascript:display("{{instance.getName}}");'>{{instance.getName}}</a></td>
                 <!--<td>        <button onClick="window.location='/WebDash/{{ instance.getName }}/uninstall/'">Uninstall </button></td>-->
-                <td><button onClick="javascript:uninstall('{{ instance.getName }}');">Uninstall</button></td>
+                <td><button onClick='javascript:uninstall("{{ instance.getName }}");'>Uninstall</button></td>
                 </tr>
         {% endfor %}