X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fonelab%2Fonelab_home-view.html;h=bacc2b235e3e8bdd6d8d761d7379cf15e716305e;hb=111d0fcb9681bf94ff184fe43bf636b6d672cbff;hp=f5d6cf14e3ba4024abaff55d8e0368a8bdb1ea31;hpb=3aae671a1ca0cef870a268b88ddcde8d520d7621;p=unfold.git

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index f5d6cf14..bacc2b23 100644
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -6,9 +6,17 @@
 {% widget '_widget-news.html' %}
 </div> -->
 {% if username %}
+{% widget "_widget-no_credentials.html" %}
 <div class="container dashboard">
+	{%if 'no_creds'  in user_cred %}
+        <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">NO CREDENTIALS</a> are delegated to the portal!</p>
+    {%endif%}
+	{%if 'creds_expired'  in user_cred %}
+        <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">EXPIRED CREDENTIALS</a> Please delegate again your credentials to the portal!</p>
+    {%endif%}
+
 	<div class="row">
-		{%if 'is_pi'  in pi %}
+		{% if pi %}
 		<div class="col-md-3">
 			<h3>
 				EXPERIMENT
@@ -17,14 +25,17 @@
 				<a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
 			</div>
 			<div>
-				<button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
+				<button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create Slice</button>
 			</div>
 			<div>
 				<p><strong>Your slices </strong>
- 				 	<span title="A slice is a set of testbed resources on which you can conduct an experiment. 
-      					Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'." 
-      					class="glyphicon glyphicon-info-sign">
-  					</span>
+					<span title="A slice is a set of testbed resources on which you can conduct an experiment. 
+					Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'. 
+					However, on the OneLab portal, you will only see slices that you have created through OneLab. If you have created slices elsewhere, 
+					such as on the PlanetLab Europe portal, those slices will not appear here."
+					class="glyphicon glyphicon-info-sign">
+				</span>
+
   				</p>
 			</div>
 			<div>	
@@ -85,7 +96,9 @@
 			<div>
 				<p><strong>Your slices </strong>
 				<span title="A slice is a set of testbed resources on which you can conduct an experiment. 
-					Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'." 
+					Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'. 
+					However, on the OneLab portal, you will only see slices that you have created through OneLab. If you have created slices elsewhere, 
+					such as on the PlanetLab Europe portal, those slices will not appear here."
 					class="glyphicon glyphicon-info-sign">
 				</span>
 				</p>
@@ -93,6 +106,18 @@
 			<div>	
 				<div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
 			</div>
+			{% if pending_slices %}
+			<p><strong>Pending slices</strong>
+			<span title="Slices that you have requested and are pending for validation by the contact person of your organization."
+				class="glyphicon glyphicon-info-sign">
+			<ul>
+			{% for slices in pending_slices %}
+			<li>{{slices}}</li>
+			{% endfor %}
+			</ul>
+			</span>
+			</p>
+			{%endif%}	
 		</div>
 		<div class="col-md-4">
 			<h3>
@@ -170,11 +195,12 @@
 		$('button#slicerequestbtn').click(function() {
 			window.location="/portal/slice_request/";
 		});
-/*-------
-List of slices has been moved in 
-portal/templates/base.html
-This should go into session
---------*/
+
+        myslice.loadSlices();
+        
 });
 </script>
+{% widget "_widget-monitor.html" %}
+{# widget "_widget-stats-top-slices.html" #}
+
 {% endblock %}