Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py	(revision 10900)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py	(revision 10944)
@@ -34,5 +34,5 @@
 def setFloorNodes():
 	floorBuffer = 10 #used to calculate the ip address of the node
-	floor1_usrp_status=[0,0,0,0,0,0,0,0,0,0,0,0]
+	floor1_usrp_status=[0,0,0,1,0,0,0,0,0,1,0,0]
 	floor2_usrp_status=[1,1,0,1,0,1,0,1,0,0,1,0]
 	floor3_usrp_status=[1,1,1,1,1,1,1,0,1,0,0,1]
@@ -52,5 +52,8 @@
 def map_view(request, floor_num):
 	floor=floor_num
-	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))
+	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))
+	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))
+	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))
+	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))
 	floor_list = setFloorNodes()
 	return render_to_response("HtmlPages/map.html", locals(), context_instance=RequestContext(request))
Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/settings.py
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/settings.py	(revision 10914)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/settings.py	(revision 10944)
@@ -1,3 +1,3 @@
-# Django settings for cornetApps project.
+# Django settings for running cornetApps project *locally*
 
 DEBUG = True
Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/ossie.html
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/ossie.html	(revision 10936)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/ossie.html	(revision 10944)
@@ -1,56 +1,42 @@
-{% ifequal floor "1" %}
-	<img style="z-index:-1; top: 0px; left: 0px;" src="{{STATIC_URL}}floor1_small_nonodes.jpg"/>
-	{% for node in floor_list.0 %}
-		{% for node_top, node_left in node_position_1 %}
-		{% if node and forloop.counter0 == forloop.parentloop.counter0 %}
-			<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>
-		{% 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}}grey_ball.gif"/>
-			{% endif %}
-		{% endif %}
-		{% endfor %}
-	{% endfor %}
-{% endifequal %}
-{% ifequal floor "2" %}
-	<img style="z-index:-1; top: 0px; left: 0px;" src="{{STATIC_URL}}floor2_small_nonodes.jpg"/>
-	{% for node in floor_list.1 %}
-		{% for node_top, node_left in node_position_2 %}
-		{% if node and forloop.counter0 == forloop.parentloop.counter0 %}
-			<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>
-		{% 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}}grey_ball.gif"/>
-			{% endif %}
-		{% endif %}
-		{% endfor %}
-	{% endfor %}
-{% endifequal %}
-{% ifequal floor "3" %}
-	<img style="z-index:-1; top: 0px; left: 0px;" src="{{STATIC_URL}}floor3_small_nonodes.jpg"/>
-	{% for node in floor_list.2 %}
-		{% for node_top, node_left in node_position_3 %}
-		{% if node and forloop.counter0 == forloop.parentloop.counter0 %}
-			<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>
-		{% 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}}grey_ball.gif"/>
-			{% endif %}
-		{% endif %}
-		{% endfor %}
-	{% endfor %}
-{% endifequal %}
-{% ifequal floor "4" %}
-	<img style="z-index:-1; top: 0px; left: 0px;" src="{{STATIC_URL}}floor4_small_nonodes.jpg"/>
-	{% for node in floor_list.3 %}
-		{% for node_top, node_left in node_position_4 %}
-		{% if node and forloop.counter0 == forloop.parentloop.counter0 %}
-			<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>
-		{% 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}}grey_ball.gif"/>
-			{% endif %}
-		{% endif %}
-		{% endfor %}
-	{% endfor %}
-{% endifequal %}
+{% extends "base.html"%}
+{%block title%}OSSIE for the Web{%endblock%}
+{%block header%}
+<link href="{{STATIC_URL}}frames.css" rel="stylesheet" type="text/css"/>
+<script src="{{STATIC_URL}}jquery.js" type="text/javascript"></script>
+<script src="{{STATIC_URL}}frames.js" type="text/javascript"></script>
+{%endblock%}
+{%block content%}
+ <div id="column_left">
+  <div id="left_top">
+   <p>Waveforms
+   		<a href="/"><img src="{{STATIC_URL}}pics/home.png" title="Home"/></a> 
+   		<a href="#" id="load"><img src="{{STATIC_URL}}pics/refresh.png" title="Refresh Node Directory"/></a>
+   		<a href="/logout/"><img src="{{STATIC_URL}}pics/logout.png" title="Logout"/></a></p>
+	<br/>
+	<div id="directory">	</div>{#end menu div#}
+	</div><!--end #left_top-->
+  <div id="left_bottom">
+   <p>Active Applications <a href="#" title="/WebDash/running/" class="ajax"><img src="{{STATIC_URL}}pics/refresh.png" title="Refresh Active Applications"/></a></p>
+   <div id="apps"></div>
+  </div><!--end #left_bottom-->
+ </div><!--end #column_left-->
+ <div id="column_right">
+  <div id="right_top">
+	<ul class="tabs">
+		<li class="current"><a href="../grid/">Grid View</a></li>
+		<li><a href="../map/1/">Floor 1</a></li>
+		<li><a href="../map/2/">Floor 2</a></li>
+		<li><a href="../map/3/">Floor 3</a></li>
+		<li><a href="../map/4/">Floor 4</a></li>
+        <li id="task manager"><a href="../tasks/">Task Manager</a></li>        
+    </ul>
+    <br/>
+    <p><img id="loader" src="{{STATIC_URL}}loading.gif" style="position:absolute;"/></p>
+	<div id="console"></div>
+  </div><!--end #right_top-->
+  <div id="right_bottom">
+	<div id="workspace" class="tabs-container">Work space </div>
+    <br/>
+      </div><!--end #right_bottom-->
+ </div><!--end #column_right-->
+{%endblock%}
Index: /siedev/branches/jsnyder/trunk/tools/cornetApps/settingsLocal.py
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/settingsLocal.py	(revision 10938)
+++ 	(revision )
@@ -1,165 +1,0 @@
-# Django settings for cornetApps project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', 'your_email@example.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    '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
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
-
-# Base URL for website to reference anchors
-URL_ROOT = 'http://cornet.wireless.vt.edu/~webdemo/django/'
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-
-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/'
-
-
-# URL prefix for admin static files -- CSS, JavaScript and images.
-# Make sure to use a trailing slash.
-# Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = '/static/admin/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # 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/webdemo/cornetApps/WebDemo/static/',
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    #'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'xxnv0%@di9(x1h&h(2^z90g1q3zghp(0)-x=!!6xx)xt*y@902'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-)
-
-ROOT_URLCONF = 'cornetApps.urls'
-#ROOT_URLCONF = 'urls'
-
-TEMPLATE_DIRS = (
-	"templates",
-	'/home/webdemo/cornetApps/templates', #webserver
-	'templates/HtmlPages',
-	'templates/WebDash',
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    #'WebDash',
-    # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
-    # Uncomment the next line to enable admin documentation:
-    # 'django.contrib.admindocs',
-)
-
-LOGIN_URL = '/login/'
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-    }
-}
