From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 7 Feb 2017 06:23:19 +0000 (+0100)
Subject: Merge branch 'onelab' of git://git.onelab.eu/myslice into onelab
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=8a8188314dfa86c57180b88c1c76ce89ef7c0ed2;hp=-c

Merge branch 'onelab' of git://git.onelab.eu/myslice into onelab
---

8a8188314dfa86c57180b88c1c76ce89ef7c0ed2
diff --combined myslice/urls.py
index 59397e5b,cdffb4dd..6b1c9fa6
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@@ -25,6 -25,7 +25,7 @@@ from settings import auxiliaries, INSTA
  from unfold.loginrequired import LoginRequiredView
  
  import portal.about
+ import portal.certificate
  import portal.institution
  import portal.registrationview
  import portal.accountview
@@@ -37,7 -38,6 +38,7 @@@ import portal.platformsvie
  import portal.dashboardview
  import portal.homeview
  import portal.newsview
 +import portal.cloudlabview
  import portal.loginwidget
  
  platforms_view=portal.platformsview.PlatformsView.as_view()
@@@ -110,7 -110,6 +111,7 @@@ urls = 
      #
      # Portal
      (r'^news/?$', portal.newsview.NewsView.as_view()),
 +    (r'^cloudlab/?$', portal.cloudlabview.CloudView.as_view()),
      (r'^resources/(?P<slicename>[^/]+)/?$', portal.sliceresourceview.SliceResourceView.as_view()),
      (r'^users/(?P<slicename>[^/]+)/?$', portal.slicetabusers.SliceUserView.as_view()),
      (r'^my_url/?$', portal.omn.OMNView.as_view()),
@@@ -135,6 -134,7 +136,7 @@@
      #
      url(r'^register/?$', portal.registrationview.RegistrationView.as_view(), name='registration'),
      url(r'^account/?$', portal.accountview.AccountView.as_view(), name='account'),
+     url(r'^get_cert/?$', portal.certificate.CertificateView.as_view(), name='certificate'),
      url(r'^account/account_process/?$', portal.accountview.account_process),
      url(r'^contact/?$', portal.contactview.ContactView.as_view(), name='contact'),
      url(r'^terms/?$', portal.termsview.TermsView.as_view(), name='terms'),