bring demo changes from node33 and node36 into master
diff --git a/planetstack/core/plus/sites.py b/planetstack/core/plus/sites.py
index 27ae352..b96169c 100644
--- a/planetstack/core/plus/sites.py
+++ b/planetstack/core/plus/sites.py
@@ -12,15 +12,25 @@
def get_urls(self):
"""Add our dashboard view to the admin urlconf. Deleted the default index."""
from django.conf.urls import patterns, url
- from views import DashboardWelcomeView, DashboardAjaxView
+ from views import DashboardWelcomeView, DashboardAjaxView, SimulatorView, DashboardSummaryAjaxView, DashboardAddOrRemoveSliverView, DashboardUserSiteView, DashboardAnalyticsAjaxView
urls = super(AdminMixin, self).get_urls()
del urls[0]
custom_url = patterns('',
- url(r'^$', self.admin_view(DashboardWelcomeView.as_view()),
+ url(r'^$', self.admin_view(DashboardWelcomeView.as_view()),
name="index"),
- url(r'^hpcdashboard/', self.admin_view(DashboardAjaxView.as_view()),
- name="hpcdashboard")
+ url(r'^hpcdashuserslices/', self.admin_view(DashboardUserSiteView.as_view()),
+ name="hpcdashuserslices"),
+ url(r'^hpcdashboard/', self.admin_view(DashboardAjaxView.as_view()), # DEPRECATED
+ name="hpcdashboard"),
+ url(r'^simulator/', self.admin_view(SimulatorView.as_view()),
+ name="simulator"),
+ url(r'^hpcsummary/', self.admin_view(DashboardSummaryAjaxView.as_view()), # DEPRECATED
+ name="hpcsummary"),
+ url(r'^analytics/(?P<name>\w+)/$', self.admin_view(DashboardAnalyticsAjaxView.as_view()),
+ name="analytics"),
+ url(r'^dashboardaddorremsliver/$', self.admin_view(DashboardAddOrRemoveSliverView.as_view()),
+ name="addorremsliver")
)
return custom_url + urls