From: Scott Baker Date: Fri, 30 May 2014 22:10:17 +0000 (-0700) Subject: rename plus to dashboard X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a60d274be56b308631ead1681eb5ff01c2bb0ba3;p=plstackapi.git rename plus to dashboard --- diff --git a/planetstack/planetstack/urls.py b/planetstack/planetstack/urls.py index 99119e2..49b144f 100644 --- a/planetstack/planetstack/urls.py +++ b/planetstack/planetstack/urls.py @@ -18,10 +18,11 @@ from core.views.slivers import SliverList, SliverDetail from core.views.tags import TagList, TagDetail from core.views.users 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[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\w+)/$', AnalyticsAjaxView.as_view(), name="analytics"), + url(r'^files/', redirect_to_apache), #Adding in rest_framework urls