X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Furls.py;h=157c6dd33ec5559523d3a2f5e0f91017f064c520;hb=c99f1bd98ff355bd3f63b4929739ea5bd92cd6a3;hp=c7b7de564aec7761c6de44e566b173cc75d64768;hpb=fb88f8872d47629d6605e97300c0d4c474a82803;p=unfold.git

diff --git a/portal/urls.py b/portal/urls.py
index c7b7de56..157c6dd3 100644
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -4,7 +4,10 @@
 # This file is part of the Manifold project.
 #
 # Authors:
-#   Jordan Augé <jordan.auge@lip6.fr>
+#   Jordan Augé <jordan.auge@lip6.fr
+#   Loic Baron  <loic.baron@lip6.fr>
+#   Mohammed Yasin Rahman <mohammed-yasin.rahman@lip6.fr>
+#   Ciro Scognamiglio   <ciro.scognamiglio@lip6.fr>
 # Copyright 2013, UPMC Sorbonne Universités / LIP6
 #
 # This program is free software; you can redistribute it and/or modify it under
@@ -20,25 +23,33 @@
 # this program; see the file COPYING.  If not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-from django.views.generic.base   import TemplateView
-from django.conf.urls           import patterns, include, url
+from django.views.generic.base      import TemplateView
+from django.conf.urls               import patterns, include, url
 
-from portal.about               import AboutView
-from portal.usersview           import UsersView
-from portal.manageuserview      import UserView, user_process    
-from portal.platformsview       import PlatformsView
-from portal.platformview        import PlatformView
-from portal.resourceview        import ResourceView
-from portal.dashboardview       import DashboardView
-from portal.accountview         import AccountView, account_process
-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.validationview      import ValidatePendingView
-from portal.experimentview      import ExperimentView
-from portal.documentationview   import DocumentationView
+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
+from portal.platformview            import PlatformView
+from portal.resourceview            import ResourceView
+from portal.dashboardview           import DashboardView
+from portal.accountview             import AccountView, account_process
+from portal.contactview             import ContactView
+from portal.slicerequestview        import SliceRequestView
+from portal.registrationview        import RegistrationView
+from portal.joinview                import JoinView
+from portal.sliceviewold            import SliceView
+from portal.validationview          import ValidatePendingView
+#from portal.experimentview         import ExperimentView
+
+from portal.univbrisview            import UnivbrisView
+
+from portal.servicedirectory         import ServiceDirectoryView
+
+from portal.documentationview       import DocumentationView
+from portal.supportview             import SupportView
+from portal.emailactivationview     import ActivateEmailView
 # 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 +73,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 +87,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
@@ -93,6 +106,7 @@ urlpatterns = patterns('',
     #url(r'^slice/request/?$',  views.slice_request,  name='slice_request'),
     # Slice confirmation
     #url(r'^slice/validate/?$', views.slice_validate, name='slice_validate'),
+    url(r'^email_activation/(?P<hash_code>[\w\W\-]+)/?$', ActivateEmailView.as_view(), name='email_activate'), 
     url(r'^pass_reset/$', 
         'portal.django_passresetview.password_reset', 
         {'post_reset_redirect' : '/portal/password/reset/done/'}),
@@ -103,7 +117,10 @@ urlpatterns = patterns('',
         {'post_reset_redirect' : '/portal/password/done/'}),
     (r'^password/done/$', 
         'portal.django_passresetview.password_reset_complete'),
-    # ...
+
+    url(r'^univbris/?$', UnivbrisView.as_view(), name='univbris'),
+    
+    url(r'^servicedirectory/?$', ServiceDirectoryView.as_view(), name='servicedirectory'),
 
 )
 # (r'^accounts/', include('registration.backends.default.urls')),