From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 27 Feb 2014 13:32:19 +0000 (+0100)
Subject: slice page: static infos tab, testbeds tab, resources tab
X-Git-Tag: myslice-1.1~276
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=958d6c1998dca4c347b87ed24590ccefcb6c3371;p=myslice.git

slice page: static infos tab, testbeds tab, resources tab
---

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<slicename>[^/]+)/?$', portal.testbedlist.TestbedList.as_view()),
-    (r'^resources/(?P<slicename>[^/]+)/?$', portal.sliceview.SliceView.as_view()),
+    (r'^resources/(?P<slicename>[^/]+)/?$', portal.sliceresourceview.SliceResourceView.as_view()),
     (r'^slice/(?P<slicename>[^/]+)/?$', 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 %}
 <div id="slice-view">	
-	<div class="col-md-2">
-  		<div id="select-platform" class="list-group">
-  		</div>
-			
-		<ul class="list-group">
-		  <li class="list-group-item">Filter: CPU</li>
-		  <li class="list-group-item">Filter: Interface</li>
-		  <li class="list-group-item">...</li>
-		  <li class="list-group-item">...</li>
-		  <li class="list-group-item">...</li>
-		</ul>
-
-  	</div>
+	<div class="col-md-2"></div>
 	<div class="col-md-10">
 		<div class="row">
 		  	{% include theme|add:"_widget-slice-sections.html" %}
 		</div>
-		<div class="row slice-pending">
-			<ul class="nav nav-pills">
-				<li><a href="">Unreserved<span class="badge">42</span></a></li>
-				<li><a href="">Reserved</a></li>
-				<li><a href="">Pending</a></li>
-				<li>
-					<button type="button" class="btn btn-primary apply">Apply</button>
-					<button type="button" class="btn btn-default clear">Clear</button>
-				</li>
-			</ul>
-		</div>
-		<div class="row">
-			<ul class="nav nav-tabs">
-			  <li class="active"><a href="#">Resources</a></li>
-			  <li><a href="#"></a></li>
-			  <li><a href="#"></a></li>
-			</ul>
-		</div>
-		<table cellpadding="0" cellspacing="0" border="0" class="table" id="objectList"></table>
-	</div>
+    </div>
+    
+	<div class="col-md-2"></div>
+	<div class="col-md-10">
+        <br>
+        <br>
+        <table>
+            <tr>
+                <td><b>Description:</b></td>
+                <td>this slice is dedicated to debug the myslice software...</td>
+            </tr>
+            <tr>
+                <td><b>url:</b></td>
+                <td><a href="http://myslice.info" target="_blank">http://myslice.info</a></td>
+            </tr>
+            <tr>
+                <td><b>users:</b></td>
+                <td>3</td>
+            </tr>
+            <tr>
+                <td><b>resources:</b></td>
+                <td>8</td>
+            </tr>
+            <tr>
+                <td><b>created:</b></td>
+                <td>2012-06-21 10:00</td>
+            </tr>
+            <tr>
+                <td><b>last update:</b></td>
+                <td>2014-02-25 14:00</td>
+            </tr>
+            <tr>
+                <td><b>expires:</b></td>
+                <td>2014-04-01 12:00</td>
+            </tr>
+        </table>
+  	</div>
+    
 </div>
-{% 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 @@
 <div class="col-md-8 slice-sections">
 	<ul class="nav nav-pills nav-justified">
-		<li><a href="/resources/{{ slice }}/">{{ slice }}</a></li>
+		<li {% if section == 'slice' %}class="active"{% endif %}><a href="/slice/{{ slice }}/">{{ slice }}</a></li>
 		<li {% if section == 'testbeds' %}class="active"{% endif %}><a href="/testbeds/{{ slice }}/">Testbeds</a></li>
 		<li {% if section == 'resources' %}class="active"{% endif %}><a href="/resources/{{ slice }}/">Resources</a></li>
 		<li {% if section == 'users' %}class="active">{% endif %}><a href="/users/{{ slice }}/">Users</a></li>
@@ -10,4 +10,4 @@
 </div>
 <div class="col-md-4 slice-experiment">
 	<a href="/portal/experiment"><button type="button" class="btn btn-default">Experiment</button></a>
-</div>
\ No newline at end of file
+</div>