Merge branch 'apigen'

[plstackapi.git] / planetstack / planetstack / urls.py

diff --git a/planetstack/planetstack/urls.py b/planetstack/planetstack/urls.py
index 99119e2..599b20b 100644 (file)
--- a/planetstack/planetstack/urls.py
+++ b/planetstack/planetstack/urls.py
@@ -16,12 +16,13 @@ from core.views.slices import SliceList, SliceDetail
 from core.views.slice_privileges import SlicePrivilegeList, SlicePrivilegeDetail
 from core.views.slivers import SliverList, SliverDetail
 from core.views.tags import TagList, TagDetail
-from core.views.users import UserList, UserDetail
+from genapi import UserList, UserDetail
 from core.views.legacyapi import LegacyXMLRPC
+#from core.views.analytics import AnalyticsAjaxView
 from core.models import *
 from core.api_root import api_root
 from rest_framework import generics
-from core.plus.sites import SitePlus
+from core.dashboard.sites import SitePlus
 from django.http import HttpResponseRedirect
 
 admin.site = SitePlus()
@@ -46,7 +47,7 @@ urlpatterns = patterns('',
     #url(r'^profile/home', 'core.views.home'),
 
     url(r'^plstackapi/$', api_root),
-    
+
     url(r'^plstackapi/deployments/$', DeploymentList.as_view(), name='deployment-list'),
     url(r'^plstackapi/deployments/(?P<pk>[a-zA-Z0-9\-]+)/$', DeploymentDetail.as_view(), name='deployment-detail'),
 
@@ -95,6 +96,8 @@ urlpatterns = patterns('',
 
     url(r'^legacyapi/$', 'core.views.legacyapi.LegacyXMLRPC', name='xmlrpc'),
 
+#    url(r'^analytics/(?P<name>\w+)/$', AnalyticsAjaxView.as_view(), name="analytics"),
+
     url(r'^files/', redirect_to_apache),
 
     #Adding in rest_framework urls