Slice-tab-users: Redesigend according to the new style. Fix: Template rend problem

[myslice.git] / portal / urls.py

diff --git a/portal/urls.py b/portal/urls.py
index c7b7de5..c55c07b 100644 (file)
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -24,6 +24,7 @@ from django.views.generic.base   import TemplateView
 from django.conf.urls           import patterns, include, url
 
 from portal.about               import AboutView
+from portal.institution         import InstitutionView
 from portal.usersview           import UsersView
 from portal.manageuserview      import UserView, user_process    
 from portal.platformsview       import PlatformsView
@@ -35,10 +36,12 @@ from portal.contactview         import ContactView
 from portal.slicerequestview    import SliceRequestView
 from portal.registrationview    import RegistrationView
 from portal.joinview            import JoinView
-from portal.sliceview           import SliceView
+from portal.sliceviewold           import SliceView
 from portal.validationview      import ValidatePendingView
-from portal.experimentview      import ExperimentView
+#from portal.experimentview      import ExperimentView
 from portal.documentationview   import DocumentationView
+from portal.supportview         import SupportView
+
 # hopefully these should move in dedicated source files too
 from portal.views               import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
 from portal.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete 
@@ -62,6 +65,7 @@ urlpatterns = patterns('',
     url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'),
     #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'),
     url(r'^account/?$', AccountView.as_view(), name='account'),
+    url(r'^institution/?$', InstitutionView.as_view(), name='institution'),
     url(r'^about/?$', AboutView.as_view(), name='about'),
     url(r'^users/?$', UsersView.as_view(), name='user_list'),
     url(r'^user/(?P<email>[\w\s.@\-]+)/?$', UserView.as_view(), name='user'),
@@ -75,7 +79,8 @@ urlpatterns = patterns('',
     url(r'^register/?$', RegistrationView.as_view(), name='registration'),
     url(r'^join/?$', JoinView.as_view(), name='join'),
     url(r'^contact/?$', ContactView.as_view(), name='contact'),
-    url(r'^experiment?$', ExperimentView.as_view(), name='experiment'),
+    #url(r'^experiment?$', ExperimentView.as_view(), name='experiment'),
+    url(r'^support/?$', SupportView.as_view(), name='support'),
     url(r'^support/documentation?$', DocumentationView.as_view(), name='FAQ'),
     #url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
     # Slice request