From 958d6c1998dca4c347b87ed24590ccefcb6c3371 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Thu, 27 Feb 2014 14:32:19 +0100 Subject: [PATCH] slice page: static infos tab, testbeds tab, resources tab --- myslice/urls.py | 3 +- portal/sliceview.py | 2 +- .../templates/onelab/onelab_slice-view.html | 74 ++++++++++--------- .../onelab/onelab_widget-slice-sections.html | 4 +- 4 files changed, 45 insertions(+), 38 deletions(-) diff --git a/myslice/urls.py b/myslice/urls.py index e5e100c9..21dd9526 100644 --- a/myslice/urls.py +++ b/myslice/urls.py @@ -22,6 +22,7 @@ platforms_view=portal.platformsview.PlatformsView.as_view() import portal.testbedlist import portal.sliceview +import portal.sliceresourceview #### high level choices @@ -72,7 +73,7 @@ urls = [ # # Portal (r'^testbeds/(?P[^/]+)/?$', portal.testbedlist.TestbedList.as_view()), - (r'^resources/(?P[^/]+)/?$', portal.sliceview.SliceView.as_view()), + (r'^resources/(?P[^/]+)/?$', portal.sliceresourceview.SliceResourceView.as_view()), (r'^slice/(?P[^/]+)/?$', portal.sliceview.SliceView.as_view()), url(r'^portal/', include('portal.urls')), ] diff --git a/portal/sliceview.py b/portal/sliceview.py index 6b74fb1e..008222c1 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -20,4 +20,4 @@ class SliceView (LoginRequiredView, ThemeView): template_name = "slice-view.html" def get(self, request, slicename): - return render_to_response(self.template, {"slice": slicename, "theme": self.theme, "username": request.user, "section":"resources"}, context_instance=RequestContext(request)) + return render_to_response(self.template, {"slice": slicename, "theme": self.theme, "username": request.user, "section":"slice"}, context_instance=RequestContext(request)) diff --git a/portal/templates/onelab/onelab_slice-view.html b/portal/templates/onelab/onelab_slice-view.html index 0990a4d1..85ae5a8e 100644 --- a/portal/templates/onelab/onelab_slice-view.html +++ b/portal/templates/onelab/onelab_slice-view.html @@ -2,42 +2,48 @@ {% block unfold_main %}
-
-
-
- -
    -
  • Filter: CPU
    • -
  • Filter: Interface
    • -
  • ...
    • -
  • ...
    • -
  • ...
    • -
- -
+
{% include theme|add:"_widget-slice-sections.html" %}
-
- -
-
- -
-
-
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description:this slice is dedicated to debug the myslice software...
url:http://myslice.info
users:3
resources:8
created:2012-06-21 10:00
last update:2014-02-25 14:00
expires:2014-04-01 12:00
+
+ -{% endblock unfold_main %} \ No newline at end of file +{% endblock unfold_main %} diff --git a/portal/templates/onelab/onelab_widget-slice-sections.html b/portal/templates/onelab/onelab_widget-slice-sections.html index ef008d69..d01bdbeb 100644 --- a/portal/templates/onelab/onelab_widget-slice-sections.html +++ b/portal/templates/onelab/onelab_widget-slice-sections.html @@ -1,6 +1,6 @@
-
\ No newline at end of file + -- 2.43.0