Changeset 11028 for ossiedev/branches/jsnyder/trunk/tools/cornetApps/urls.py

Timestamp:

02/22/12 23:10:20 (15 months ago)

Author:

edent

Message:

Reorganize application structure

Files:

• ossiedev/branches/jsnyder/trunk/tools/cornetApps/urls.py (modified) (3 diffs)

ossiedev/branches/jsnyder/trunk/tools/cornetApps/urls.py

@@ -18 +18 @@
     url(r'^WebDash/updateNamingService/', 'WebDash.views.updateNamingService'),
         url(r'^WebDash/newIP/(?P<address>.*)/', 'WebDash.views.index2', name='index2'),
-    url(r'^$', 'HtmlPages.views.main_page'),
+    url(r'^$', 'LoginUser.views.main_page'),
         url(r'^ossie/$', 'HtmlPages.views.ossie_view'),
         url(r'^login/$', 'django.contrib.auth.views.login'),
-        url(r'^logout/$','HtmlPages.views.logout_page'),
-        url(r'^floor1/$','HtmlPages.views.floor1'),
-        url(r'^account/$', 'HtmlPages.views.account_page'),
+        url(r'^logout/$','LoginUser.views.logout_page'),
+        url(r'^account/$', 'LoginUser.views.account_page'),
         url(r'^nodeMenu/$', 'HtmlPages.views.node_menu'),
         url(r'^loadNode/(\d*)/$', 'HtmlPages.views.loadNode'),
@@ -29 +28 @@
         url(r'^map/(\d*)/$', 'HtmlPages.views.map_view'),
         url(r'^grid/$', 'HtmlPages.views.grid_view'),
-        url(r'^register/$', 'HtmlPages.views.register_page'),
-    url(r'^nodeBooter/(?P<ip>.*)/(?P<port>\d+)/(?P<user>.*)/(?P<password>.*)/$', 'DomainMan.views.nodeBooter_page'),
+        url(r'^register/$', 'LoginUser.views.register_page'),
     url(r'^properties/$', 'HtmlPages.views.properties_page'),
     url(r'^tasks/$', 'HtmlPages.views.tasks_page'),
@@ -38 +36 @@
     url(r'^startNodeBooter/(?P<ip>.*)/(?P<port>\d+)/(?P<user>.*)/(?P<password>.*)/$', 'DomainMan.views.startNodebooter'),
     url(r'^stopNodeBooter/(?P<ip>.*)/(?P<port>\d+)/(?P<user>.*)/(?P<password>.*)/$', 'DomainMan.views.stopNodebooter'),
+    url(r'^xhr_test', 'DomainMan.views.xhr_test'),
 
     # url(r'^cornetApps/', include('cornetApps.foo.urls')),