From 531af2374a179111d92877760e2b70e5f4e7ba61 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Wed, 17 Dec 2014 11:41:53 +0100 Subject: [PATCH] Students Lab: Pierre's plugin still wip --- myslice/settings.py | 10 +++++++++- myslice/urls.py | 3 +++ portal/templates/onelab/onelab_slice-view.html | 1 + .../templates/onelab/onelab_widget-slice-sections.html | 4 +++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/myslice/settings.py b/myslice/settings.py index 235a18ca..6cca7f26 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -2,6 +2,9 @@ import os.path +import djcelery +djcelery.setup_loader() + ### detect if we're in a build environment try: import manifold @@ -233,6 +236,9 @@ INSTALLED_APPS = [ 'south', # Uncomment the next line to enable the admin: 'django.contrib.admin', + # FORGE Plugin app + 'djcelery', + 'forge', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'portal', @@ -242,6 +248,8 @@ INSTALLED_APPS = [ # this app won't load in a build environment if not building: INSTALLED_APPS.append ('rest') +BROKER_URL = "amqp://myslice:myslice@localhost:5672/myslice" + for aux in auxiliaries: if os.path.isdir(os.path.join(ROOT,aux)): print "Using devel auxiliary",aux @@ -294,4 +302,4 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure' SLA_MANAGER_URL = "http://157.193.215.125:4000/sla-service" SLA_MANAGER_USER = "normal_user" -SLA_MANAGER_PASSWORD = "password" \ No newline at end of file +SLA_MANAGER_PASSWORD = "password" diff --git a/myslice/urls.py b/myslice/urls.py index 91511b7d..c50c08ff 100644 --- a/myslice/urls.py +++ b/myslice/urls.py @@ -44,6 +44,8 @@ import portal.slicetabmeasurements import portal.managementtababout import portal.managementtabrequests +import forge.views + #### high level choices # main entry point (set to the / URL) # beware that if this view is broken you end up in an endless cycle... @@ -106,6 +108,7 @@ urls = [ (r'^testbeds/(?P[^/]+)/?$', portal.slicetabtestbeds.SliceTabTestbeds.as_view()), (r'^measurements/(?P[^/]+)/?$', portal.slicetabmeasurements.SliceTabMeasurements.as_view()), (r'^experiment/(?P[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()), + (r'^studentslabs/(?P[^/]+)/?$', forge.views.CreateCourseViev.as_view()), url(r'^about/?$', AboutView.as_view(), name='about'), diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html index c2d52c35..c8b6b440 100644 --- a/portal/templates/onelab/onelab_slice-view.html +++ b/portal/templates/onelab/onelab_slice-view.html @@ -14,5 +14,6 @@
...
+ {% endblock %} diff --git a/portal/templates/onelab/onelab_widget-slice-sections.html b/portal/templates/onelab/onelab_widget-slice-sections.html index 40761b55..e03a53c1 100644 --- a/portal/templates/onelab/onelab_widget-slice-sections.html +++ b/portal/templates/onelab/onelab_widget-slice-sections.html @@ -20,6 +20,7 @@
  • Tools
  • + {% else %}