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

Conflicts:
	portal/sliceresourceview.py

diff --cc portal/sliceresourceview.py
index 49230df,f6d29db..da362d3
--- 1/portal/sliceresourceview.py
--- 2/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@@ -1,12 -1,13 +1,13 @@@
 -from django.template                 import RequestContext
 -from django.shortcuts                import render_to_response
 +from django.template                    import RequestContext
 +from django.shortcuts                   import render_to_response
  
- from manifold.core.query                import Query, AnalyzedQuery
- from manifoldapi.manifoldapi            import execute_query
+ from manifold.core.query             import Query, AnalyzedQuery
+ from manifoldapi.manifoldapi         import execute_query
+ import json
  
 -from django.views.generic.base      import TemplateView
 +from django.views.generic.base          import TemplateView
  
 -from unfold.loginrequired           import LoginRequiredView
 +from unfold.loginrequired               import LoginRequiredView
  from django.http import HttpResponse
  from django.shortcuts import render
  
@@@ -256,15 -263,13 +275,16 @@@ class SliceResourceView (LoginRequiredV
          template_env['columns_editor'] = filter_column_editor.render(self.request)
  
          template_env['filter_testbeds'] = filter_testbeds.render(self.request)
 +        template_env['filter_status'] = filter_status.render(self.request)
 +        template_env['apply'] = apply.render(self.request)
 +
          template_env['map_resources'] = map_resources.render(self.request)
          template_env['scheduler'] = resources_as_scheduler2.render(self.request)
 -        template_env['pending_resources'] = pending_resources.render(self.request)
 -        template_env['sla_dialog'] = sla_dialog.render(self.request)
 +#        template_env['pending_resources'] = pending_resources.render(self.request)
 +        template_env['sla_dialog'] = '' # sla_dialog.render(self.request)
          template_env["theme"] = self.theme
          template_env["username"] = request.user
+         template_env["pi"] = pi
          template_env["slice"] = slicename
          template_env["section"] = "resources"
          template_env["msg"] = msg

diff --cc portal/templates/base.html
Simple merge